| story->rejectedReason;?> |
diff --git a/module/task/js/batchcreate.js b/module/task/js/batchcreate.js
index 4a470912b6..57097f3bb5 100755
--- a/module/task/js/batchcreate.js
+++ b/module/task/js/batchcreate.js
@@ -1,6 +1,3 @@
-/* Remove width in defaultChosenOptions. */
-delete defaultChosenOptions.width;
-
/* Remove 'ditto' in first row. */
$(function()
{
@@ -32,7 +29,7 @@ function setStories(moduleID, projectID, num)
})
}
$("#story" + num + "_chosen").remove();
- $("#story" + num).chosen(defaultChosenOptions);
+ $("#story" + num).chosen();
});
}
diff --git a/module/task/js/common.js b/module/task/js/common.js
index e69de29bb2..4fb3b9b7b7 100644
--- a/module/task/js/common.js
+++ b/module/task/js/common.js
@@ -0,0 +1,51 @@
+function adjustSortBtn()
+{
+ $('.btn-move-up:first').addClass('disabled').attr('disabled', 'disabled');
+ $('.btn-move-down:last').addClass('disabled').attr('disabled', 'disabled');
+}
+
+$('.btn-move-up, .btn-move-down').click(function()
+{
+ var $this = $(this);
+ if($this.hasClass('btn-move-up'))
+ {
+ $(this).parents('tr').prev().before($(this).parents('tr'));
+ }
+ else
+ {
+ $this.parents('tr').next().after($(this).parents('tr'));
+ }
+ $('.btn-move-up, .btn-move-down').removeClass('disabled').removeAttr('disabled');
+
+ adjustSortBtn();
+});
+
+function adjustSortBtn()
+{
+ $('.btn-move-up:first').addClass('disabled').attr('disabled', 'disabled');
+ $('.btn-move-down:last').addClass('disabled').attr('disabled', 'disabled');
+}
+
+$('#modalTeam .btn').click(function()
+{
+ var team = '';
+ var time = 0;
+ $('[name*=team]').each(function()
+ {
+ if($(this).find('option:selected').text() != '')
+ {
+ team += ' ' + $(this).find('option:selected').text();
+ }
+
+ estimate = parseFloat($(this).parents('td').next('td').find('[name*=teamEstimate]').val());
+ if(!isNaN(estimate))
+ {
+ time += estimate;
+ }
+
+ $('#teamMember').val(team);
+ $('#estimate').val(time);
+ })
+});
+
+//end
diff --git a/module/task/js/edit.js b/module/task/js/edit.js
index b457c91982..b680d1f535 100644
--- a/module/task/js/edit.js
+++ b/module/task/js/edit.js
@@ -1,6 +1,6 @@
$(function()
{
- $("#story, #mailto").chosen(defaultChosenOptions);
+ $("#story, #mailto").chosen();
$('.record-estimate-toggle').modalTrigger({width:900, type:'iframe', afterHide: function(){parent.location.href=parent.location.href;}});
})
@@ -41,7 +41,7 @@ function loadAll(projectID)
function loadModuleMenu(projectID)
{
var link = createLink('tree', 'ajaxGetOptionMenu', 'rootID=' + projectID + '&viewtype=task');
- $('#moduleIdBox').load(link, function(){$('#module').chosen(defaultChosenOptions);});
+ $('#moduleIdBox').load(link, function(){$('#module').chosen();});
}
/**
@@ -54,7 +54,7 @@ function loadModuleMenu(projectID)
function loadProjectStories(projectID)
{
var link = createLink('story', 'ajaxGetProjectStories', 'projectID=' + projectID + '&productID=0&branch=0&moduleID=0&storyID=' + oldStoryID);
- $('#storyIdBox').load(link, function(){$('#story').chosen(defaultChosenOptions);});
+ $('#storyIdBox').load(link, function(){$('#story').chosen();});
}
/**
@@ -67,7 +67,7 @@ function loadProjectStories(projectID)
function loadProjectMembers(projectID)
{
var link = createLink('project', 'ajaxGetMembers', 'projectID=' + projectID + '&assignedTo=' + oldAssignedTo);
- $('#assignedToIdBox').load(link, function(){$('#assignedToIdBox').find('select').chosen(defaultChosenOptions)});
+ $('#assignedToIdBox').load(link, function(){$('#assignedToIdBox').find('select').chosen()});
}
/* empty function. */
diff --git a/module/task/lang/zh-tw.php b/module/task/lang/zh-tw.php
index 30aecf7827..9ee6a81bfe 100644
--- a/module/task/lang/zh-tw.php
+++ b/module/task/lang/zh-tw.php
@@ -183,6 +183,7 @@ $lang->task->error->left = '請填寫"剩餘"';
$lang->task->error->work = '"備註"必須小於%d個字元';
$lang->task->error->skipClose = '任務：%s 不是“已完成”或“已取消”狀態，確定要關閉嗎？';
$lang->task->error->consumed = '任務：%s工時不能小於0，忽略該任務工時的改動';
+$lang->task->error->assignedTo = '當前狀態的多人任務不能指派給任務團隊外的成員。';
/* Report. */
$lang->task->report = new stdclass();
diff --git a/module/task/view/view.html.php b/module/task/view/view.html.php
index 8761407221..1143e5082a 100644
--- a/module/task/view/view.html.php
+++ b/module/task/view/view.html.php
@@ -222,7 +222,7 @@
mailto));
- if(empty($mainto))
+ if(empty($mailto))
{
echo $lang->noData;
}
diff --git a/module/testcase/js/batchcreate.js b/module/testcase/js/batchcreate.js
index a7adc7a3e0..6ce0166461 100644
--- a/module/testcase/js/batchcreate.js
+++ b/module/testcase/js/batchcreate.js
@@ -101,6 +101,6 @@ function setModules(branchID, productID, num)
if(!modules) modules = '';
$('#module' + num).replaceWith(modules);
$("#module" + num + "_chosen").remove();
- $("#module" + num).chosen(defaultChosenOptions);
+ $("#module" + num).chosen();
});
}
diff --git a/module/testcase/js/batchedit.js b/module/testcase/js/batchedit.js
index 0e616280eb..e9747337f4 100644
--- a/module/testcase/js/batchedit.js
+++ b/module/testcase/js/batchedit.js
@@ -31,7 +31,7 @@ function loadBranches(product, branch, caseID)
if(!branch) branch = 0;
moduleLink = createLink('tree', 'ajaxGetOptionMenu', 'productID=' + product + '&viewtype=case&branch=' + branch + '&rootModuleID=0&returnType=html&fieldID=' + caseID + '&needManage=true');
- $('#modules' + caseID).parent('td').load(moduleLink, function(){$('#modules' + caseID).chosen(defaultChosenOptions);})
+ $('#modules' + caseID).parent('td').load(moduleLink, function(){$('#modules' + caseID).chosen();})
}
$(function()
diff --git a/module/testcase/js/browse.js b/module/testcase/js/browse.js
index 692513e229..de31393cc4 100644
--- a/module/testcase/js/browse.js
+++ b/module/testcase/js/browse.js
@@ -17,6 +17,18 @@ $(function()
if(flow == 'onlyTest')
{
- $('#subNavbar > .nav > li[data-id=' + browseType + ']').addClass('active');
+ $('#subNavbar > .nav li[data-id=' + browseType + ']').addClass('active');
+
+ if(browseType == 'bysuite')
+ {
+ var $moreSuite = $('#subNavbar > .nav > li[data-id=bysuite]');
+ if($moreSuite.find('.dropdown-menu').children().length)
+ {
+ $moreSuite.find('.dropdown-menu').children().each(function()
+ {
+ if($(this).data('id') == suiteID) $(this).addClass('active');
+ });
+ }
+ }
}
});
diff --git a/module/testcase/js/common.js b/module/testcase/js/common.js
index 6c46c42037..f27cd7cbc4 100644
--- a/module/testcase/js/common.js
+++ b/module/testcase/js/common.js
@@ -85,7 +85,7 @@ function loadProductModules(productID, branch)
link = createLink('tree', 'ajaxGetOptionMenu', 'productID=' + productID + '&viewtype=case&branch=' + branch + '&rootModuleID=0&returnType=html&fieldID=&needManage=true');
$('#moduleIdBox').load(link, function()
{
- $(this).find('select').chosen(defaultChosenOptions)
+ $(this).find('select').chosen()
if(typeof(caseModule) == 'string') $('#moduleIdBox').prepend("" + caseModule + "")
});
setStories();
@@ -105,7 +105,7 @@ function loadLibModules(libID, branch)
link = createLink('tree', 'ajaxGetOptionMenu', 'rootID=' + libID + '&viewtype=caselib&branch=' + branch + '&rootModuleID=0&returnType=html&fieldID=&needManage=true');
$('#moduleIdBox').load(link, function()
{
- $(this).find('select').chosen(defaultChosenOptions)
+ $(this).find('select').chosen()
if(typeof(caseModule) == 'string') $('#moduleIdBox').prepend("" + caseModule + "")
});
}
@@ -130,7 +130,7 @@ function setStories()
$('#story').replaceWith(stories);
$('#story').val(value);
$('#story_chosen').remove();
- $("#story").chosen(defaultChosenOptions);
+ $("#story").chosen();
});
}
diff --git a/module/testcase/js/edit.js b/module/testcase/js/edit.js
index 29011ee17b..9768a4ee9a 100644
--- a/module/testcase/js/edit.js
+++ b/module/testcase/js/edit.js
@@ -15,7 +15,7 @@ function getList()
$(document).ready(function()
{
- $("#story").chosen(defaultChosenOptions);
+ $("#story").chosen();
initSteps();
});
@@ -32,7 +32,7 @@ function loadLibModules(libID)
link = createLink('tree', 'ajaxGetOptionMenu', 'libID=' + libID + '&viewtype=caselib&branch=0&rootModuleID=0&returnType=html&fieldID=&needManage=true');
$('#moduleIdBox').load(link, function()
{
- $(this).find('select').chosen(defaultChosenOptions)
+ $(this).find('select').chosen()
if(typeof(caseModule) == 'string') $('#moduleIdBox').prepend("" + caseModule + "")
});
}
diff --git a/module/testcase/model.php b/module/testcase/model.php
index b8a0fdef6a..7490e3578e 100644
--- a/module/testcase/model.php
+++ b/module/testcase/model.php
@@ -118,38 +118,50 @@ class testcaseModel extends model
}
else
{
- if($key == 'suite' and common::hasPriv('testcase', 'browse'))
+ if($key == 'bysuite')
{
- $suiteList = $this->loadModel('testsuite')->getSuites($productID);
- $currentSuiteID = isset($suiteID) ? (int)$suiteID : 0;
- $currentSuite = zget($suiteList, $currentSuiteID, '');
- $currentLable = empty($currentSuite) ? $this->lang->testsuite->common : $currentSuite->name;
+ $subMenu = array();
+ if(common::hasPriv('testcase', 'browse'))
+ {
+ $suiteList = $this->loadModel('testsuite')->getSuites($productID);
+ $currentSuiteID = isset($suiteID) ? (int)$suiteID : 0;
- $replace = "";
- $replace .= html::a('javascript:;', $currentLable . " ", '', "data-toggle='dropdown'");
- $replace .="";
- }
- }
- else
- {
- if(common::hasPriv('testsuite', 'create'))
- {
- $replace .= '' . html::a(helper::createLink('testsuite', 'create', "productID=$productID"), $this->lang->testsuite->create) . '';
- }
- }
+ $menu = new stdclass();
+ $menu->name = $suiteID;
+ $menu->link = $link;
+ $menu->text = $suiteName;
+ $menu->hidden = false;
+ $subMenu[$suiteID] = $menu;
+ }
+ }
+ }
+ /* Avoid the menu shaking when change it by js. */
+ if(isset($subMenu[$currentSuiteID]))
+ {
+ $currentSubMenu = $subMenu[$currentSuiteID];
+ $this->lang->testcase->menu->bysuite['link'] = "$currentSubMenu->text|" . implode('|', $currentSubMenu->link);
+ }
- $replace .= '';
+ /* Replace for dropdown submenu. */
+ if(isset($this->lang->testcase->subMenu->$key))
+ {
+ $subMenu += common::createSubMenu($this->lang->testcase->subMenu->$key, $productID);
+ }
+ if(!empty($subMenu)) $this->lang->testcase->menu->{$key}['subMenu'] = $subMenu;
+
+ if($this->app->getMethodName() != 'view') $this->lang->testcase->menu->bysearch = " {$this->lang->testcase->bySearch}";
}
else
{
@@ -160,7 +172,6 @@ class testcaseModel extends model
}
common::setMenuVars($this->lang->testcase->menu, $key, $replace);
}
- if($this->config->global->flow != 'full' && $this->app->getMethodName() != 'view') $this->lang->testcase->menu->bysearch = " {$this->lang->testcase->bySearch}";
}
/**
diff --git a/module/testcase/view/browse.html.php b/module/testcase/view/browse.html.php
index 091436979d..fa64a5be98 100644
--- a/module/testcase/view/browse.html.php
+++ b/module/testcase/view/browse.html.php
@@ -22,6 +22,7 @@ js::set('confirmDelete', $lang->testcase->confirmDelete);
js::set('batchDelete', $lang->testcase->confirmBatchDelete);
js::set('productID', $productID);
js::set('branch', $branch);
+js::set('suiteID', $suiteID);
?>
|