Merge branch 'fixbug' into 'master'

* Fix bug #22025,22028.

See merge request easycorp/zentaopms!3181

extension/lite/kanban/ext/view/view.lite.html.hook.php

@@ -2,6 +2,6 @@
 <?php if(trim($config->visions, ',') == 'lite'): ?>
 $('#headerActions').css("right", '110px');
 <?php else: ?>
-$('#headerActions').css("right", '190px');
+$('#headerActions').css("right", '205px');
 <?php endif; ?>
-</script>
+</script>

extension/lite/project/ext/view/execution.html.php

@@ -94,11 +94,23 @@
               <div class="kanban-footer">
                 <div class='kanban-members pull-left'>
                   <?php $teams = $memberGroup[$kanban->id];?>
+                  <?php $count = 0;?>
                   <?php foreach($teams as $member):?>
+                  <?php if($count > 2) break;?>   
+                  <?php $count ++;?>       
                   <div title="<?php echo zget($users, $member->account);?>">
                     <?php echo html::smallAvatar(array('avatar' => zget($usersAvatar, $member->account), 'account' => $member->account, 'name' => isset($member->realname) ? $member->realname : '')); ?>
                   </div>
                   <?php endforeach;?>
+                  <?php if(count($teams) > 4):?>
+                  <?php echo '<span>… </span>';?> 
+                  <?php endif;?> 
+                  <?php if(count($teams) > 3):?>
+                  <?php $lastMember = end($teams);?>
+                  <div title="<?php echo $lastMember->realname;?>"> 
+                  <?php echo html::smallAvatar(array('avatar' => $usersAvatar[$lastMember->account], 'account' => $lastMember->account, 'name' => $lastMember->realname), 'avatar-circle avatar-' . key($lastMember)); ?>     
+                  </div>         
+                  <?php endif;?> 
                 </div>
                 <div class='kanban-members-count pull-left'><?php echo sprintf($lang->project->teamSumCount, count($teams));?></div>
                 <div class='kanban-acl pull-right'>

module/common/view/customfield.html.php

@@ -17,7 +17,7 @@
   #formSettingForm .checkbox-primary {width: 50%; float: left; margin: 3px 0;}
   #formSetting .btn {margin-right: 8px;}
   </style>
-  <button type="button" title="<?php echo $lang->customField;?>" class="btn btn-link" data-toggle="dropdown"><i class="icon icon-cog"></i></button>
+  <button type="button" title="<?php echo $lang->customField;?>" class="btn btn-link" id="customField" data-toggle="dropdown"><i class="icon icon-cog"></i></button>
   <div class="dropdown-menu pull-right" id="formSetting">
     <form class='with-padding load-indicator' id='formSettingForm' method='post' target='hiddenwin' action='<?php echo $customLink?>'>
       <div><?php echo $lang->customField;?></div>

module/kanban/js/view.js

@@ -1170,8 +1170,8 @@ function createColumnCreateMenu(options)
     if(privs.includes('createCard')) items.push({label: kanbanLang.createCard, url: $.createLink('kanban', 'createCard', 'kanbanID=' + kanbanID + '&regionID=' + regionID + '&groupID=' + groupID + '&columnID=' + columnID, '', true), className: 'iframe', attrs: {'data-toggle': 'modal'}});
     if(privs.includes('batchCreateCard')) items.push({label: kanbanLang.batchCreateCard, url: $.createLink('kanban', 'batchCreateCard', 'kanbanID=' + kanbanID + '&regionID=' + regionID + '&groupID=' + groupID + '&laneID=' + laneID + '&columnID=' + columnID), attrs: {'data-width': '80%'}});
     if(privs.includes('import') && kanban.object.indexOf('cards') != -1) items.push({label: kanbanLang.importCard, url: $.createLink('kanban', 'importCard', 'kanbanID=' + kanbanID + '&regionID=' + regionID + '&groupID=' + groupID + '&columnID=' + columnID), className: 'iframe', attrs: {'data-toggle': 'modal'}});
-    if(privs.includes('import') && kanban.object && kanban.object != 'cards') items.push({className: 'parentDivider'});
-    if(privs.includes('import') && kanban.object && kanban.object != 'cards') items.push({label: kanbanLang.importAB, className: 'import'});
+    if(privs.includes('import') && kanban.object && kanban.object != 'cards' && vision != 'lite') items.push({className: 'parentDivider'});
+    if(privs.includes('import') && kanban.object && kanban.object != 'cards' && vision != 'lite') items.push({label: kanbanLang.importAB, className: 'import'});
 
     return items;
 }

module/kanban/view/view.html.php

@@ -20,6 +20,7 @@ $app->loadLang('productplan');
 $laneCount = 0;
 foreach($regions as $region) $laneCount += $region->laneCount;
 
+js::set('vision', $this->config->vision);
 js::set('regions', $regions);
 js::set('kanban', $kanban);
 js::set('kanbanLang', $lang->kanban);

module/task/js/batchcreate.js

@@ -4,6 +4,7 @@ $(function()
     removeDitto();
     if($('th.c-name').width() < 200) $('th.c-name').width(200);
     if(taskConsumed > 0) bootbox.alert(addChildTask);
+    $('#customField').on('click', function(){$('#tableBody .chosen-with-drop').removeClass('chosen-with-drop chosen-container-active')});
 });
 
 $(document).on('change', "[name^='estStarted'], [name^='deadline']", function()