X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Finclude%2Fclass_sortableListing.inc;h=55c3bbfe9bc5617b76eabbc41a0c9de330ad8334;hb=0263ebf7c8361121ba2e35e4e80c976a02ed1d26;hp=f4ad8d6d3d93afa9ca3cac99af75f6c209a7fccd;hpb=5009daee89cea6af2627a27fd1b2f0d0eb123d4a;p=gosa.git diff --git a/gosa-core/include/class_sortableListing.inc b/gosa-core/include/class_sortableListing.inc index f4ad8d6d3..55c3bbfe9 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->setDisplayData($displayData); + $this->setListData($data, $displayData); // Generate instance wide unique ID $tmp= gettimeofday(); @@ -74,6 +72,20 @@ class sortableListing { } + 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) { $this->data= $data; @@ -87,10 +99,18 @@ class sortableListing { } // Transfer information - $this->displayData= $data; + $this->displayData= array(); + $this->modes= 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); + $this->mapping= range(0, abs(count($this->keys)-1)); $this->current_mapping= $this->mapping; // Find the number of coluns @@ -121,6 +141,12 @@ class sortableListing { } + public function setColorAlternate($flag) + { + $this->colorAlternate= $flag; + } + + public function setEditable($flag) { $this->editable= $flag; @@ -160,17 +186,17 @@ class sortableListing { public function render() { $result= "
\n"; - $result.= "cssclass)?" class='".$this->cssclass."'":"").">\n"; + $result.= "
cssclass)?" class='".$this->cssclass."'":"").">\n"; $action_width= 0; if (strpos($this->acl, 'w') === false) { - $edit_image= $this->editable?""._("Edit")."":""; + $edit_image= $this->editable?image("images/lists/edit-grey.png"):""; } else { - $edit_image= $this->editable?"":""; + $edit_image= $this->editable?image('images/lists/edit.png', "%ID", _("Edit this entry")):""; } if (strpos($this->acl, 'd') === false) { - $delete_image= $this->deleteable?""._("Delete")."":""; + $delete_image= $this->deleteable?image('images/lists/trash-grey.png'):""; } else { - $delete_image= $this->deleteable?"":""; + $delete_image= $this->deleteable?image('images/lists/trash.png', "%ID", _("Delete this entry")):""; } // Do we need colspecs? @@ -178,12 +204,16 @@ class sortableListing { if ($this->colspecs) { $result.= " \n"; for ($i= 0; $i<$this->columns; $i++) { - $result.= " \n"; + if(isset($this->colspecs[$i]) && $this->colspecs[$i] != '*'){ + $result.= " \n"; + }else{ + $result.= " \n"; + } } // Extend by another column if we've actions specified if ($action_width) { - $result.= " \n"; + $result.= " \n"; } $result.= " \n"; } @@ -191,18 +221,20 @@ class sortableListing { // Do we need a header? if ($this->header) { $result.= " \n \n"; + $first= " style='border-left:0'"; for ($i= 0; $i<$this->columns; $i++) { $link= "href='?plug=".$_GET['plug']."&PID=".$this->id."&act=SORT_$i'"; $sorter= ""; if ($i == $this->sortColumn){ - $sorter= " "; + $sorter= " ".image("images/lists/sort-".($this->sortDirection[$i]?"up":"down").".png", null, $this->sortDirection[$i]?_("Up"):_("Down")); } if ($this->reorderable) { - $result.= " "; + $result.= " ".(isset($this->header[$i])?$this->header[$i]:"").""; } else { - $result.= " "; + $result.= " ".(isset($this->header[$i])?$this->header[$i]:"")."$sorter"; } + $first= ""; } if ($action_width) { $result.= ""; @@ -216,16 +248,33 @@ class sortableListing { if (strpos($this->acl, 'r') !== false) { foreach ($this->mapping as $nr => $row) { $editable= $this->editable?" onclick='$(\"edit_".$this->id."_$nr\").click()'":""; - $result.= " \n"; + + $id= ""; + if (isset($this->modes[$row])) { + switch ($this->modes[$row]) { + case LIST_DISABLED: + $id= " sortableListItemDisabled"; + $editable= ""; + break; + case LIST_MARKED: + $id= " sortableListItemMarked"; + break; + } + } + + $result.= " \n"; $first= " style='border:0'"; + foreach ($this->displayData[$row] as $column) { - $result.= " ".htmlentities($column)."\n"; + $result.= " ".$column."\n"; $first= ""; } + if ($action_width) { $result.= ""; } + $result.= " \n"; } } @@ -286,6 +335,15 @@ class sortableListing { $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) { + return; + } // Do not do anything if we're not posted - or have no permission if (strpos($this->acl, 'w') !== false && isset($_POST['reorder_'.$this->id])){ @@ -311,11 +369,22 @@ class sortableListing { } // Delete requested? + $this->action = ""; if (strpos($this->acl, 'd') !== false){ foreach ($_POST as $key => $value) { - if (preg_match('/^del_'.$this->id.'_([0-9]+)_x.*$/', $key, $matches)) { + if (preg_match('/^del_'.$this->id.'_([0-9]+)$/', $key, $matches)) { $this->active_index= $this->mapping[$matches[1]]; + + // Ignore request if mode requests it + if (isset($this->modes[$this->active_index]) && $this->modes[$this->active_index] == LIST_DISABLED) { + $this->active_index= null; + continue; + } + + // Set action $this->action= "delete"; + + // Remove value if requested if ($this->instantDelete) { $this->deleteEntry($this->active_index); } @@ -326,8 +395,15 @@ class sortableListing { // Edit requested? if (strpos($this->acl, 'w') !== false){ foreach ($_POST as $key => $value) { - if (preg_match('/^edit_'.$this->id.'_([0-9]+)_x.*$/', $key, $matches)) { + if (preg_match('/^edit_'.$this->id.'_([0-9]+)$/', $key, $matches)) { $this->active_index= $this->mapping[$matches[1]]; + + // Ignore request if mode requests it + if (isset($this->modes[$this->active_index]) && $this->modes[$this->active_index] == LIST_DISABLED) { + $this->active_index= null; + continue; + } + $this->action= "edit"; } } @@ -371,7 +447,7 @@ class sortableListing { $tmp= array(); foreach ($this->mapping as $src => $dst) { - $tmp[$src]= $this->data[$dst]; + $tmp[$this->keys[$dst]]= $this->data[$dst]; } return $tmp; @@ -417,24 +493,43 @@ class sortableListing { } - public function addEntry($entry, $displayEntry= null) + public function addEntry($entry, $displayEntry= null, $key= null) { // Only add if not already there - if (in_array($entry, $this->data)) { - return; + if (!$key) { + if (in_array($entry, $this->data)) { + return; + } + } else { + if (isset($this->data[$key])) { + return; + } } // Prefill with default value if not specified if (!$displayEntry) { - $displayEntry= array($entry); + $displayEntry= array('data' => array($entry)); } // Append to data and mapping - $this->data[]= $entry; - $this->displayData[]= $displayEntry; + if ($key) { + $this->data[$key]= $entry; + $this->keys[]= $key; + } else { + $this->data[]= $entry; + $this->keys[]= count($this->mapping); + } + $this->displayData[]= $displayEntry['data']; $this->mapping[]= count($this->mapping); $this->modified= true; + + // Sort data after we've added stuff + $this->sortData(); } + public function getKey($index) { + return isset($this->keys[$index])?$this->keys[$index]:null; + } + }
".(isset($this->header[$i])?$this->header[$i]:"")."".(isset($this->header[$i])?$this->header[$i]:"")."$sorter 
".str_replace('%ID', "edit_".$this->id."_$nr", $edit_image). str_replace('%ID', "del_".$this->id."_$nr", $delete_image)."