X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Finclude%2Fclass_sortableListing.inc;h=3af979b285c2ac88fa4a9f016fb592e53e15da6c;hb=9c309d6fc3d3ff65caf535b6f53ea3177433d29b;hp=cf7a5e66fd555f03133d0d6d96ec9053ab34e76b;hpb=e0f580ea83145b6e0d1411149e0962e0b19a9c0d;p=gosa.git diff --git a/gosa-core/include/class_sortableListing.inc b/gosa-core/include/class_sortableListing.inc index cf7a5e66f..3af979b28 100644 --- a/gosa-core/include/class_sortableListing.inc +++ b/gosa-core/include/class_sortableListing.inc @@ -1,7 +1,7 @@ setData($data); - if (!$displayData) { - $displayData= array(); - foreach ($data as $value) { - $displayData[]= array($value); - } - } + $this->setListData($data, $displayData); - $this->setDisplayData($displayData); + // Get list of used IDs + if(!session::is_set('sortableListing_USED_IDS')){ + session::set('sortableListing_USED_IDS',array()); + } + $usedIds = session::get('sortableListing_USED_IDS'); // Generate instance wide unique ID - $tmp= gettimeofday(); - $this->id= 'l'.md5($tmp['sec']); + $id = ""; + while($id == "" || in_array($id, $usedIds)){ + + // Wait 1 msec to ensure that we definately get a new id + if($id != "") usleep(1); + $tmp= gettimeofday(); + $id = 'l'.md5(microtime().$tmp['sec']); + } + + // Only keep the last 10 list IDsi + $usedIds = array_slice($usedIds, count($usedIds) -10, 10); + $usedIds[] = $id; + session::set('sortableListing_USED_IDS',$usedIds); + $this->id = $id; // Set reorderable flag $this->reorderable= $reorderable; @@ -73,6 +89,29 @@ class sortableListing { } } + public function setReorderable($bool) + { + $this->reorderable= $bool; + } + + public function setDefaultSortColumn($id) + { + $this->sortColumn = $id; + } + + public function setListData($data, $displayData= null) + { + // Save data to display + $this->setData($data); + if (!$displayData) { + $displayData= array(); + foreach ($data as $key => $value) { + $displayData[$key]= array("data" => array($value)); + } + } + $this->setDisplayData($displayData); + } + private function setData($data) { @@ -83,14 +122,25 @@ class sortableListing { 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 - $this->displayData= $data; + $this->displayData= array(); + $this->modes= array(); + $this->mapping= array(); + foreach ($data as $key => $value) { + $this->displayData[]= $value['data']; + if (isset($value['mode'])) { + $this->modes[]= $value['mode']; + } + } + $this->keys= array_keys($data); // Create initial mapping - $this->mapping= array_keys($data); + if(count($this->keys)){ + $this->mapping= range(0, abs(count($this->keys)-1)); + } $this->current_mapping= $this->mapping; // Find the number of coluns @@ -104,7 +154,9 @@ class sortableListing { // Preset sort orders to 'down' for ($column= 0; $column<$this->columns; $column++) { - $this->sortDirection[]= true; + if(!isset($this->sortDirection[$column])){ + $this->sortDirection[$column]= true; + } } } @@ -121,6 +173,12 @@ class sortableListing { } + public function setColorAlternate($flag) + { + $this->colorAlternate= $flag; + } + + public function setEditable($flag) { $this->editable= $flag; @@ -159,31 +217,35 @@ class sortableListing { public function render() { - $result= "
".(isset($this->header[$i])?$this->header[$i]:"")." | "; + $result.= "".(isset($this->header[$i])?$this->header[$i]:"")." | "; } else { - $result.= "".(isset($this->header[$i])?$this->header[$i]:"")."$sorter | "; + $result.= "".(isset($this->header[$i])?$this->header[$i]:"")."$sorter | "; } + $first= ""; } if ($action_width) { $result.= ""; @@ -215,17 +279,34 @@ class sortableListing { $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()'":""; - $result.= " |
---|---|---|---|---|
".htmlentities($column)." | \n"; + $result.= "".$column." | \n"; $first= ""; } + if ($action_width) { $result.= "".str_replace('%ID', "edit_".$this->id."_$nr", $edit_image). str_replace('%ID', "del_".$this->id."_$nr", $delete_image)." | "; } + $result.= "