Merge branch 'master' into master_oss_wangjianhua

lib/base/front/front.class.php

@@ -521,8 +521,8 @@ class baseHTML
         /* If the link of the referer is not the link of the current page or the link of the index,  the cookie and gobackLink will be updated. */
         if(!preg_match("/(m=|\/)(index|search|$currentModule)(&f=|-)(index|buildquery|$currentMethod)(&|-|\.)?/", strtolower($refererLink)))
         {
-            $gobackList[$tab] = $referer . "#app=$tab";
-            $gobackLink       = $referer . "#app=$tab";
+            $gobackList[$tab] = $referer;
+            $gobackLink       = $referer;
             setcookie('goback', json_encode($gobackList), $config->cookieLife, $config->webRoot, '', $config->cookieSecure, false);
         }
 

module/bug/view/view.html.php

@@ -422,6 +422,7 @@
                   <td><?php echo html::a($this->createLink('task', 'view', "taskID=$bug->toTask", '', true), "#$bug->toTask $bug->toTaskTitle", '', "class='iframe' data-width='80%'");?></td>
                 </tr>
                 <?php endif;?>
+                <?php if(helper::hasFeature('devops')):?>
                 <tr>
                   <th><?php echo $lang->bug->linkMR;?></th>
                   <td>
@@ -434,6 +435,7 @@
                     ?>
                   </td>
                 </tr>
+                <?php endif;?>
               </tbody>
             </table>
           </div>

module/design/control.php

@@ -76,6 +76,11 @@ class design extends control
         $this->session->set('reviewList', $this->app->getURI(true), 'project');
 
         /* Build the search form. */
+        $products      = $this->product->getProductPairsByProject($projectID);
+        $productIdList = $productID ? $productID : array_keys($products);
+        $stories       = $this->loadModel('story')->getProductStoryPairs($productIdList, 'all', 0, 'active', 'id_desc', 0, 'full', 'story', false);
+        $this->config->design->search['params']['story']['values'] = $stories;
+
         $queryID   = ($type == 'bySearch') ? (int)$param : 0;
         $actionURL = $this->createLink('design', 'browse', "projectID=$projectID&productID=$productID&type=bySearch&queryID=myQueryID");
         $this->design->buildSearchForm($queryID, $actionURL);

module/design/view/view.html.php

@@ -50,7 +50,7 @@
         <?php if(!$design->deleted):?>
         <?php
         common::printIcon('design', 'assignTo',   "designID=$design->id", $design, 'button', '', '', 'iframe showinonlybody', true);
-        common::printIcon('design', 'linkCommit', "designID=$design->id", $design, 'button', 'link', '', 'iframe showinonlybody', true, "id='linkCommit'");
+        if(helper::hasFeature('devops')) common::printIcon('design', 'linkCommit', "designID=$design->id", $design, 'button', 'link', '', 'iframe showinonlybody', true, "id='linkCommit'");
         common::printIcon('design', 'edit',       "designID=$design->id", $design, 'button', 'alter');
         common::printIcon('design', 'delete',     "designID=$design->id", $design, 'button', 'trash', 'hiddenwin');
         ?>

module/doc/control.php

@@ -156,8 +156,15 @@ class doc extends control
         /* Splice project name. */
         foreach($executions as $executionID => $execution)
         {
-            $executionPrefix          = isset($projects[$execution->project]) ? $projects[$execution->project] . '/' : '';
-            $executions[$executionID] = $executionPrefix . $execution->name;
+            if($execution->multiple)
+            {
+                $executionPrefix          = isset($projects[$execution->project]) ? $projects[$execution->project] . '/' : '';
+                $executions[$executionID] = $executionPrefix . $execution->name;
+            }
+            else
+            {
+                unset($executions[$executionID]);
+            }
         }
 
         /* Get the project that has permission to view. */

module/doc/model.php

@@ -91,7 +91,7 @@ class docModel extends model
 
         $products   = $this->loadModel('product')->getPairs();
         $projects   = $this->loadModel('project')->getPairsByProgram();
-        $executions = $this->loadModel('execution')->getPairs();
+        $executions = $this->loadModel('execution')->getPairs(0, 'all', 'multiple');
         $waterfalls = array();
         if(empty($objectID) and ($type == 'all' or $type == 'execution'))
         {

module/install/css/step4.css

@@ -8,8 +8,7 @@
 #mainContent tr th {background-color: rgb(241, 241, 241);}
 #mainContent tr td {background-color: rgb(255, 255, 255); border-bottom: 1px solid rgb(238, 238, 238); border-right: 1px solid rgb(238, 238, 238);}
 
-#useLight {background-color: #ddd!important; padding: 6px 85px;}
-#useALM {background-color: #ddd!important; padding: 6px 85px;}
+#useLight, #useALM {border: #93969b 1px solid; padding: 6px 85px;}
 
 #mainContent .datatable {cursor: default;}
 .container {padding-top: 20px;}

module/task/js/create.js

@@ -382,7 +382,7 @@ function toggleSelectTestStory()
     {
         $('#module').closest('tr').removeClass('hidden');
         $('#multipleBox').closest('td').removeClass('hidden');
-        $('#story').closest('tr').removeClass('hidden');
+        if(showFields.indexOf('story') != -1) $('#story').closest('tr').removeClass('hidden');
         $('#estStarted').closest('tr').removeClass('hidden');
         $('#estimate').closest('.table-col').removeClass('hidden');
         $('#testStoryBox').addClass('hidden');

module/testtask/view/view.html.php

@@ -15,7 +15,7 @@
 <?php $browseLink = $this->session->testtaskList ? $this->session->testtaskList : $this->createLink('testtask', 'browse', "productID=$task->product");?>
 <div id='mainMenu' class='clearfix'>
   <div class='btn-toolbar pull-left'>
-    <?php echo html::backButton('<i class="icon icon-back icon-sm"></i> ' . $lang->goback, "data-app='{$app->tab}'", 'btn btn-secondary');?>
+    <?php echo html::backButton('<i class="icon icon-back icon-sm"></i> ' . $lang->goback, '', 'btn btn-secondary');?>
     <div class='divider'></div>
     <div class='page-title'>
       <span class='label label-id'><?php echo $task->id;?></span>