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

module/action/lang/en.php

@@ -674,3 +674,9 @@ $lang->action->apiTitle->reviewrejected        = 'Review rejected';
 $lang->action->apiTitle->reviewclarified       = 'Review clarified';
 $lang->action->apiTitle->commitsummary         = 'Commit summary';
 $lang->action->apiTitle->updatetrainee         = 'Update trainee';
+
+/* Code Review in Repo or Merge Request module. */
+$lang->action->desc->repocreated                  = '$date, created and reviewed by <strong>$actor</strong>: $extra.' . "\n";
+$lang->action->label->repocreated                 = "create and review";
+$lang->action->dynamicAction->task['gitcommited'] = 'Git Commit';
+$lang->action->dynamicAction->bug['repocreated']  = $lang->action->label->repocreated;

module/action/lang/zh-cn.php

@@ -674,3 +674,9 @@ $lang->action->apiTitle->reviewrejected        = '拒绝';
 $lang->action->apiTitle->reviewclarified       = '有待明确';
 $lang->action->apiTitle->commitsummary         = '提交培训总结';
 $lang->action->apiTitle->updatetrainee         = '更新培训人员';
+
+/* Code Review in Repo or Merge Request module. */
+$lang->action->desc->repocreated                  = '$date, 由 <strong>$actor</strong> 评审创建：$extra。' . "\n";
+$lang->action->label->repocreated                 = "创建评审";
+$lang->action->dynamicAction->task['gitcommited'] = 'git提交';
+$lang->action->dynamicAction->bug['repocreated']  = '创建代码评审';

module/action/lang/zh-tw.php

@@ -674,3 +674,9 @@ $lang->action->apiTitle->reviewrejected        = '拒絶';
 $lang->action->apiTitle->reviewclarified       = '有待明確';
 $lang->action->apiTitle->commitsummary         = '提交培訓總結';
 $lang->action->apiTitle->updatetrainee         = '更新培訓人員';
+
+/* Code Review in Repo or Merge Request module. */
+$lang->action->desc->repocreated                  = '$date, 由 <strong>$actor</strong> 評審創建：$extra。' . "\n";
+$lang->action->label->repocreated                 = "創建評審";
+$lang->action->dynamicAction->task['gitcommited'] = 'git提交';
+$lang->action->dynamicAction->bug['repocreated']  = '創建代碼評審';

module/action/model.php

@@ -635,7 +635,7 @@ class actionModel extends model
     /**
      * Print actions of an object.
      *
-     * @param  array    $action
+     * @param  object    $action
      * @param  string   $desc
      * @access public
      * @return void
@@ -939,9 +939,9 @@ class actionModel extends model
     /**
      * Transform the actions for display.
      *
-     * @param  int    $actions
+     * @param  array    $actions
      * @access public
-     * @return void
+     * @return object
      */
     public function transformActions($actions)
     {
@@ -1529,7 +1529,7 @@ class actionModel extends model
     /**
      * Print actions of an object for API(JIHU).
      *
-     * @param  array    $action
+     * @param  object    $action
      * @access public
      * @return void
      */

module/mr/control.php

@@ -365,7 +365,7 @@ class mr extends control
     /**
      * Close this MR.
      *
-     * @param  mixed $MRID
+     * @param  int $MRID
      * @return void
      */
     public function close($MRID)
@@ -377,7 +377,7 @@ class mr extends control
     /**
      * Reopen this MR.
      *
-     * @param  mixed $MRID
+     * @param  int $MRID
      * @return void
      */
     public function reopen($MRID)

module/mr/css/common.css

@@ -7,7 +7,7 @@ h3 {font-size: 16px;}
 .revision {font-size: 12px; line-height: 20px; text-align: right; padding-right: 8px;}
 .directory {background-image:url('theme/default/images/repo/dir.png');}
 .file {background-image:url('theme/default/images/repo/txt.png');}
-//.icon {width: 17px; padding-left: 10px; padding-right: 2px;}
+/* .icon {width: 17px; padding-left: 10px; padding-right: 2px;} */
 .mini-icon {display: inline-block; height: 16px; width: 16px; background-color: transparent; background-position: 0 0; background-repeat: no-repeat; vertical-align: text-bottom;}
 .action {float: left;}
 .input-group select#encrypt {border-left: 0px;}

module/mr/js/diff.js

@@ -102,7 +102,7 @@ $(document).ready(function()
         $bug.data('data', bug);
         $bug.toggleClass('show', show > 1);
         if(show > 2) highlight($bug);
-        
+
         if(bug.comments)
         {
             commentCount = bug.comments.length;

module/mr/model.php

@@ -87,9 +87,9 @@ class mrModel extends model
     {
         if (!empty($_POST['compile']))
         {
-            $repoID = $this->post->repo;
-            $jobID  = $this->post->job;
-            $compileID = $this->post->compile;
+            $repoID        = $this->post->repo;
+            $jobID         = $this->post->job;
+            $compileID     = $this->post->compile;
             $compileStatus = $this->loadModel('compile')->getByID($this->post->compile)->status;
 
             $MR = fixer::input('post')
@@ -175,9 +175,9 @@ class mrModel extends model
     {
         if (!empty($_POST['compile']))
         {
-            $repoID = $this->post->repo;
-            $jobID  = $this->post->job;
-            $compileID = $this->post->compile;
+            $repoID        = $this->post->repo;
+            $jobID         = $this->post->job;
+            $compileID     = $this->post->compile;
             $compileStatus = $this->loadModel('compile')->getByID($this->post->compile)->status;
 
             $MR = fixer::input('post')

module/mr/view/create.html.php

@@ -83,7 +83,7 @@
           <tr>
             <td colspan='2' class='text-center form-actions'>
               <?php echo html::submitButton(); ?>
-              <?php if (!isonlybody()) echo html::a(inlink('browse', ""), $lang->goback, '', 'class="btn btn-wide"'); ?>
+              <?php if(!isonlybody()) echo html::a(inlink('browse', ""), $lang->goback, '', 'class="btn btn-wide"'); ?>
             </td>
             <td></td>
           </tr>

module/mr/view/view.html.php

@@ -52,20 +52,20 @@
           </div>
         </div>
       </div>
-      <?php if ($rawMR->state == 'opened') : ?>
+      <?php if($rawMR->state == 'opened'): ?>
         <div class="cell"><?php echo sprintf($lang->mr->commandDocument, $httpRepoURL, $MR->sourceBranch, $branchPath, $MR->targetBranch, $branchPath, $MR->targetBranch); ?></div>
       <?php endif; ?>
       <div class='main-actions'>
         <div class="btn-toolbar">
           <?php common::printBack(inlink('browse', '')); ?>
-          <?php if ($rawMR->state == 'opened' and !$rawMR->has_conflicts) echo html::a(inlink('accept', "mr=$MR->id"), '<i class="icon icon-flow"></i> ' . $lang->mr->acceptMR, '', "id='mergeButton' class='btn'"); ?>
-          <?php if ($rawMR->state == 'opened') : ?>
+          <?php if($rawMR->state == 'opened' and !$rawMR->has_conflicts) echo html::a(inlink('accept', "mr=$MR->id"), '<i class="icon icon-flow"></i> ' . $lang->mr->acceptMR, '', "id='mergeButton' class='btn'"); ?>
+          <?php if($rawMR->state == 'opened'): ?>
             <?php echo html::a(inlink('approval', "mr=$MR->id&action=approve&onlybody=yes"), '<i class="icon icon-ok"></i> ' . $lang->mr->approve, '', "id='mergeButton' class='btn iframe showinonlybody'"); ?>
             <?php echo html::a(inlink('approval', "mr=$MR->id&action=reject&onlybody=yes"), '<i class="icon icon-bug"></i> ' . $lang->mr->reject, '', "id='mergeButton' class='btn iframe showinonlybody'"); ?>
             <?php echo html::a(inlink('close', "mr=$MR->id"), '<i class="icon icon-close"></i> ' . $lang->mr->close, '', "id='mergeButton' class='btn'"); ?>
             <?php echo html::a(inlink('edit', "mr=$MR->id"), '<i class="icon icon-edit"></i> ' . str_replace($lang->mr->common, '', $lang->mr->edit), '', "id='mergeButton' class='btn'"); ?>
           <?php endif; ?>
-          <?php if ($rawMR->state == 'closed') echo html::a(inlink('reopen', "mr=$MR->id"), '<i class="icon icon-restart"></i> ' . $lang->mr->reopen, '', "id='mergeButton' class='btn'"); ?>
+          <?php if($rawMR->state == 'closed') echo html::a(inlink('reopen', "mr=$MR->id"), '<i class="icon icon-restart"></i> ' . $lang->mr->reopen, '', "id='mergeButton' class='btn'"); ?>
           <?php echo html::a(inlink('delete', "mr=$MR->id"), '<i class="icon icon-trash"></i> ' . str_replace($lang->mr->common, '', $lang->mr->delete), '', "id='mergeButton' class='btn'"); ?>
         </div>
       </div>
@@ -81,7 +81,7 @@
               <strong><?php echo $lang->mr->status; ?></strong>
               <?php echo zget($lang->mr->statusList, $MR->status); ?>
               <br>
-              <?php if (isset($rawMR->head_pipeline->status)) : ?>
+              <?php if(isset($rawMR->head_pipeline->status)): ?>
                 <div>
                   <strong><?php echo "{$lang->mr->pipeline}{$lang->mr->status}"; ?></strong>
                   <?php echo zget($lang->mr->pipelineStatus, $rawMR->head_pipeline->status, $lang->mr->pipelineUnknown); ?>
@@ -89,9 +89,9 @@
               <?php endif; ?>
               <strong><?php echo $lang->mr->mergeStatus; ?> </strong>
               <?php
-              if (empty($rawMR->changes_count)) :
+              if(empty($rawMR->changes_count)):
                 echo $lang->mr->noChanges;
-              else :
+              else:
                 echo zget($lang->mr->mergeStatusList, $rawMR->merge_status); ?>
                 <br>
                 <strong><?php echo $lang->mr->MRHasConflicts; ?></strong>
@@ -112,7 +112,7 @@
               <strong><?php echo $lang->mr->approvalStatus; ?></strong>
               <?php echo zget($lang->mr->approvalStatusList, $MR->approvalStatus, $lang->mr->approvalStatusList['notReviewed']); ?>
               <br>
-              <?php if ($MR->approvalStatus != '' and $MR->approvalStatus != 'notReviewed') : ?>
+              <?php if($MR->approvalStatus != '' and $MR->approvalStatus != 'notReviewed'): ?>
                 <strong><?php echo $lang->mr->reviewer; ?></strong>
                 <?php echo $MR->approver; ?>
               <?php endif; ?>