diff --git a/gosa-core/include/class_sortableListing.inc b/gosa-core/include/class_sortableListing.inc
index 26d30870e2edb979bdcc66f531275c669d66150e..64e122671193b01ebd1cba60d1bac349b157ab23 100644 (file)
// Generate instance wide unique ID
$tmp= gettimeofday();
- $this->id= 'l'.md5($tmp['sec']);
+ $this->id= 'l'.md5(microtime().$tmp['sec']);
// Set reorderable flag
$this->reorderable= $reorderable;
}
}
+
+ public function setDefaultSortColumn($id)
+ {
+ $this->sortColumn = $id;
+ }
public function setListData($data, $displayData= null)
{
private function setDisplayData($data)
{
if (!is_array($data)) {
- die ("sortableList needs an array as data!");
+ trigger_error ("sortableList needs an array as data!");
}
// Transfer information
// Preset sort orders to 'down'
for ($column= 0; $column<$this->columns; $column++) {
- $this->sortDirection[]= true;
+ if(!isset($this->sortDirection[$column])){
+ $this->sortDirection[$column]= true;
+ }
}
}
if ($this->reorderable) {
$result.= " <th$first>".(isset($this->header[$i])?$this->header[$i]:"")."</th>";
} else {
- $result.= " <th$first><a $link>".(isset($this->header[$i])?$this->header[$i]:"")."$sorter</a></th>";
+ $result.= " <th$first><a $link>".(isset($this->header[$i])?$this->header[$i]:"")."</a>$sorter</th>";
}
$first= "";
}
$reorderable= $this->reorderable?"":" style='cursor:default'";
if (strpos($this->acl, 'r') !== false) {
foreach ($this->mapping as $nr => $row) {
- $editable= $this->editable?" onclick='$(\"edit_".$this->id."_$nr\").click()'":"";
+ $editable= $this->editable?" onClick='$(\"edit_".$this->id."_$nr\").click()'":"";
$id= "";
if (isset($this->modes[$row])) {
$result.= "</tr>\n";
$result.= " </tbody>\n</table>\n</div>\n";
- $result.= " <input type='hidden' name='PID' value='".$this->id."' id='PID'>\n";
+# $result.= " <input type='hidden' name='PID' value='".$this->id."' id='PID'>\n";
$result.= " <input type='hidden' name='position_".$this->id."' id='position_".$this->id."'>\n";
$result.= " <input type='hidden' name='reorder_".$this->id."' id='reorder_".$this->id."'>\n";
public function update()
{
- // Do not do anything if this is not our PID, or there's even no PID available...
- if(!isset($_REQUEST['PID']) || $_REQUEST['PID'] != $this->id) {
- return;
- }
// Filter GET with "act" attributes
- if (!$this->reorderable && isset($_GET['act'])) {
- $key= validate($_GET['act']);
- if (preg_match('/^SORT_([0-9]+)$/', $key, $match)) {
- // Switch to new column or invert search order?
- $column= $match[1];
- if ($this->sortColumn != $column) {
- $this->sortColumn= $column;
- } else {
- $this->sortDirection[$column]= !$this->sortDirection[$column];
- }
+ if (!$this->reorderable){
+ if(isset($_GET['act']) && isset($_GET['PID']) && $this->id == $_GET['PID']) {
+
+ $key= validate($_GET['act']);
+ if (preg_match('/^SORT_([0-9]+)$/', $key, $match)) {
+
+ // Switch to new column or invert search order?
+ $column= $match[1];
+ if ($this->sortColumn != $column) {
+ $this->sortColumn= $column;
+ } else {
+ $this->sortDirection[$column]= !$this->sortDirection[$column];
+ }
- // Update mapping according to sort parameters
- $this->sortData();
+ }
}
+
+ // Update mapping according to sort parameters
+ $this->sortData();
}
}
public function save_object()
{
// Do not do anything if this is not our PID, or there's even no PID available...
- if(!isset($_REQUEST['PID']) || $_REQUEST['PID'] != $this->id) {
+ if(isset($_REQUEST['PID']) && $_REQUEST['PID'] != $this->id) {
return;
}
public function getMaintainedData()
{
$tmp= array();
-
foreach ($this->mapping as $src => $dst) {
- $tmp[$this->keys[$dst]]= $this->data[$dst];
+ $realKey = $this->keys[$dst];
+ $tmp[$realKey] = $this->data[$realKey];
}
-
return $tmp;
}
return isset($this->keys[$index])?$this->keys[$index]:null;
}
+ public function getData($index) {
+ $realkey = $this->keys[$index];
+ return($this->data[$realkey]);
+ }
}