Merge branch 'master' of https://github.com/easysoft/zentaopms

module/build/control.php

@@ -39,6 +39,7 @@ class build extends control
             $product  = $this->loadModel('product')->getByID($projectID);
             $products = $this->product->getPairs();
             $this->product->setMenu($products, $projectID);
+            $this->lang->build->menu = $this->lang->product->menu;
 
             $productGroups   = array();
             $product->branch = 0;
@@ -112,6 +113,7 @@ class build extends control
             $product  = $this->loadModel('product')->getById($build->product);
             $products = $this->product->getPairs();
             $this->product->setMenu($products, $build->product);
+            $this->lang->build->menu = $this->lang->product->menu;
 
             $productGroups   = array();
             $product->branch = 0;
@@ -193,6 +195,7 @@ class build extends control
         {
             $products = $this->loadModel('product')->getPairs();
             $this->product->setMenu($products, $build->product);
+            $this->lang->build->menu = $this->lang->product->menu;
 
             $this->view->title      = "BUILD #$build->id $build->name - " . $build->productName;
             $this->view->position[] = html::a($this->createLink('product', 'build', "productID=$build->product"), $build->productName);

module/build/js/view.js

@@ -14,15 +14,18 @@ function showLink(buildID, type, param)
 }
 $(function()
 {
-    if(link == 'true') showLink(buildID, type, param);
-    fixedTfootAction($('#' + type + 'List').closest('form'));
-    $('.nav.nav-tabs a[data-toggle="tab"]').on('shown.zui.tab', function(e)
+    if(flow != 'onlyTest')
     {
-        var href = $(e.target).attr('href');
-        var tabPane = $(href + '.tab-pane');
-        if(tabPane.size() == 0) return;
-        var formID = tabPane.find('.linkBox').find('form:last');
-        if(formID.size() == 0) formID = tabPane.find('form:last');
-        setTimeout(function(){fixedTfootAction(formID)}, 100);
-    });
+        if(link == 'true') showLink(buildID, type, param);
+        fixedTfootAction($('#' + type + 'List').closest('form'));
+        $('.nav.nav-tabs a[data-toggle="tab"]').on('shown.zui.tab', function(e)
+        {
+            var href = $(e.target).attr('href');
+            var tabPane = $(href + '.tab-pane');
+            if(tabPane.size() == 0) return;
+            var formID = tabPane.find('.linkBox').find('form:last');
+            if(formID.size() == 0) formID = tabPane.find('form:last');
+            setTimeout(function(){fixedTfootAction(formID)}, 100);
+        });
+    }
 })

module/build/model.php

@@ -200,6 +200,7 @@ class buildModel extends model
             ->stripTags($this->config->build->editor->create['id'], $this->config->allowedTags)
             ->remove('resolvedBy,allchecker,files,labels,uid')
             ->get();
+        if($this->config->global->flow == 'onlyTest') $build->project = 0;
 
         $build = $this->loadModel('file')->processImgURL($build, $this->config->build->editor->create['id'], $this->post->uid);
         $this->dao->insert(TABLE_BUILD)->data($build)

module/build/view/view.html.php

@@ -13,6 +13,7 @@
 <?php include '../../common/view/header.html.php';?>
 <?php js::set('confirmUnlinkStory', $lang->build->confirmUnlinkStory)?>
 <?php js::set('confirmUnlinkBug', $lang->build->confirmUnlinkBug)?>
+<?php js::set('flow', $this->config->global->flow)?>
 <?php if(isonlybody()):?>
 <style>
 #stories .action{display:none;}

module/product/view/build.html.php

@@ -41,7 +41,7 @@
       <td><?php echo $users[$build->builder]?></td>
       <td class='text-right'>
         <?php 
-        common::printIcon('testtask', 'create', "product=0&product=$product->id&build=$build->id", '', 'list', 'check');
+        common::printIcon('testtask', 'create', "product=$product->id&project=0&build=$build->id", '', 'list', 'check');
         common::printIcon('build', 'edit',   "buildID=$build->id", '', 'list');
         if(common::hasPriv('build', 'delete'))
         {

module/testtask/control.php

@@ -156,6 +156,7 @@ class testtask extends control
         $this->view->projects     = $projects;
         $this->view->productID    = $productID;
         $this->view->builds       = $builds;
+        $this->view->build        = $build;
         $this->view->users        = $this->loadModel('user')->getPairs('noclosed|qdfirst');
 
         $this->display();

module/testtask/js/create.js

@@ -19,7 +19,7 @@ function loadProjectRelated(projectID)
  */
 function loadProjectBuilds(projectID)
 {
-    selectedBuild = $('#openedBuild').val();
+    selectedBuild = $('#build').val();
     if(!selectedBuild) selectedBuild = 0;
     link = createLink('build', 'ajaxGetProjectBuilds', 'projectID=' + projectID + '&productID=' + $('#product').val() + '&varName=testTaskBuild&build=' + selectedBuild);
     $('#buildBox').load(link, function(){$('#build').chosen(defaultChosenOptions);});

module/testtask/view/create.html.php

@@ -42,7 +42,7 @@
       <?php endif;?>
       <tr>
         <th class='w-90px'><?php echo $lang->testtask->build;?></th>
-        <td class='w-p25-f'><span id='buildBox'><?php echo html::select('build', $builds, '', "class='form-control chosen'");?></span></td>
+        <td class='w-p25-f'><span id='buildBox'><?php echo html::select('build', $builds, $build, "class='form-control chosen'");?></span></td>
         <td></td>
       </tr>  
       <tr>