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

module/action/lang/en.php

@@ -291,8 +291,9 @@ $lang->action->label->syncprogram           = 'start';
 $lang->action->label->syncproject           = 'start';
 $lang->action->label->syncexecution         = 'start';
 $lang->action->label->startProgram          = '(The start of the project sets the status of the program as Ongoing)';
-$lang->action->label->createmr              = 'MR Linked';
-$lang->action->label->mergedmr              = 'MR Merged';
+$lang->action->label->createmr              = 'Merge Request Linked';
+$lang->action->label->deletemr              = 'Merge Request Unlinked';
+$lang->action->label->mergedmr              = 'Merge Request Merged';
 $lang->action->label->reopen                = 'Reopen';
 $lang->action->label->approve               = 'Passed';
 $lang->action->label->reject                = 'Rejected';

module/action/lang/zh-cn.php

@@ -294,8 +294,9 @@ $lang->action->label->syncprogram           = '开始了';
 $lang->action->label->syncproject           = '开始了';
 $lang->action->label->syncexecution         = '开始了';
 $lang->action->label->startProgram          = '（因项目开始而启动项目集）';
-$lang->action->label->createmr              = 'MR关联了';
-$lang->action->label->mergedmr              = 'MR合并了';
+$lang->action->label->createmr              = '合并请求关联了';
+$lang->action->label->deletemr              = '合并请求取消了';
+$lang->action->label->mergedmr              = '合并请求合并了';
 $lang->action->label->compilepass           = '构建成功';
 $lang->action->label->compilefail           = '构建失败';
 $lang->action->label->reopen                = '重新打开';

module/common/view/kanban.html.php

@@ -40,7 +40,7 @@
 #kanbanList .kanban-card.kanban-card-span:hover,
 #kanbanList .kanban-col[data-type="unclosedProduct"] .kanban-card:hover {box-shadow: none;}
 #kanbanList .kanban-card.kanban-card-span > .title,
-#kanbanList .kanban-col[data-type="unclosedProduct"] .kanban-card > .title {white-space: normal; line-height: 1;}
+#kanbanList .kanban-col[data-type="unclosedProduct"] .kanban-card > .title {white-space: nowrap; line-height: 1;}
 
 #kanbanList .kanban-col[data-type="normalRelease"] .kanban-card > .title {display: flex; flex-direction: row; flex-wrap: nowrap; align-items: center;}
 #kanbanList .kanban-col[data-type="normalRelease"] .kanban-card > .title > .text {display: block; white-space: nowrap; text-overflow: ellipsis; overflow: hidden;}

module/execution/view/task.html.php

@@ -103,6 +103,7 @@ body {margin-bottom: 25px;}
     ?>
     <a class="btn btn-link querybox-toggle" id='bysearchTab'><i class="icon icon-search muted"></i> <?php echo $lang->product->searchStory;?></a>
   </div>
+  <?php if(!isonlybody()): ?>
   <div class="btn-toolbar pull-right">
     <?php
     if(!isset($browseType)) $browseType = '';
@@ -176,6 +177,7 @@ body {margin-bottom: 25px;}
     <?php echo "</div>";?>
     <?php endif;?>
   </div>
+  <?php endif; ?>
 </div>
 <div id="mainContent" class="main-row fade">
   <div class="side-col" id="sidebar">
@@ -364,6 +366,7 @@ body {margin-bottom: 25px;}
   </div>
 </div>
 <?php js::set('replaceID', 'taskList')?>
+<?php if(isonlybody()) js::set('modalWidthReset', 1200) ?>
 <script>
 $(function()
 {

module/gitlab/lang/zh-cn.php

@@ -114,9 +114,9 @@ $lang->gitlab->user = new stdclass;
 $lang->gitlab->user->id             = "用户ID";
 $lang->gitlab->user->name           = "名称";
 $lang->gitlab->user->username       = "用户名";
-$lang->gitlab->user->email          = "电子邮件";
+$lang->gitlab->user->email          = "邮箱";
 $lang->gitlab->user->password       = "密码";
-$lang->gitlab->user->passwordRepeat = "重复密码";
+$lang->gitlab->user->passwordRepeat = "请重复密码";
 $lang->gitlab->user->projectsLimit  = "限制项目";
 $lang->gitlab->user->canCreateGroup = "可创建组";
 $lang->gitlab->user->external       = "外部人员";

module/gitlab/view/createuser.html.php

@@ -72,7 +72,7 @@
             <th><?php echo $lang->gitlab->user->avatar;?></th>
             <td>
               <div id="avatarUpload" class="text-center">
-                <?php echo html::avatar(array('avatar'=>' ', 'account'=>''), 50); ?>
+                <?php echo html::avatar(array('avatar'=>$defaultTheme . 'images/repo/avatar.jpeg', 'account'=>''), 50); ?>
                 <input type="file" name="avatar" id="files" class="form-control hidden">
                 <?php echo html::a('javascript:void(0);', '<i class="icon icon-pencil icon-2x"></i>', '', "class='btn-avatar' id='avatarUploadBtn' data-toggle='tooltip' data-container='body' data-placement='bottom' title='{$lang->gitlab->user->avatar}'");?>
               </div>

module/gitlab/view/edituser.html.php

@@ -73,7 +73,7 @@
             <th><?php echo $lang->gitlab->user->avatar;?></th>
             <td>
               <div id="avatarUpload" class="text-center">
-                <?php echo html::avatar(array('avatar'=>$user->avatar_url, 'account'=>''), 50); ?>
+                <?php echo html::avatar(array('avatar'=>$user->avatar_url ? $user->avatar_url : $defaultTheme . 'images/repo/avatar.jpeg', 'account'=>''), 50); ?>
                 <input type="file" name="avatar" id="files" class="form-control hidden">
                 <?php echo html::a('javascript:void(0);', '<i class="icon icon-pencil icon-2x"></i>', '', "class='btn-avatar' id='avatarUploadBtn' data-toggle='tooltip' data-container='body' data-placement='bottom' title='{$lang->gitlab->user->avatar}'");?>
               </div>

module/mail/model.php

@@ -292,6 +292,7 @@ class mailModel extends model
             }
 
             /* Remove deleted users. */
+            $this->app->loadConfig('message');
             $users      = $this->loadModel('user')->getPairs('nodeleted|all');
             $blockUsers = isset($this->config->message->blockUser) ? explode(',', $this->config->message->blockUser) : array();
             foreach($toList as $key => $to) if(!isset($users[trim($to)]) or in_array(trim($to), $blockUsers)) unset($toList[$key]);

module/mr/model.php

@@ -1080,7 +1080,9 @@ class mrModel extends model
      */
     public function unlink($MRID, $productID, $type, $linkID)
     {
-        return $this->dao->delete()->from(TABLE_RELATION)->where('product')->eq($productID)->andWhere('AType')->eq('mr')->andWhere('AID')->eq($MRID)->andWhere('BType')->eq($type)->andWhere('BID')->eq($linkID)->exec();
+        $this->dao->delete()->from(TABLE_RELATION)->where('product')->eq($productID)->andWhere('AType')->eq('mr')->andWhere('AID')->eq($MRID)->andWhere('BType')->eq($type)->andWhere('BID')->eq($linkID)->exec();
+
+        $this->loadModel('action')->create($type, $linkID, 'deletemr');
     }
 
     /**