Merge branch 'devops_16786' into 'master'

* Fix bug#16786,16981

See merge request easycorp/zentaopms!771

module/gitlab/lang/en.php

@@ -16,6 +16,7 @@ $lang->gitlab->gitlabAccount     = 'GitLab Account';
 $lang->gitlab->zentaoAccount     = 'Zentao Account';
 $lang->gitlab->bindingStatus     = 'Binding Status';
 $lang->gitlab->binded            = 'Binded';
+$lang->gitlab->bindedError       = 'The bound user has been deleted or modified. Please bind again.';
 $lang->gitlab->serverFail        = 'Connect to GitLab server failed, please check the GitLab server.';
 $lang->gitlab->lastUpdate        = 'Last Update';
 $lang->gitlab->confirmAddWebhook = 'Are you sure about creating Webhook？';

module/gitlab/lang/zh-cn.php

@@ -16,6 +16,7 @@ $lang->gitlab->gitlabAccount     = 'GitLab用户';
 $lang->gitlab->zentaoAccount     = '禅道用户';
 $lang->gitlab->bindingStatus     = '绑定状态';
 $lang->gitlab->binded            = '已绑定';
+$lang->gitlab->bindedError       = '绑定的用户已删除或者已修改，请重新绑定';
 $lang->gitlab->serverFail        = '连接GitLab服务器异常，请检查GitLab服务器。';
 $lang->gitlab->lastUpdate        = '最后更新';
 $lang->gitlab->confirmAddWebhook = '您确定创建Webhook吗？';

module/gitlab/view/binduser.html.php

@@ -22,7 +22,7 @@
           <tr>
             <th colspan='2'><?php echo $lang->gitlab->gitlabAccount;?></th>
             <th><?php echo $lang->gitlab->zentaoAccount;?></th>
-            <th><?php echo $lang->gitlab->bindingStatus;?></th>
+            <th class='w-150px'><?php echo $lang->gitlab->bindingStatus;?></th>
           </tr>
         </thead>
         <tbody>
@@ -37,11 +37,11 @@
             </td>
             <td><?php echo html::select("zentaoUsers[$gitlabUser->id]", $userPairs, '', "class='form-control select chosen'" );?></td>
             <td></td>
-         </tr>
-         <?php endforeach;?>
-         <?php foreach($gitlabUsers as $gitlabUser):?>
-         <?php if(!isset($gitlabUser->zentaoAccount)) continue;?>
-         <tr>
+          </tr>
+          <?php endforeach;?>
+          <?php foreach($gitlabUsers as $gitlabUser):?>
+          <?php if(!isset($gitlabUser->zentaoAccount)) continue;?>
+          <tr>
             <td class='w-60px'><?php echo html::image($gitlabUser->avatar, "height=40");?></td>
             <td>
               <strong><?php echo $gitlabUser->realname;?></strong>
@@ -49,9 +49,17 @@
               <?php echo $gitlabUser->account . " &lt;" . $gitlabUser->email . "&gt;";?>
             </td>
             <td><?php echo html::select("zentaoUsers[$gitlabUser->id]", $userPairs, $gitlabUser->zentaoAccount, "class='form-control select chosen'" );?></td>
-            <td><?php echo isset($bindedUsers[$gitlabUser->zentaoAccount]) ? $lang->gitlab->binded : ""; ?></td>
-         </tr>
-         <?php endforeach;?>
+            <td>
+              <?php if(isset($bindedUsers[$gitlabUser->zentaoAccount])):?>
+              <?php if(!empty(zget($userPairs, $gitlabUser->zentaoAccount, ''))):?>
+              <?php echo $lang->gitlab->binded;?>
+              <?php else:?>
+              <?php echo '<span class="text-red">' . $lang->gitlab->bindedError . '</span>';?>
+              <?php endif;?>
+              <?php endif;?>
+            </td>
+          </tr>
+          <?php endforeach;?>
         </tbody>
         <tfoot>
           <tr>

module/mr/view/browse.html.php

@@ -64,11 +64,13 @@
       </thead>
       <tbody>
         <?php foreach($MRList as $MR):?>
+        <?php if(!isset($projects[$MR->sourceProject])) $projects[$MR->sourceProject] = $this->loadModel('gitlab')->apiGetSingleProject($MR->gitlabID, $MR->sourceProject); ?>
+        <?php if(!isset($projects[$MR->targetProject])) $projects[$MR->targetProject] = $this->loadModel('gitlab')->apiGetSingleProject($MR->gitlabID, $MR->targetProject); ?>
         <tr>
           <td class='text'><?php echo $MR->id;?></td>
           <td class='text'><?php echo html::a(inlink('view', "mr={$MR->id}"), $MR->title);?></td>
-          <td class='text'><?php echo $this->loadModel('gitlab')->apiGetSingleProject($MR->gitlabID, $MR->sourceProject)->name_with_namespace . ':' . $MR->sourceBranch;?></td>
-          <td class='text'><?php echo $this->loadModel('gitlab')->apiGetSingleProject($MR->gitlabID, $MR->targetProject)->name_with_namespace . ':' . $MR->targetBranch;?></td>
+          <td class='text' title='<?php echo $projects[$MR->sourceProject]->name_with_namespace . ':' . $MR->sourceBranch;?>'><?php echo $projects[$MR->sourceProject]->name_with_namespace . ':' . $MR->sourceBranch;?></td>
+          <td class='text' title='<?php echo $projects[$MR->targetProject]->name_with_namespace . ':' . $MR->targetBranch;?>'><?php echo $projects[$MR->targetProject]->name_with_namespace . ':' . $MR->targetBranch;?></td>
           <?php if($MR->status == 'closed'):?>
             <td class='text'><?php echo zget($lang->mr->statusList, $MR->status);?></td>
           <?php else:?>