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

module/common/model.php

@@ -395,7 +395,7 @@ class commonModel extends model
                 $iconWord       = $objectType == 'doc' ? 'W' : ''; // No ducument icon, print word instead of icon.
 
                 $params = '';
-                if($objectType == 'bug' or $objectType == 'testcase') $params = "productID=$productID";
+                if(strpos('bug|testcase|story', $objectType) !== false) $params = "productID=$productID";
                 if($objectType == 'doc') $params = "objectType=&objectID=0&libID=0";
 
                 $html .= '<li>' . html::a(helper::createLink($objectType, $createMethod, $params, '', $isOnlyBody), "<i class='icon icon-$objectIcon'>$iconWord</i> " . $lang->createObjects[$objectType], '', $isOnlyBody ? "class='iframe'" : '') . '</li>';

module/execution/css/create.css

@@ -14,3 +14,4 @@
 .checkbox input[type=checkbox], .checkbox-inline input[type=checkbox], .radio input[type=radio], .radio-inline input[type=radio] {margin-top: 1px;}
 
 #lifeTimeTips {display: none;}
+#teams_chosen ul .label {margin-top: 3px;}

module/execution/js/create.js

@@ -46,7 +46,11 @@ $(function()
 
     $('#teams_chosen').click(function()
     {
-        if(systemMode == 'new') $('#teams_chosen ul li:first').after(' <label class="label">' + projectCommon + '</label>');
+        if(systemMode == 'new')
+        {
+            $('#teams_chosen ul .label').remove();
+            $('#teams_chosen ul li:first').after(' <label class="label">' + projectCommon + '</label>');
+        }
     })
 
     $('#teams').change(function()

module/execution/model.php

@@ -2455,6 +2455,7 @@ class executionModel extends model
             ->andWhere('(project')->eq($projectID)
             ->orWhere('id')->eq($projectID)
             ->markRight(1)
+            ->orderBy('project_asc')
             ->fetchAll('id');
 
         if(empty($teams)) return array();

module/execution/view/create.html.php

@@ -38,7 +38,7 @@
 <?php js::set('isStage', false);?>
 <?php js::set('copyExecutionID', $copyExecutionID);?>
 <?php js::set('systemMode', $config->systemMode);?>
-<?php js::set('projectCommon', $lang->projectCommon);?>
+<?php js::set('projectCommon', $lang->project->common);?>
 <div id='mainContent' class='main-content'>
   <div class='center-block'>
     <div class='main-header'>

module/project/css/kanban.css

@@ -9,13 +9,11 @@
 .board-wait, .board-closed {vertical-align: top !important;}
 
 .board-doing {padding: 0px !important; vertical-align: top !important;}
-.board-doing div:not(:last-child) .board-doing-project,
-.board-doing div:not(:last-child) .board-doing-execution {padding: 10px; border-bottom: 2px solid #fff;}
+.board-doing .board-doing-project:not(:last-child),
+.board-doing .board-doing-execution:not(:last-child) {padding: 10px; border-bottom: 2px solid #fff;}
 
-.board-doing div:last-child .board-doing-project,
-.board-doing div:last-child .board-doing-execution {padding: 10px;}
-
-.board-doing-project {border-right: 2px solid #fff}
+.board-doing .board-doing-project:last-child,
+.board-doing .board-doing-execution:last-child {padding: 10px;}
 
 .board-doing-project .table-row .table-col:last-child, .c-progress {width: 30px;}
 .board-doing-execution .table-row .table-col:last-child, .c-progress {width: 30px;}

module/project/view/kanban.html.php

@@ -43,63 +43,67 @@
               <td class='text-center' style='background: <?php echo $lang->project->laneColorList[$colorIndex];?>; color: #fff; padding-left: 2px; writing-mode: vertical-lr;'><?php echo zget($programPairs, $programID);?></td>
               <?php foreach(array('wait','doing','closed') as $status):?>
               <?php if($status == 'doing'):?>
-              <td colspan='2' class='board-doing'>
+              <td class='board-doing'>
                 <?php if(isset($statusList[$status])):?>
                 <?php foreach($statusList[$status] as $project):?>
-                <div class='table-row'>
-                  <div class='table-col board-doing-project'>
-                    <div class='board-item' <?php echo "style='border-left: 3px solid " . (isset($project->delay) ? 'red' : "#0BD986") . "'";?>>
-                      <div class='table-row'>
-                        <div class='table-col'>
-                        <?php
-                        if(common::hasPriv('project', 'index'))
-                        {
-                            echo html::a($this->createLink('project', 'index', "projectID=$project->id"), $project->name, '', "title='{$project->name}'");
-                        }
-                        else
-                        {
-                            echo "<span title='{$project->name}'>{$project->name}</span>";
-                        }
-                        ?>
-                        </div>
-                        <div class='table-col'>
-                          <div class="c-progress">
-                            <div class='progress-pie' data-doughnut-size='90' data-color='#3CB371' data-value='<?php echo round($project->hours->progress);?>' data-width='24' data-height='24' data-back-color='#e8edf3'>
-                              <div class='progress-info'><?php echo round($project->hours->progress);?></div>
-                            </div>
+                <div class='board-doing-project'>
+                  <div class='board-item' <?php echo "style='border-left: 3px solid " . (isset($project->delay) ? 'red' : "#0BD986") . "'";?>>
+                    <div class='table-row'>
+                      <div class='table-col'>
+                      <?php
+                      if(common::hasPriv('project', 'index'))
+                      {
+                          echo html::a($this->createLink('project', 'index', "projectID=$project->id"), $project->name, '', "title='{$project->name}'");
+                      }
+                      else
+                      {
+                          echo "<span title='{$project->name}'>{$project->name}</span>";
+                      }
+                      ?>
+                      </div>
+                      <div class='table-col'>
+                        <div class="c-progress">
+                          <div class='progress-pie' data-doughnut-size='90' data-color='#3CB371' data-value='<?php echo round($project->hours->progress);?>' data-width='24' data-height='24' data-back-color='#e8edf3'>
+                            <div class='progress-info'><?php echo round($project->hours->progress);?></div>
                           </div>
                         </div>
                       </div>
                     </div>
                   </div>
-                  <div class='table-col board-doing-execution'>
-                    <?php if(isset($latestExecutions[$project->id])):?>
-                    <?php $execution = $latestExecutions[$project->id];?>
-                    <div class='board-item' <?php echo "style='border-left: 3px solid " . (isset($execution->delay) ? 'red' : "#0BD986") . "'";?>>
-                      <div class='table-row'>
-                        <div class='table-col'>
-                        <?php
-                        if(common::hasPriv('execution', 'task'))
-                        {
-                            echo html::a($this->createLink('execution', 'task', "executionID=$execution->id"), $execution->name, '', "title='{$execution->name}'");
-                        }
-                        else
-                        {
-                            echo "<span title='{$execution->name}'>{$execution->name}</span>";
-                        }
-                        ?>
-                        </div>
-                        <div class='table-col'>
-                          <div class="c-progress">
-                            <div class='progress-pie' data-doughnut-size='90' data-color='#3CB371' data-value='<?php echo round($execution->hours->progress);?>' data-width='24' data-height='24' data-back-color='#e8edf3'>
-                              <div class='progress-info'><?php echo round($execution->hours->progress);?></div>
-                            </div>
+                </div>
+                <?php endforeach;?>
+                <?php endif;?>
+              </td>
+              <td class='board-doing'>
+                <?php if(isset($statusList[$status])):?>
+                <?php foreach($statusList[$status] as $project):?>
+                <div class='board-doing-execution'>
+                  <?php if(isset($latestExecutions[$project->id])):?>
+                  <?php $execution = $latestExecutions[$project->id];?>
+                  <div class='board-item' <?php echo "style='border-left: 3px solid " . (isset($execution->delay) ? 'red' : "#0BD986") . "'";?>>
+                    <div class='table-row'>
+                      <div class='table-col'>
+                      <?php
+                      if(common::hasPriv('execution', 'task'))
+                      {
+                          echo html::a($this->createLink('execution', 'task', "executionID=$execution->id"), $execution->name, '', "title='{$execution->name}'");
+                      }
+                      else
+                      {
+                          echo "<span title='{$execution->name}'>{$execution->name}</span>";
+                      }
+                      ?>
+                      </div>
+                      <div class='table-col'>
+                        <div class="c-progress">
+                          <div class='progress-pie' data-doughnut-size='90' data-color='#3CB371' data-value='<?php echo round($execution->hours->progress);?>' data-width='24' data-height='24' data-back-color='#e8edf3'>
+                            <div class='progress-info'><?php echo round($execution->hours->progress);?></div>
                           </div>
                         </div>
                       </div>
                     </div>
-                    <?php endif;?>
                   </div>
+                  <?php endif;?>
                 </div>
                 <?php endforeach;?>
                 <?php endif;?>
@@ -138,6 +142,12 @@
   </div>
 </div>
 <?php endforeach;?>
-
 <?php endif;?>
+
+<script>
+$(function()
+{
+    $("div[class^='board-doing-']").height($('.board-doing-project').height());
+})
+</script>
 <?php include '../../common/view/footer.html.php';?>

module/story/control.php

@@ -48,6 +48,8 @@ class story extends control
      */
     public function create($productID = 0, $branch = 0, $moduleID = 0, $storyID = 0, $objectID = 0, $bugID = 0, $planID = 0, $todoID = 0, $extra = '', $type = 'story')
     {
+        if($productID == 0) $this->locate($this->createLink('product', 'create'));
+
         $this->story->replaceURLang($type);
         if($this->app->tab == 'product')
         {