[debian-edu-commits] debian-edu/pkg-team/ 01/01: debian/patches: Add 1021_disable-sorting-in-DHCP-section-lists.patch. Disable sorting for DHCP section lists (plus fix accessor name in class_sortableList.inc).

Mike Gabriel sunweaver at debian.org
Thu Dec 10 14:39:58 UTC 2015


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

sunweaver pushed a commit to branch master
in repository gosa.

commit 6565b8cd6013bbef06969a00f4fdc726fc471f66
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Dec 10 15:39:50 2015 +0100

    debian/patches: Add 1021_disable-sorting-in-DHCP-section-lists.patch. Disable sorting for DHCP section lists (plus fix accessor name in class_sortableList.inc).
---
 ...021_disable-sorting-in-DHCP-section-lists.patch | 35 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 36 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
new file mode 100644
index 0000000..2bc34a9
--- /dev/null
+++ b/debian/patches/1021_disable-sorting-in-DHCP-section-lists.patch
@@ -0,0 +1,35 @@
+Description: Disable sorting for DHCP section lists (plus fix accessor name in class_sortableList.inc)
+Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+
+--- a/dhcp/admin/systems/services/dhcp/class_servDHCP.inc
++++ b/dhcp/admin/systems/services/dhcp/class_servDHCP.inc
+@@ -65,6 +65,7 @@
+         $this->entryList = new sortableListing();
+         $this->entryList->setDeleteable(false);
+         $this->entryList->setEditable(false);
++        $this->entryList->setSortingEnabled(false);
+         $this->entryList->setWidth("100%");
+         $this->entryList->setHeight("400px");
+         $this->entryList->setHeader(array(_("Type"),_("Option"),_("Address")));
+--- a/gosa-core/include/class_acl.inc
++++ b/gosa-core/include/class_acl.inc
+@@ -270,7 +270,7 @@
+         $this->aclMemberList->setEditable(false);
+         $this->aclMemberList->setDeleteable(true);
+         $this->aclMemberList->setInstantDelete(false);
+-        $this->aclMemberList->sortingEnabled(true);
++        $this->aclMemberList->setSortingEnabled(true);
+         $this->aclMemberList->setWidth("100%");
+         $this->aclMemberList->setHeight("150px");
+         $this->aclMemberList->setColspecs(array('20px','*','*'));
+--- a/gosa-core/include/class_sortableListing.inc
++++ b/gosa-core/include/class_sortableListing.inc
+@@ -535,7 +535,7 @@
+     }
+ 
+ 
+-    public function sortingEnabled($bool = TRUE)
++    public function setSortingEnabled($bool = TRUE)
+     {
+         $this->sortingEnabled= $bool;
+     }
diff --git a/debian/patches/series b/debian/patches/series
index 896864b..b202eac 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -23,6 +23,7 @@
 1018_no-item-multiplication-on-duplicate-search-results.patch
 1019_fix-various-typos.patch
 1020_ob-fixes.patch
+1021_disable-sorting-in-DHCP-section-lists.patch
 2001_fix-smarty-location.patch
 2002_fix-template-location.patch
 2003_fix-class-mapping.patch

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



More information about the debian-edu-commits mailing list