Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3

module/my/view/requirement.html.php

@@ -233,7 +233,7 @@
         <?php endif;?>
         <?php if($canBatchClose):?>
         <?php
-        $actionLink = $this->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);
         ?>

module/my/view/story.html.php

@@ -236,7 +236,7 @@
         <?php endif;?>
         <?php if($canBatchClose):?>
         <?php
-        $actionLink = $this->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);
         ?>

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;
         }

module/story/view/batchclose.html.php

@@ -12,6 +12,7 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php js::set('storyType', $storyType);?>
+<?php js::set('app', $app->openApp);?>
 <div class='main-content' id='mainContent'>
   <div class='main-header'>
     <h2><?php echo $lang->story->common . $lang->colon . $lang->story->batchClose;?></h2>

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;

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;

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;