Merge branch 'sgm_fixbug' into 'master'

* Finish task #59081.

See merge request easycorp/zentaopms!4168

module/group/control.php

@@ -317,7 +317,9 @@ class group extends control
         $this->view->title         = $title;
         $this->view->position      = $position;
         $this->view->allUsers      = array('' => '') + $groupUsers + $this->loadModel('dept')->getDeptUserPairs($deptID);
+        $this->view->groupID       = $groupID;
         $this->view->deptID        = $deptID;
+        $this->view->deptName      = $deptID ? $this->dao->findById($deptID)->from(TABLE_DEPT)->fetch('name') : '';
         $this->view->programs      = $programs;
         $this->view->projects      = $projects;
         $this->view->products      = $products;

module/group/css/manageprojectadmin.css

@@ -0,0 +1 @@
+#sidebar .cell {margin-top: 40px;}

module/group/js/manageprojectadmin.js

@@ -32,11 +32,15 @@ function addItem(obj)
             var id   = $(this).attr('id');
             $(this).attr('name', name.replace(/\d+/g, maxNum));
             $(this).attr('id', id.replace(/\d+/g, maxNum));
+            $(this).attr('checked', false);
         })
 
         $(lastTr).after($newRow);
         $newRow.find('div.picker').remove();
         $newRow.find('.picker-select').val('').picker({chosenMode: true});
+
+        var $picker = $newRow.find('.picker-select').data('zui.picker');
+        $picker.setDisabled(false);
         setTimeout(function()
         {
             $newRow.removeClass('highlight');

module/group/lang/de.php

@@ -20,13 +20,18 @@ $lang->group->managePriv         = 'Mehrfachzuordnung';
 $lang->group->managePrivByGroup  = 'Rechte';
 $lang->group->managePrivByModule = 'Modul Rechte';
 $lang->group->byModuleTips       = '<span class="tips">(SHIFT/STRG für Multi-Select)</span>';
+$lang->group->allTips            = 'After checking this option, the administrator can manage all objects in the system, including objects created later.';
 $lang->group->manageMember       = 'Mitglieder';
 $lang->group->manageProjectAdmin = 'Manage Program Admins';
 $lang->group->confirmDelete      = 'Möchten Sie die Gruppe löschen?';
 $lang->group->successSaved       = 'Gespeichert!';
 $lang->group->errorNotSaved      = 'Fehlgeschlagen. Bitte aktion und Gruppe wählen.';
 $lang->group->viewList           = 'Anzeige ist zulässig.';
+$lang->group->object             = 'Manage Object';
+$lang->group->manageProgram      = 'Manage Program';
 $lang->group->manageProject      = 'Manage Project';
+$lang->group->manageExecution    = 'Manage ' . $lang->execution->common;
+$lang->group->manageProduct      = 'Manage ' . $lang->productCommon;
 $lang->group->programList        = 'Access Program';
 $lang->group->productList        = 'Produkte sind zugänglich.';
 $lang->group->projectList        = 'Projekte sind zugänglich.';
@@ -39,6 +44,7 @@ $lang->group->noneExecution      = "No {$lang->execution->common}";
 $lang->group->project            = 'Project';
 $lang->group->group              = 'Group';
 $lang->group->more               = 'More';
+$lang->group->allCheck           = 'All';
 
 global $config;
 if($config->systemMode == 'new') $lang->group->noneProject = 'No Project';

module/group/lang/fr.php

@@ -20,13 +20,18 @@ $lang->group->managePriv         = 'Gérer Privilèges';
 $lang->group->managePrivByGroup  = 'Gérer Privilèges par Groupe';
 $lang->group->managePrivByModule = 'Gérer Privilèges par Module';
 $lang->group->byModuleTips       = '<span class="tips">(Shift/Ctrl pour sélection multiple)</span>';
+$lang->group->allTips            = 'After checking this option, the administrator can manage all objects in the system, including objects created later.';
 $lang->group->manageMember       = 'Gérer Membres';
 $lang->group->manageProjectAdmin = 'Manage Program Admins';
 $lang->group->confirmDelete      = "Voulez-vous supprimer ce groupe d'utilisateurs ?";
 $lang->group->successSaved       = 'Sauvé.';
 $lang->group->errorNotSaved      = 'Echec. Veuillez sélectionner actions et groupes.';
 $lang->group->viewList           = 'Accès Consultation';
+$lang->group->object             = 'Manage Object';
+$lang->group->manageProgram      = 'Manage Program';
 $lang->group->manageProject      = 'Manage Project';
+$lang->group->manageExecution    = 'Manage ' . $lang->execution->common;
+$lang->group->manageProduct      = 'Manage ' . $lang->productCommon;
 $lang->group->programList        = 'Accè Programs';
 $lang->group->productList        = 'Accès ' . $lang->productCommon . 's';
 $lang->group->projectList        = 'Accès ' . $lang->executionCommon . 's';
@@ -39,6 +44,7 @@ $lang->group->noneExecution      = "No {$lang->execution->common}";
 $lang->group->project            = 'Project';
 $lang->group->group              = 'Group';
 $lang->group->more               = 'More';
+$lang->group->allCheck           = 'All';
 
 global $config;
 if($config->systemMode == 'new') $lang->group->noneProject = 'No Project';

module/group/view/manageprojectadmin.html.php

@@ -13,6 +13,12 @@
 <?php include '../../common/view/header.html.php';?>
 <div id='mainContent' class='main-row fade in'>
   <div class="side-col" id="sidebar">
+    <div id="sidebarHeader">
+      <div class="title">
+      <?php echo $deptName ? $deptName : $lang->dept->common;?>
+      <?php if($deptName) echo html::a(inlink('manageProjectadmin', "groupID=$groupID"), "<i class='icon icon-sm icon-close'></i>", '', "class='text-muted'");?>
+      </div>
+    </div>
     <div class='cell'>
       <div class='panel panel-sm'>
         <div class='panel-heading nobr'><strong><?php echo $lang->dept->common;?></strong></div>