$sHeader
-| $sPages |  |
-  |
- $sPagesLinks | - |
-  |
- $sPageSizeCombo | -- |
| '.Dict::Format('UI:TruncatedResults', MetaModel::GetConfig()->GetMinDisplayLimit(), $oSet->Count()).' '.Dict::S('UI:DisplayAll').' | '; - $oPage->add_ready_script("$('#{$divId} table.listResults').addClass('truncated');"); - $oPage->add_ready_script("$('#{$divId} table.listResults tr:last td').addClass('truncated');"); - } - else - { - // Full list - $sHtml .= ' |
| '.Dict::Format('UI:CountOfResults', $oSet->Count()).' | '; - } - $sHtml .= $oMenuBlock->GetRenderContent($oPage, $aMenuExtraParams, $aMenuExtraParams['currentId']); - $sHtml .= ' |
| "; - $sHtml .= $oPage->GetTable($aAttribs, $aValues); - $sHtml .= ' |
| $sObjectsCount | $sActionsMenu |
| $sPager | $sToolkitMenu |
| $sDataTable |
| $sPages | |
+ |
+ $sPagesLinks | + |
+ |
+ $sPageSizeCombo | ++ |
iListId}\" style=\"display: none;\">";
+ $sHtml .= "";
+ $sHtml .= "
";
+
+ $sDlgTitle = addslashes(Dict::S('UI:ListConfigurationTitle'));
+ $oPage->add_ready_script("$('#datatable_dlg_{$this->iListId}').dialog({autoOpen: false, title: '$sDlgTitle', width: 500, close: function() { $('#datatable_{$this->iListId}').datatable('onDlgCancel'); } });");
+
+ return $sHtml;
+ }
+
+ public function GetAsHash($oSetting)
+ {
+ $aSettings = array('iDefaultPageSize' => $oSetting->iDefaultPageSize, 'oColumns' => $oSetting->aColumns);
+ return $aSettings;
+ }
+
+ protected function GetHTMLTableConfig($aColumns, $sSelectMode, $bViewLink)
+ {
+ $aAttribs = array();
+ if ($sSelectMode == 'multiple')
+ {
+ $aAttribs['form::select'] = array('label' => "iListId}:not(:disabled)', this.checked);\" class=\"checkAll\">", 'description' => Dict::S('UI:SelectAllToggle+'));
+ }
+ else if ($sSelectMode == 'single')
+ {
+ $aAttribs['form::select'] = array('label' => "", 'description' => '');
+ }
+
+ foreach($this->aClassAliases as $sAlias => $sClassName)
+ {
+ foreach($aColumns[$sAlias] as $sAttCode => $aData)
+ {
+ if ($aData['checked'])
+ {
+ if ($sAttCode == '_key_')
+ {
+ $aAttribs['key_'.$sAlias] = array('label' => MetaModel::GetName($sClassName), 'description' => '');
+ }
+ else
+ {
+ $oAttDef = MetaModel::GetAttributeDef($sClassName, $sAttCode);
+ $aAttribs[$sAttCode.'_'.$sAlias] = array('label' => MetaModel::GetLabel($sClassName, $sAttCode), 'description' => $oAttDef->GetOrderByHint());
+ }
+ }
+ }
+ }
+ return $aAttribs;
+ }
+
+ protected function GetHTMLTableValues($aColumns, $sSelectMode, $iPageSize, $bViewLink, $aExtraParams)
+ {
+ $aValues = array();
+ $this->oSet->Seek(0);
+ $iMaxObjects = $iPageSize;
+ while (($aObjects = $this->oSet->FetchAssoc()) && ($iMaxObjects != 0))
+ {
+ $bFirstObject = true;
+ $aRow = array();
+ foreach($this->aClassAliases as $sAlias => $sClassName)
+ {
+ $sHilightClass = $aObjects[$sAlias]->GetHilightClass();
+ if ($sHilightClass != '')
+ {
+ $aRow['@class'] = $sHilightClass;
+ }
+ if ((($sSelectMode == 'single') || ($sSelectMode == 'multiple')) && $bFirstObject)
+ {
+ if (array_key_exists('selection_enabled', $aExtraParams) && isset($aExtraParams['selection_enabled'][$aObjects[$sAlias]->GetKey()]))
+ {
+ $sDisabled = ($aExtraParams['selection_enabled'][$aObjects[$sAlias]->GetKey()]) ? '' : ' disabled="disabled"';
+ }
+ else
+ {
+ $sDisabled = '';
+ }
+ if ($sSelectMode == 'single')
+ {
+ $aRow['form::select'] = "iListId}\" name=\"selectObject\" value=\"".$aObjects[$sAlias]->GetKey()."\">";
+ }
+ else
+ {
+ $aRow['form::select'] = "iListId}\" name=\"selectObject[]\" value=\"".$aObjects[$sAlias]->GetKey()."\">";
+ }
+ }
+ foreach($aColumns[$sAlias] as $sAttCode => $aData)
+ {
+ if ($aData['checked'])
+ {
+ if ($sAttCode == '_key_')
+ {
+ $aRow['key_'.$sAlias] = $aObjects[$sAlias]->GetHyperLink();
+ }
+ else
+ {
+ $aRow[$sAttCode.'_'.$sAlias] = $aObjects[$sAlias]->GetAsHTML($sAttCode);
+ }
+ }
+ }
+ $bFirstObject = false;
+ }
+ $aValues[] = $aRow;
+ $iMaxObjects--;
+ }
+ return $aValues;
+ }
+
+ public function GetHTMLTable(WebPage $oPage, $aColumns, $sSelectMode, $iPageSize, $bViewLink, $aExtraParams)
+ {
+ $iNbPages = ($iPageSize == -1) ? 1 : ceil($this->iNbObjects / $iPageSize);
+ $aAttribs = $this->GetHTMLTableConfig($aColumns, $sSelectMode, $bViewLink);
+
+ $aValues = $this->GetHTMLTableValues($aColumns, $sSelectMode, $iPageSize, $bViewLink, $aExtraParams);
+
+ $sHtml = '| "; + $sHtml .= $oPage->GetTable($aAttribs, $aValues); + $sHtml .= ' |
- \n
- ".Dict::S('UI:Menu:OtherActions')."\n
- \n";
+ $sHtml .= "
- ".Dict::S('UI:Menu:OtherActions')."\n
- \n";
}
else
{
- $sHtml .= "
- ".Dict::S('UI:Menu:Actions')."\n
- \n";
+ $sHtml .= "
- ".Dict::S('UI:Menu:Actions')."\n
- \n";
}
$sPrevUrl = '';
foreach ($aActions as $key => $aAction)
diff --git a/application/itopwebpage.class.inc.php b/application/itopwebpage.class.inc.php
index 31c9f08ef..1ba34c979 100644
--- a/application/itopwebpage.class.inc.php
+++ b/application/itopwebpage.class.inc.php
@@ -77,6 +77,8 @@ class iTopWebPage extends NiceWebPage
$this->add_linked_script('../js/g.pie.js');
$this->add_linked_script('../js/g.dot.js');
$this->add_linked_script('../js/charts.js');
+ $this->add_linked_script('../js/field_sorter.js');
+ $this->add_linked_script('../js/datatable.js');
$this->m_sInitScript =
<<< EOF
diff --git a/application/user.preferences.class.inc.php b/application/user.preferences.class.inc.php
index 3d40db10a..f42d55800 100644
--- a/application/user.preferences.class.inc.php
+++ b/application/user.preferences.class.inc.php
@@ -77,6 +77,42 @@ class appUserPreferences extends DBObject
self::Save();
}
+ /**
+ * Clears the value for a given preference (or list of preferences that matches a pattern), and updates the database
+ * @param string $sPattern Code/Pattern of the properties/preferences to reset
+ * @param boolean $bPattern Whether or not the supplied code is a PCRE pattern
+ */
+ static function UnsetPref($sCodeOrPattern, $bPattern = false)
+ {
+ if (self::$oUserPrefs == null)
+ {
+ self::Load();
+ }
+ $aPrefs = self::$oUserPrefs->Get('preferences');
+ if ($bPattern)
+ {
+ // the supplied code is a pattern, clear all preferences that match
+ foreach($aPrefs as $sKey => $void)
+ {
+ if (preg_match($sCodeOrPattern, $sKey))
+ {
+ unset($aPrefs[$sKey]);
+ }
+ }
+ self::$oUserPrefs->Set('preferences', $aPrefs);
+ }
+ else
+ {
+ unset($aPrefs[$sCode]);
+ self::$oUserPrefs->Set('preferences', $aPrefs);
+ }
+ // Save only if needed
+ if (self::$oUserPrefs->IsModified())
+ {
+ self::Save();
+ }
+ }
+
/**
* Call this function to get all the preferences for the user, packed as a JSON object
* @return string JSON representation of the preferences
- \n
- ".Dict::S('UI:Menu:Actions')."\n
- \n
- ".Dict::S('UI:Menu:Actions')."\n
- \n
- ".Dict::S('UI:Menu:OtherActions')."\n