* fix bug when update story.

db/zentao.sql

@@ -708,6 +708,18 @@ CREATE TABLE IF NOT EXISTS `zt_webapp` (
   PRIMARY KEY  (`id`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
+INSERT INTO `zt_group` (`id`, `company`, `name`, `role`, `desc`) VALUES
+(1, 1, 'ADMIN', 'admin', 'for administrator'),
+(2, 1, 'DEV', 'dev', 'for developers.'),
+(3, 1, 'QA', 'qa', 'for testers.'),
+(4, 1, 'PM', 'pm', 'for project managers.'),
+(5, 1, 'PO', 'po', 'for product owners.'),
+(6, 1, 'TD', 'td', 'for technical director.'),
+(7, 1, 'PD', 'pd', 'for product director.'),
+(8, 1, 'QD', 'qd', 'for quality director.'),
+(9, 1, 'TOP', 'top', 'for top manager.'),
+(10, 1, 'OTHERS', '', 'for others.'),
+(11, 1, 'guest', 'guest', 'For guest');
 INSERT INTO `zt_groupPriv` (`company`, `group`, `module`, `method`) VALUES
 (1, 1, 'project', 'suspend'),
 (1, 1, 'testtask', 'index'),

module/common/view/syntaxhighlighter.html.php

@@ -5,15 +5,13 @@
 <script type="text/javascript">
 function path()
 {
-  var args = arguments,
-      result = []
-      ;
+  var args = arguments;
+  var result = [];
        
-  for(var i = 0; i < args.length; i++)
-      result.push(args[i].replace('@', '<?php echo $jsRoot;?>jquery/syntaxhighlighter/scripts/'));
+  for(var i = 0; i < args.length; i++) result.push(args[i].replace('@', '<?php echo $jsRoot;?>jquery/syntaxhighlighter/scripts/'));
        
   return result
-};
+}
  
 SyntaxHighlighter.autoloader.apply(null, path(
   'applescript            @shBrushAppleScript.js',

module/story/model.php

@@ -344,11 +344,7 @@ class storyModel extends model
             ->checkIF(isset($story->closedReason) and $story->closedReason == 'subdivided', 'childStories', 'notempty')
             ->where('id')->eq((int)$storyID)->exec();
 
-        if(!dao::isError()) 
-        {
-            $this->setStage($storyID);
-            return common::createChanges($oldStory, $story);
-        }
+        if(!dao::isError()) return common::createChanges($oldStory, $story);
     }
 
     /**

module/user/control.php

@@ -372,7 +372,7 @@ class user extends control
         }
         elseif($_POST)
         {
-            $this->user->batchEdit();
+            if($this->post->account) $this->user->batchEdit();
             die(js::locate($this->createLink('company', 'browse', "deptID=$deptID"), 'parent'));
         }
         $this->lang->set('menugroup.user', 'company');