* Change storyChanged to URChanged.

db/update20.0.sql

@@ -290,7 +290,7 @@ ALTER TABLE `zt_project` ADD `path` varchar(255) NOT NULL AFTER `parent`;
 ALTER TABLE `zt_project` ADD `grade` tinyint unsigned NOT NULL AFTER `path`;
 
 INSERT INTO `zt_config` (`owner`, `module`, `section`, `key`, `value`) VALUES 
-('system','custom','','storyPoint','1');
+('system','custom','','hourPoint','1');
 ('system','custom','','URAndSR','1'),
 ('system','custom','waterfall','URSRName','{\"URCommon\":{\"zh-cn\":\"\\u7528\\u6237\\u9700\\u6c42\"},\"SRCommon\":{\"zh-cn\":\"\\u8f6f\\u4ef6\\u9700\\u6c42\"}}'),
 ('system','custom','scrum','URSRName','{\"URCommon\":{\"zh-cn\":\"\\u53f2\\u8bd7\"},\"SRCommon\":{\"zh-cn\":\"\\u6545\\u4e8b\"}}');
@@ -300,4 +300,4 @@ ALTER TABLE `zt_block` ADD UNIQUE `account_module_type_order` (`account`, `modul
 
 INSERT INTO `zt_cron` (`m`, `h`, `dom`, `mon`, `dow`, `command`, `remark`, `type`, `buildin`, `status`, `lastTime`) VALUES ('1', '0', '*', '*', '*', 'moduleName=weekly&methodName=computeWeekly', '更新项目周报', 'system', 0, 'normal', '2020-08-27 10:07:53');
 
-ALTER TABLE `zt_story` ADD `storyChanged` enum('0','1') NOT NULL DEFAULT '0' AFTER `version`; 
+ALTER TABLE `zt_story` ADD `URChanged` enum('0','1') NOT NULL DEFAULT '0' AFTER `version`; 

db/zentao.sql

@@ -919,7 +919,7 @@ CREATE TABLE IF NOT EXISTS `zt_story` (
   `linkStories` varchar(255) NOT NULL,
   `duplicateStory` mediumint(8) unsigned NOT NULL,
   `version` smallint(6) NOT NULL default '1',
-  `storyChanged` enum('0','1') NOT NULL DEFAULT '0',
+  `URChanged` enum('0','1') NOT NULL DEFAULT '0',
   `deleted` enum('0','1') NOT NULL default '0',
   PRIMARY KEY  (`id`),
   KEY `product` (`product`),
@@ -1182,7 +1182,7 @@ CREATE TABLE IF NOT EXISTS `zt_todo` (
 -- DROP TABLE IF EXISTS `zt_user`;
 CREATE TABLE IF NOT EXISTS `zt_user` (
   `id` mediumint(8) unsigned NOT NULL auto_increment,
-  `type` char(30) NOT NULL,
+  `type` char(30) NOT NULL default 'inside',
   `dept` mediumint(8) unsigned NOT NULL default '0',
   `account` char(30) NOT NULL default '',
   `password` char(32) NOT NULL default '',
@@ -4008,4 +4008,8 @@ INSERT INTO `zt_stage` (`name`,`percent`,`type`,`createdBy`,`createdDate`,`edite
 ('发布','10','release','admin','2020-02-08 21:08:30','admin','2020-02-12 13:50:27','0'),
 ('总结评审','5','review','admin','2020-02-08 21:08:45','admin','2020-02-12 13:50:27','0');
 
-INSERT INTO `zt_config` (`owner`, `module`, `section`, `key`, `value`) VALUES ('system','custom','','storyPoint','1');
+INSERT INTO `zt_config` (`owner`, `module`, `section`, `key`, `value`) VALUES 
+('system','custom','','hourPoint','1');
+('system','custom','','URAndSR','1'),
+('system','custom','waterfall','URSRName','{\"URCommon\":{\"zh-cn\":\"\\u7528\\u6237\\u9700\\u6c42\"},\"SRCommon\":{\"zh-cn\":\"\\u8f6f\\u4ef6\\u9700\\u6c42\"}}'),
+('system','custom','scrum','URSRName','{\"URCommon\":{\"zh-cn\":\"\\u53f2\\u8bd7\"},\"SRCommon\":{\"zh-cn\":\"\\u6545\\u4e8b\"}}');

module/story/control.php

@@ -1427,7 +1427,7 @@ class story extends control
 
         if($result == 'no')
         {   
-            $this->dao->update(TABLE_STORY)->set('storyChanged')->eq(0)->where('id')->eq($storyID)->exec();
+            $this->dao->update(TABLE_STORY)->set('URChanged')->eq(0)->where('id')->eq($storyID)->exec();
             die(js::closeModal('parent.parent', 'this'));
         }   
 

module/story/lang/en.php

@@ -139,7 +139,7 @@ $lang->story->allStories     = 'All Stories';
 $lang->story->unclosed       = 'Unclosed';
 $lang->story->deleted        = 'Deleted';
 $lang->story->released       = 'Released Stories';
-$lang->story->storyChanged   = 'Requirement Changed';
+$lang->story->URChanged      = 'Requirement Changed';
 $lang->story->design         = 'Designs';
 $lang->story->case           = 'Cases';
 $lang->story->bug            = 'Bugs';

module/story/lang/zh-cn.php

@@ -138,7 +138,7 @@ $lang->story->allStories     = "所有{$lang->storyCommon}";
 $lang->story->unclosed       = '未关闭';
 $lang->story->deleted        = '已删除';
 $lang->story->released       = "已发布{$lang->storyCommon}数";
-$lang->story->storyChanged   = '用需变更';
+$lang->story->URChanged      = '用需变更';
 $lang->story->design         = '相关设计';
 $lang->story->case           = '相关用例';
 $lang->story->bug            = '相关Bug';

module/story/model.php

@@ -508,7 +508,7 @@ class storyModel extends model
                 /* IF is story and has changed, update its relation version to new. */
                 if($oldStory->type == 'story')
                 {
-                    $this->dao->update(TABLE_STORY)->set('storyChanged')->eq(0)->where('id')->eq($oldStory->id)->exec();
+                    $this->dao->update(TABLE_STORY)->set('URChanged')->eq(0)->where('id')->eq($oldStory->id)->exec();
                     $this->updateStoryVersion($story);
                 }
                 else
@@ -521,7 +521,7 @@ class storyModel extends model
                         ->andWhere('AID')->eq($story->id)
                         ->fetchPairs();
 
-                    foreach($relations as $relationID) $this->dao->update(TABLE_STORY)->set('storyChanged')->eq(1)->where('id')->eq($relationID)->exec();
+                    foreach($relations as $relationID) $this->dao->update(TABLE_STORY)->set('URChanged')->eq(1)->where('id')->eq($relationID)->exec();
                 }
             }
             else
@@ -3056,9 +3056,9 @@ class storyModel extends model
                 echo $story->sourceNote;
                 break;
             case 'status':
-                if($story->storyChanged)
+                if($story->URChanged)
                 {
-                    print("<span class='status-story status-changed'>{$this->lang->story->storyChanged}</span>");
+                    print("<span class='status-story status-changed'>{$this->lang->story->URChanged}</span>");
                     break;
                 }
                 echo "<span class='status-{$story->status}'>";
@@ -3146,7 +3146,7 @@ class storyModel extends model
                 break;
             case 'actions':
                 $vars = "story={$story->id}";
-                if($story->storyChanged)
+                if($story->URChanged)
                 {
                     common::printIcon('story', 'processStoryChange', "storyID=$story->id", '', 'list', 'search', '', 'iframe', true, '', $this->lang->confirm);
                     break;

module/story/view/processstorychange.html.php

@@ -10,7 +10,7 @@
       <h2>
         <span class='label label-id'><?php echo $story->id;?></span>
         <?php echo '<span title="' . $story->title . '">' . $story->title . '</span>';?>
-        <small><?php echo $lang->arrow . $lang->story->storyChanged;?></small>
+        <small><?php echo $lang->arrow . $lang->story->URChanged;?></small>
       </h2>
     </div>
     <table class='table table-fixed'>