diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php index 2d117dbc76..024e685400 100644 --- a/module/common/lang/menu.php +++ b/module/common/lang/menu.php @@ -261,7 +261,7 @@ $lang->waterfall->menu = new stdclass(); $lang->waterfall->menu->index = array('link' => "$lang->dashboard|project|index|project=%s"); $lang->waterfall->menu->execution = array('link' => "{$lang->stage->common}|project|execution|status=all&projectID=%s", 'subModule' => 'programplan,task'); $lang->waterfall->menu->storyGroup = array('link' => "{$lang->common->story}|projectstory|story|projectID=%s",'class' => 'dropdown dropdown-hover', 'exclude' => 'tree-browse,projectstory-track'); -$lang->waterfall->menu->story = array('link' => "$lang->SRCommon|projectstory|story|projectID=%s", 'subModule' => 'projectstory,tree', 'alias' => 'story,track', 'exclude' => 'projectstory-track'); +$lang->waterfall->menu->story = array('link' => "$lang->SRCommon|projectstory|story|projectID=%s", 'subModule' => 'projectstory,tree', 'alias' => 'story', 'exclude' => 'projectstory-track'); $lang->waterfall->menu->design = array('link' => "{$lang->design->common}|design|browse|project=%s"); $lang->waterfall->menu->qa = array('link' => "{$lang->qa->common}|project|bug|projectID=%s", 'subModule' => 'testcase,testtask,bug,testreport', 'alias' => 'bug,testtask,testcase,testreport'); $lang->waterfall->menu->doc = array('link' => "{$lang->doc->common}|doc|tableContents|type=project&objectID=%s"); diff --git a/module/product/model.php b/module/product/model.php index de64d7fa4d..8aed1dcfac 100644 --- a/module/product/model.php +++ b/module/product/model.php @@ -2346,7 +2346,7 @@ class productModel extends model { parse_str($extra, $output); $projectID = isset($output['projectID']) ? $output['projectID'] : 0; - $link = helper::createLink($module, $method, "productID=%s&branch=" . ($branch ? "%s" : '') . "&groupBy=&projectID=$projectID") . "#app=project"; + $link = helper::createLink($module, $method, "productID=%s&branch=" . ($branch ? "%s" : 'all') . "&groupBy=&projectID=$projectID") . "#app=project"; } elseif($module == 'testcase' and $method == 'browse') { diff --git a/module/product/view/all.html.php b/module/product/view/all.html.php index 954ad0b0b8..84557fe3c4 100644 --- a/module/product/view/all.html.php +++ b/module/product/view/all.html.php @@ -120,7 +120,7 @@ echo html::smallAvatar(array('avatar' => $usersAvatar[$programPM], 'account' => $programPM, 'name' => $userName), 'avatar-circle avatar-top avatar-' . zget($userIdPairs, $programPM)); $userID = isset($userIdPairs[$programPM]) ? $userIdPairs[$programPM] : ''; - echo html::a($this->createLink('user', 'profile', "userID=$userID", '', true), $userName, '', "title='{$userName}' data-toggle='modal' data-type='iframe' data-width='600'"); + echo html::a($this->createLink('user', 'profile', "userID=$userID", '', true), $userName, '', "title='{$userName}' class='iframe' data-width='600'"); } ?> @@ -223,7 +223,7 @@ echo html::smallAvatar(array('avatar' => $usersAvatar[$product->PO], 'account' => $product->PO, 'name' => $userName), 'avatar-circle avatar-' . zget($userIdPairs, $product->PO)); $userID = isset($userIdPairs[$product->PO]) ? $userIdPairs[$product->PO] : ''; - echo html::a($this->createLink('user', 'profile', "userID=$userID", '', true), $userName, '', "title='{$userName}' data-toggle='modal' data-type='iframe' data-width='600'"); + echo html::a($this->createLink('user', 'profile', "userID=$userID", '', true), $userName, '', "title='{$userName}' class='iframe' data-width='600'"); } ?> diff --git a/module/programplan/model.php b/module/programplan/model.php index cf547525d6..bd0faad21f 100755 --- a/module/programplan/model.php +++ b/module/programplan/model.php @@ -1086,12 +1086,15 @@ class programplanModel extends model $this->lang->project->name = $this->lang->programplan->name; $this->lang->project->code = $this->lang->execution->code; + $relationExecutionsID = $this->loadModel('execution')->getRelatedExecutions($planID); + $relationExecutionsID = !empty($relationExecutionsID) ? implode(',', array_keys($relationExecutionsID)) : ''; + $this->dao->update(TABLE_PROJECT)->data($plan) ->autoCheck() ->batchCheck($this->config->programplan->edit->requiredFields, 'notempty') ->checkIF($plan->end != '0000-00-00', 'end', 'ge', $plan->begin) ->checkIF($plan->percent != false, 'percent', 'float') - ->checkIF(!empty($plan->name), 'name', 'unique', "id != {$planID} and type in ('sprint','stage') and `project` = {$oldPlan->project} and `deleted` = '0'" . ($parentStage ? " and `parent` = {$oldPlan->parent}" : '')) + ->checkIF(!empty($plan->name), 'name', 'unique', "id in ('{$relationExecutionsID}') and type in ('sprint','stage') and `project` = {$oldPlan->project} and `deleted` = '0'" . ($parentStage ? " and `parent` = {$oldPlan->parent}" : '')) ->checkIF(!empty($plan->code) and $setCode, 'code', 'unique', "id != $planID and type in ('sprint','stage','kanban') and `deleted` = '0'") ->where('id')->eq($planID) ->exec(); diff --git a/module/projectrelease/js/create.js b/module/projectrelease/js/create.js index e04f96c37c..8b848d6351 100644 --- a/module/projectrelease/js/create.js +++ b/module/projectrelease/js/create.js @@ -23,7 +23,10 @@ function loadBuilds() { var productID = $('#product').val(); var branch = $('#branch').length == 0 ? 0 : $('#branch').val(); - $('#buildBox').load(createLink('projectrelease', 'ajaxLoadBuilds', "projectID=" + projectID + "&productID=" + productID + "&branch=" + branch), function(){$('#build').chosen();}); + $('#buildBox').load(createLink('projectrelease', 'ajaxLoadBuilds', "projectID=" + projectID + "&productID=" + productID + "&branch=" + branch), function() + { + $('#build').attr('data-placeholder', multipleSelect).chosen(); + }); } /** diff --git a/module/projectrelease/view/create.html.php b/module/projectrelease/view/create.html.php index d9fdff98dd..68ec33b3eb 100644 --- a/module/projectrelease/view/create.html.php +++ b/module/projectrelease/view/create.html.php @@ -51,7 +51,7 @@