diff --git a/module/my/view/requirement.html.php b/module/my/view/requirement.html.php
index dfd2e3eb2d..abd1f23dab 100644
--- a/module/my/view/requirement.html.php
+++ b/module/my/view/requirement.html.php
@@ -233,7 +233,7 @@
createLink('story', 'batchClose');
+ $actionLink = $this->createLink('story', 'batchClose', "productID=0&executionID=0&storyType=requirement&from={$app->rawMethod}");
$misc = "data-form-action=\"$actionLink\"";
echo html::commonButton($lang->close, $misc);
?>
diff --git a/module/my/view/story.html.php b/module/my/view/story.html.php
index fd0be6d3c9..38ebef0003 100644
--- a/module/my/view/story.html.php
+++ b/module/my/view/story.html.php
@@ -236,7 +236,7 @@
createLink('story', 'batchClose');
+ $actionLink = $this->createLink('story', 'batchClose', "productID=0&executionID=0&storyType=story&from={$app->rawMethod}");
$misc = "data-form-action=\"$actionLink\"";
echo html::commonButton($lang->close, $misc);
?>
diff --git a/module/story/control.php b/module/story/control.php
index 7f5e1be089..b0c40555c0 100644
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -1126,10 +1126,12 @@ class story extends control
*
* @param int $productID
* @param int $executionID
+ * @param string $storyType
+ * @param string $from
* @access public
* @return void
*/
- public function batchClose($productID = 0, $execution = 0, $storyType = 'story')
+ public function batchClose($productID = 0, $executionID = 0, $storyType = 'story', $from = '')
{
if($this->post->comments)
{
@@ -1194,9 +1196,13 @@ class story extends control
/* The stories of my. */
else
{
- $this->lang->story->menu = $this->lang->my->menu;
+ $this->lang->story->menu = $this->lang->my->menu;
$this->lang->story->menuOrder = $this->lang->my->menuOrder;
$this->loadModel('my')->setMenu();
+
+ if($from == 'work') $this->lang->my->menu->work['subModule'] = 'story';
+ if($from == 'contribute') $this->lang->my->menu->contribute['subModule'] = 'story';
+
$this->view->position[] = html::a($this->createLink('my', 'story'), $this->lang->my->story);
$this->view->title = $this->lang->story->batchEdit;
}
diff --git a/module/story/view/batchclose.html.php b/module/story/view/batchclose.html.php
index bb5d8390f5..fe46a632cc 100755
--- a/module/story/view/batchclose.html.php
+++ b/module/story/view/batchclose.html.php
@@ -12,6 +12,7 @@
?>
+openApp);?>
story->common . $lang->colon . $lang->story->batchClose;?>
diff --git a/module/user/lang/de.php b/module/user/lang/de.php
index 2cd5990625..22a2adde58 100644
--- a/module/user/lang/de.php
+++ b/module/user/lang/de.php
@@ -204,7 +204,7 @@ $lang->user->error->dangerPassword = "ID %s,Passwords cannot be used with [%s]
$lang->user->error->verifyPassword = "Verifikation fehlgeschlagen. Bitte geben Sie ihr Loginpasswort ein.";
$lang->user->error->originalPassword = "Altes Passwort ist falsch.";
-$lang->user->error->noAccess = "This user is not from your department. You have no access to this user information."
+$lang->user->error->noAccess = "This user is not from your department. You have no access to this user information.";
$lang->user->contactFieldList['phone'] = $lang->user->phone;
$lang->user->contactFieldList['mobile'] = $lang->user->mobile;
diff --git a/module/user/lang/fr.php b/module/user/lang/fr.php
index 819fe3c05f..65c8bf70cb 100644
--- a/module/user/lang/fr.php
+++ b/module/user/lang/fr.php
@@ -204,7 +204,7 @@ $lang->user->error->dangerPassword = "ID %s,Les mots de passe ne peuvent pas u
$lang->user->error->verifyPassword = "Vérification en échec. Entrez votre Mot de Passe de Connexion.";
$lang->user->error->originalPassword = "Ancien Mot de Passe incorrect.";
-$lang->user->error->noAccess = "This user is not from your department. You have no access to this user information."
+$lang->user->error->noAccess = "This user is not from your department. You have no access to this user information.";
$lang->user->contactFieldList['phone'] = $lang->user->phone;
$lang->user->contactFieldList['mobile'] = $lang->user->mobile;
diff --git a/module/user/lang/vi.php b/module/user/lang/vi.php
index dffd57721b..68e1d9a2af 100644
--- a/module/user/lang/vi.php
+++ b/module/user/lang/vi.php
@@ -204,7 +204,7 @@ $lang->user->error->dangerPassword = "ID %s,Mật khẩu không thể được
$lang->user->error->verifyPassword = "Xác thực thất bại. Vui lòng nhập mạt khẩu đăng nhập của bạn.";
$lang->user->error->originalPassword = "Old password is incorrect.";
-$lang->user->error->noAccess = "This user is not from your department. You have no access to this user information."
+$lang->user->error->noAccess = "This user is not from your department. You have no access to this user information.";
$lang->user->contactFieldList['phone'] = $lang->user->phone;
$lang->user->contactFieldList['mobile'] = $lang->user->mobile;