Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Finish task #37295.

Browse Source
This commit is contained in:
holan20180123
2021-04-07 14:05:37 +08:00
parent 4794f0cb0b
commit 7dae38a2a3
4 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/my/view/requirement.html.php
+1 -1
View File
@@ -156,7 +156,7 @@
<?php
if($canBatchEdit)
{
$actionLink = $this->createLink('story', 'batchEdit', 'productID=0&executionID=0&branch=0&storyType=requirement');
$actionLink = $this->createLink('story', 'batchEdit', "productID=0&executionID=0&branch=0&storyType=requirement&from={$app->rawMethod}");
$misc = "data-form-action='$actionLink'";
echo html::commonButton($lang->edit, $misc);
}
module/my/view/story.html.php
+1 -1
View File
@@ -159,7 +159,7 @@
<?php
if($canBatchEdit)
{
$actionLink = $this->createLink('story', 'batchEdit', 'productID=0&executionID=0&branch=0&storyType=story');
$actionLink = $this->createLink('story', 'batchEdit', "productID=0&executionID=0&branch=0&storyType=story&from={$app->rawMethod}");
$misc = "data-form-action='$actionLink'";
echo html::commonButton($lang->edit, $misc);
}
module/story/control.php
+6 -3
View File
@@ -618,10 +618,13 @@ class story extends control
*
* @param int $productID
* @param int $executionID
* @param int $branch
* @param string $storyType
* @param string $from
* @access public
* @return void
*/
public function batchEdit($productID = 0, $executionID = 0, $branch = 0, $storyType = 'story')
public function batchEdit($productID = 0, $executionID = 0, $branch = 0, $storyType = 'story', $from = '')
{
$this->lang->product->switcherMenu = $this->product->getSwitcher($productID);
$this->story->replaceURLang($storyType);
@@ -645,8 +648,8 @@ class story extends control
else if($this->app->openApp == 'my')
{
$this->loadModel('my')->setMenu();
$this->lang->my->menu->work['subModule'] = 'story';
$this->lang->my->menu->contribute['subModule'] = 'story';
if($from == 'work') $this->lang->my->menu->work['subModule'] = 'story';
if($from == 'contribute') $this->lang->my->menu->contribute['subModule'] = 'story';
}
/* Load model. */
module/story/js/common.js
+1 -1
View File
@@ -7,7 +7,7 @@ $(function()
if(typeof(execution) != 'undefined') rawModule = 'projectstory';
if(['project', 'projectstory'].indexOf(rawModule) === -1 && app != 'qa')
{
$('#navbar .nav li').removeClass('active');
if(app != 'my') $('#navbar .nav li').removeClass('active');
$("#navbar .nav li[data-id=" + storyType + ']').addClass('active');
$('#subNavbar li[data-id="' + storyType + '"]').addClass('active');
}