mirror of
https://github.com/Combodo/iTop.git
synced 2026-02-13 23:44:11 +01:00
Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
15e5e21a89 | ||
|
|
30034d381b | ||
|
|
986eb90546 | ||
|
|
84968ff550 | ||
|
|
46151c87c0 |
@@ -131,7 +131,7 @@ class SQLUnionQuery extends SQLQuery
|
||||
|
||||
if ($bGetCount)
|
||||
{
|
||||
$sSelects = "({$sLimitStart}".implode(" {$sLimit}{$sLimitEnd}{$sLineSep} UNION{$sLineSep} {$sLimitStart}", $aSelects)." {$sLimit}{$sLimitEnd})";
|
||||
$sSelects = "{$sLimitStart}".implode(" {$sLimit}{$sLimitEnd}{$sLineSep} UNION{$sLineSep} {$sLimitStart}", $aSelects)." {$sLimit}{$sLimitEnd}";
|
||||
$sFrom = "({$sLineSep}{$sSelects}{$sLineSep}) as __selects__";
|
||||
$sSQL = "SELECT COUNT(*) AS COUNT FROM (SELECT$sLineSep 1 $sLineSep FROM {$sFrom}{$sLineSep}) AS _union_alderaan_";
|
||||
}
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
*/
|
||||
|
||||
// Beware the version number MUST be enclosed with quotes otherwise v2.3.0 becomes v2 0.3 .0
|
||||
$version: "v2.7.0";
|
||||
$version: "v2.7.0-1";
|
||||
$approot-relative: "../../../../../" !default; // relative to env-***/branding/themes/***/main.css
|
||||
|
||||
// Base colors
|
||||
|
||||
@@ -249,6 +249,14 @@ class UserLocal extends UserInternal
|
||||
$config = MetaModel::GetConfig();
|
||||
}
|
||||
|
||||
//if the $proposedValue is an ormPassword, then it cannot be checked
|
||||
//this if is even more permissive as we can only check against strings
|
||||
if (!is_string($proposedValue) && !empty($proposedValue))
|
||||
{
|
||||
$this->m_oPasswordValidity = new UserLocalPasswordValidity(true);
|
||||
return;
|
||||
}
|
||||
|
||||
if (null == $aValidatorCollection)
|
||||
{
|
||||
$aValidatorCollection = MetaModel::EnumPlugins('iModuleExtension', 'UserLocalPasswordValidator');
|
||||
|
||||
@@ -309,12 +309,18 @@ EOF
|
||||
$aRootClasses[$sClassName] = MetaModel::GetName($sClassName);
|
||||
}
|
||||
$sLabelClassName = MetaModel::GetName($sClassName);
|
||||
|
||||
//Fetch classes names for autocomplete purpose
|
||||
// - Encode as JSON to escape quotes and other characters
|
||||
$sClassLabelAndCodeAsJSON = json_encode("$sLabelClassName ($sClassName)");
|
||||
$sClassLabelAsJSON = json_encode($sLabelClassName);
|
||||
$sClassCodeAsJSON = json_encode($sClassName);
|
||||
// - Push to autocomplete
|
||||
$oPage->add_script(
|
||||
<<<EOF
|
||||
autocompleteClassLabelAndCode.push("$sLabelClassName ($sClassName)");
|
||||
autocompleteClassLabel.push("$sLabelClassName");
|
||||
autocompleteClassCode.push("$sClassName");
|
||||
autocompleteClassLabelAndCode.push($sClassLabelAndCodeAsJSON);
|
||||
autocompleteClassLabel.push($sClassLabelAsJSON);
|
||||
autocompleteClassCode.push($sClassCodeAsJSON);
|
||||
EOF
|
||||
);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user