Merge branch '15.6' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.6

module/group/model.php

@@ -364,16 +364,18 @@ class groupModel extends model
         $actions['actions'] = $dynamic;
 
         /* Update whitelist. */
-        $users   = $this->getUserPairs($groupID);
-        $users   = array_keys($users);
+        $this->loadModel('personnel');
+        $users = $this->getUserPairs($groupID);
+        $users = array_keys($users);
+
         foreach($this->config->group->acl->objectTypes as $key => $objectType)
         {
             $oldAcls        = isset($oldGroup->acl[$key]) ? $oldGroup->acl[$key] : array();
             $newAcls        = isset($actions[$key]) ? $actions[$key] : array();
             $needRemoveAcls = array_diff($oldAcls, $newAcls);
             $needAddAcls    = array_diff($newAcls, $oldAcls);
-            foreach($needAddAcls as $objectID) $this->loadModel('personnel')->updateWhitelist($users, $objectType, $objectID, 'whitelist', 'add', 'increase');
-            foreach($needRemoveAcls as $objectID) $this->loadModel('personnel')->deleteWhitelist($users, $objectType, $objectID);
+            foreach($needAddAcls as $objectID) $this->personnel->updateWhitelist($users, $objectType, $objectID, 'whitelist', 'sync', 'increase');
+            foreach($needRemoveAcls as $objectID) $this->personnel->deleteWhitelist($users, $objectType, $objectID);
         }
 
 

module/personnel/model.php

@@ -749,6 +749,7 @@ class personnelModel extends model
         $this->dao->delete()->from(TABLE_ACL)
             ->where('objectID')->eq($objectID)
             ->andWhere('account')->in($users)
+            ->andWhere('source')->eq('sync')
             ->exec();
 
         foreach($users as $account)

module/story/view/view.html.php

@@ -502,11 +502,11 @@
                   <td class='pd-0'>
                     <ul class='list-unstyled'>
                     <?php
-                    $misc = isonlybody() ? "" : "class='iframe' data-width='80%'";
+                    $misc = isonlybody() ? "showinonlybody" : "class='iframe' data-width='80%'";
 
                     foreach($cases as $case)
                     {
-                        echo "<li title='[C]$case->id $case->title'>" . html::a($this->createLink('testcase', 'view', "caseID=$case->id", '', true), "[C] #$case->id $case->title", '',"data-toggle='modal'") . '</li>';
+                        echo "<li title='[C]$case->id $case->title'>" . html::a($this->createLink('testcase', 'view', "caseID=$case->id", '', true), "[C] #$case->id $case->title", '', $misc) . '</li>';
                     }
                     ?>
                     </ul>

module/testcase/js/create.js

@@ -151,4 +151,17 @@ $(function()
     });
 
     $('#subNavbar li[data-id="testcase"]').addClass('active');
+
+    $('#story').change(function()
+    {
+        var storyID = $('#story').val();
+        if(storyID != 0)
+        {
+            $('#storyIdBox span').removeClass('hidden');
+        }
+        else
+        {
+            $('#storyIdBox span').addClass('hidden');
+        }
+    })
 });