[debian-edu-commits] debian-edu/pkg-team/ 01/01: improve 1021_disable-sorting-in-DHCP-section-lists.patch

[Mike Gabriel]

This is an automated email from the git hooks/post-receive script.

sunweaver pushed a commit to branch master
in repository gosa.

commit 12413aa51a424c41de5da38c9f886be9d61f311b
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Dec 11 12:56:51 2015 +0100

    improve 1021_disable-sorting-in-DHCP-section-lists.patch
---
 ...021_disable-sorting-in-DHCP-section-lists.patch | 27 ++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/debian/patches/1021_disable-sorting-in-DHCP-section-lists.patch b/debian/patches/1021_disable-sorting-in-DHCP-section-lists.patch
index 2bc34a9..a278146 100644
--- a/debian/patches/1021_disable-sorting-in-DHCP-section-lists.patch
+++ b/debian/patches/1021_disable-sorting-in-DHCP-section-lists.patch
@@ -24,6 +24,33 @@ Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
          $this->aclMemberList->setColspecs(array('20px','*','*'));
 --- a/gosa-core/include/class_sortableListing.inc
 +++ b/gosa-core/include/class_sortableListing.inc
+@@ -86,7 +86,7 @@
+ 
+         // Set reorderable flag
+         $this->reorderable= $reorderable;
+-        if (!$reorderable) {
++        if ((!$reorderable) && ($this->sortingEnabled)) {
+             $this->sortData();
+         }
+     }
+@@ -274,7 +274,7 @@
+                     $sorter= " ".image("images/lists/sort-".($this->sortDirection[$i]?"up":"down").".png", null, $this->sortDirection[$i]?_("Sort ascending"):_("Sort descending"));
+                 }
+ 
+-                if ($this->reorderable) {
++                if (($this->reorderable) || (!$this->sortingEnabled)) {
+                     $result.= "   <th$first>".(isset($this->header[$i])?$this->header[$i]:"")."</th>";
+                 } else {
+                     $result.= "   <th$first><a $link>".(isset($this->header[$i])?$this->header[$i]:"")."</a>$sorter</th>";
+@@ -368,7 +368,7 @@
+     {
+ 
+         // Filter GET with "act" attributes
+-        if (!$this->reorderable){
++        if ((!$this->reorderable) && ($this->sortingEnabled)) {
+             if(isset($_GET['act']) && isset($_GET['PID']) && $this->id == $_GET['PID']) {
+ 
+                 $key= validate($_GET['act']);
 @@ -535,7 +535,7 @@
      }
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/gosa.git