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

module/build/control.php

@@ -25,7 +25,7 @@ class build extends control
             $buildID = $this->build->create($projectID);
             if(dao::isError()) $this->send(array('result' => 'fail', 'message' => dao::getError()));
             $this->loadModel('action')->create('build', $buildID, 'opened');
-            if(isonlybody()) die(js::closeModal('parent.parent', '', "function(){parent.parent.loadProjectBuilds($projectID);}"));
+            if(isonlybody()) $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'callback' => 'loadBuildsFormParentPage'));//Code for task #5126.
             $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $this->createLink('build', 'view', "buildID=$buildID")));
         }
 

module/build/js/common.js

@@ -18,3 +18,5 @@ function loadBranches(productID)
         }
     });
 }
+
+window.loadBuildsFormParentPage = function(){window.parent.loadProjectBuilds(0);}; //Code for task #5126.

module/testtask/js/create.js

@@ -19,6 +19,8 @@ function loadProjectRelated(projectID)
  */
 function loadProjectBuilds(projectID)
 {
+    if(!projectID) projectID = $('#project').val();
+
     selectedBuild = $('#build').val();
     if(!selectedBuild) selectedBuild = 0;
     link = createLink('build', 'ajaxGetProjectBuilds', 'projectID=' + projectID + '&productID=' + $('#product').val() + '&varName=testTaskBuild&build=' + selectedBuild);

module/tree/lang/en.php

@@ -56,7 +56,7 @@ $lang->tree->child      = 'Child';
 $lang->tree->lineChild  = 'Child';
 $lang->tree->owner      = 'Owner';
 $lang->tree->order      = 'Order';
-$lang->tree->short      = 'Sort';
+$lang->tree->short      = 'Alias';
 $lang->tree->all        = 'All Modules';
 $lang->tree->projectDoc = "{$lang->projectCommon} Doc";
 $lang->tree->product    = $lang->productCommon;