[debian-edu-commits] debian-edu/pkg-team/ 01/01: debian/patches: Add 1014_fix-description-of-new-prim-groups.patch. Fix obtaining givenName and sn from user object when creating its primary POSIX group.

[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 b996e5ca0c830b4f465ce199268886a79d038696
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Sep 3 04:40:38 2015 +0200

    debian/patches: Add 1014_fix-description-of-new-prim-groups.patch. Fix obtaining givenName and sn from user object when creating its primary POSIX group.
---
 .../1014_fix-description-of-new-prim-groups.patch     | 19 +++++++++++++++++++
 debian/patches/series                                 |  1 +
 2 files changed, 20 insertions(+)

diff --git a/debian/patches/1014_fix-description-of-new-prim-groups.patch b/debian/patches/1014_fix-description-of-new-prim-groups.patch
new file mode 100644
index 0000000..1dda832
--- /dev/null
+++ b/debian/patches/1014_fix-description-of-new-prim-groups.patch
@@ -0,0 +1,19 @@
+Description: Fix obtaining givenName and sn when creating primary groups
+Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+
+--- a/gosa-core/plugins/personal/posix/class_posixAccount.inc
++++ b/gosa-core/plugins/personal/posix/class_posixAccount.inc
+@@ -756,7 +756,12 @@
+         $g->cn= $groupcn;
+         $g->force_gid= 1;
+         $g->gidNumber= $this->gidNumber;
+-        $g->description= _("Group of user")." ".$this->givenName." ".$this->sn;
++        if (isset($this->parent) && $this->parent !== NULL){
++            $g->description= _("Group of user")." ".$this->parent->by_object['user']->givenName." ".$this->parent->by_object['user']->sn;
++        }
++        else {
++            $g->description= _("Group of user")." ".$this->uid;
++        }
+         $g->save ();
+ 
+         @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__,
diff --git a/debian/patches/series b/debian/patches/series
index 93090c9..acd3747 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -16,6 +16,7 @@
 1011_define-isPluginModified.patch
 1012_allow-one-level-domains-in-email-addresses.patch
 1013_fix-smarty-gettext-tags-recognition.patch
+1014_fix-description-of-new-prim-groups.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