Merge branch 'master' of github.com:easysoft/zentaopms

module/story/control.php

@@ -311,18 +311,19 @@ class story extends control
             if($project) $this->loadModel('project')->linkStory($project, $stories);
 
             /* If storyID not equal zero, subdivide this story to child stories and close it. */
-            if($storyID)
+            if($storyID and !empty($mails))
             {
-                if(empty($mails)) die(js::closeModal('parent.parent', 'this'));
                 $this->story->subdivide($storyID, $stories);
-
                 if(dao::isError()) die(js::error(dao::getError()));
-
-                if(isonlybody()) die(js::closeModal('parent.parent', 'this'));
-                die(js::locate(inlink('view', "storyID=$storyID"), 'parent'));
             }
 
-            if($project)
+            if(isonlybody()) die(js::closeModal('parent.parent', 'this'));
+
+            if($storyID)
+            {
+                die(js::locate(inlink('view', "storyID=$storyID"), 'parent'));
+            }
+            elseif($project)
             {
                 setcookie('storyModuleParam', 0, 0, $this->config->webRoot, '', false, false);
                 die(js::locate($this->createLink('project', 'story', "projectID=$project&orderBy=id_desc&browseType=unclosed"), 'parent'));

module/story/lang/de.php

@@ -223,6 +223,7 @@ $lang->story->noStory               = 'Keine Storys. ';
 $lang->story->ignoreChangeStage     = 'Story %s is a draft. Please review it..';
 $lang->story->cannotDeleteParent    = "Can not delete parent {$lang->storyCommon}";
 $lang->story->moveChildrenTips      = "Move child {$lang->storyCommon} to selected product when modified product property of parent {$lang->storyCommon}.";
+$lang->story->moveSRTips            = "Move {$lang->srCommon} to selected product when modified product property of {$lang->urCommon}.";
 
 $lang->story->form = new stdclass();
 $lang->story->form->area      = 'Story Bereich';

module/story/lang/en.php

@@ -226,6 +226,7 @@ $lang->story->noStory               = 'No stories yet. ';
 $lang->story->ignoreChangeStage     = 'Story %s is a draft. Please review it..';
 $lang->story->cannotDeleteParent    = "Can not delete parent {$lang->storyCommon}";
 $lang->story->moveChildrenTips      = "Move child {$lang->storyCommon} to selected product when modified product property of parent {$lang->storyCommon}.";
+$lang->story->moveSRTips            = "Move {$lang->srCommon} to selected product when modified product property of {$lang->urCommon}.";
 
 $lang->story->form = new stdclass();
 $lang->story->form->area      = 'Scope';

module/story/lang/fr.php

@@ -223,6 +223,7 @@ $lang->story->noStory               = "Aucune story pour l'instant. ";
 $lang->story->ignoreChangeStage     = "Story %s est à l'état brouillon et nécessite d'être complétée et validée...";
 $lang->story->cannotDeleteParent    = "Can not delete parent {$lang->storyCommon}";
 $lang->story->moveChildrenTips      = "Move child {$lang->storyCommon} to selected product when modified product property of parent {$lang->storyCommon}.";
+$lang->story->moveSRTips            = "Move {$lang->srCommon} to selected product when modified product property of {$lang->urCommon}.";
 
 $lang->story->form = new stdclass();
 $lang->story->form->area      = 'Périmètre';

module/story/lang/vi.php

@@ -223,6 +223,7 @@ $lang->story->noStory              = 'Không có câu chuyện nào';
 $lang->story->ignoreChangeStage    = 'Câu chuyện %s là bản nháp. Vui lòng xét duyệt nó..';
 $lang->story->cannotDeleteParent   = "Không thể xóa {$lang->storyCommon} mẹ";
 $lang->story->moveChildrenTips     = "Move child {$lang->storyCommon} to selected product when modified product property of parent {$lang->storyCommon}.";
+$lang->story->moveSRTips            = "Move {$lang->srCommon} to selected product when modified product property of {$lang->urCommon}.";
 
 $lang->story->form = new stdclass();
 $lang->story->form->area     = 'Phạm vi';

module/story/lang/zh-cn.php

@@ -227,6 +227,7 @@ $lang->story->noStory               = "暂时没有{$lang->storyCommon}。";
 $lang->story->ignoreChangeStage     = "{$lang->storyCommon} %s 为草稿状态，没有修改其阶段。";
 $lang->story->cannotDeleteParent    = "不能删除父{$lang->storyCommon}";
 $lang->story->moveChildrenTips      = "修改父{$lang->storyCommon}的所属产品会将其下的子{$lang->storyCommon}也移动到所选产品下。";
+$lang->story->moveSRTips            = "修改{$lang->urCommon}的所属产品会将其下的{$lang->srCommon}也移动到所选产品下。";
 
 $lang->story->form = new stdclass();
 $lang->story->form->area      = "该{$lang->storyCommon}所属范围";

module/story/view/edit.html.php

@@ -13,6 +13,7 @@
 <?php include './header.html.php';?>
 <?php js::set('parentStory', !empty($story->children));?>
 <?php js::set('moveChildrenTips', $lang->story->moveChildrenTips);?>
+<?php js::set('moveSRTips', $lang->story->moveSRTips);?>
 <div class='main-content' id='mainContent'>
   <form method='post' enctype='multipart/form-data' target='hiddenwin' id='dataform'>
     <div class='main-header'>

module/story/view/header.html.php

@@ -4,6 +4,7 @@
 function loadProduct(productID)
 {
     if(parentStory) alert(moveChildrenTips);
+    if(typeof hasSR != 'undefined' && hasSR) alert(moveSRTips);//Set hasSR variable in pro and biz.
 
     loadProductBranches(productID)
     loadProductModules(productID);