diff --git a/module/custom/model.php b/module/custom/model.php index f721fd8056..513261d0dd 100644 --- a/module/custom/model.php +++ b/module/custom/model.php @@ -639,7 +639,6 @@ class customModel extends model ->fetch('maxKey'); $maxKey = $maxKey ? $maxKey : 1; - /* If has custom UR and SR name. */ foreach($data->URName as $key => $URName) { diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index 7abd8c18ef..7e70b0060e 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -84,20 +84,21 @@ $lang->index->methodOrder[0] = 'index'; /* My module. */ $lang->resource->my = new stdclass(); -$lang->resource->my->index = 'index'; -$lang->resource->my->todo = 'todo'; -$lang->resource->my->calendar = 'calendar'; -$lang->resource->my->work = 'work'; -$lang->resource->my->contribute = 'contribute'; -$lang->resource->my->project = 'project'; -$lang->resource->my->profile = 'profile'; -$lang->resource->my->dynamic = 'dynamic'; -$lang->resource->my->editProfile = 'editProfile'; -$lang->resource->my->changePassword = 'changePassword'; -$lang->resource->my->manageContacts = 'manageContacts'; -$lang->resource->my->deleteContacts = 'deleteContacts'; -$lang->resource->my->score = 'score'; -$lang->resource->my->unbind = 'unbind'; +$lang->resource->my->index = 'index'; +$lang->resource->my->todo = 'todo'; +$lang->resource->my->calendar = 'calendar'; +$lang->resource->my->work = 'work'; +$lang->resource->my->contribute = 'contribute'; +$lang->resource->my->project = 'project'; +$lang->resource->my->profile = 'profile'; +$lang->resource->my->dynamic = 'dynamic'; +$lang->resource->my->editProfile = 'editProfile'; +$lang->resource->my->changePassword = 'changePassword'; +$lang->resource->my->manageContacts = 'manageContacts'; +$lang->resource->my->deleteContacts = 'deleteContacts'; +$lang->resource->my->score = 'score'; +$lang->resource->my->unbind = 'unbind'; +$lang->resource->my->setStoryConcept = 'setStoryConcept'; $lang->my->methodOrder[0] = 'index'; $lang->my->methodOrder[5] = 'todo'; @@ -112,6 +113,7 @@ $lang->my->methodOrder[45] = 'manageContacts'; $lang->my->methodOrder[50] = 'deleteContacts'; $lang->my->methodOrder[55] = 'score'; $lang->my->methodOrder[60] = 'unbind'; +$lang->my->methodOrder[65] = 'setStoryConcept'; /* Todo. */ $lang->resource->todo = new stdclass(); diff --git a/module/my/control.php b/module/my/control.php index 752b73d05c..0631f85551 100644 --- a/module/my/control.php +++ b/module/my/control.php @@ -212,6 +212,14 @@ class my extends control /* Append id for secend sort. */ $sort = $this->loadModel('common')->appendOrder($orderBy); + /* Get UR and SR pairs. */ + $this->loadModel('custom'); + $this->loadModel('setting'); + $URPairs = $this->custom->getURPairs(); + $SRPairs = $this->custom->getSRPairs(); + $URSR = $this->setting->getItem('owner=system&module=my&key=URSR'); + if(!$URSR) $URSR = $this->setting->getItem('owner=system&module=custom&key=URSR'); + /* Assign. */ $this->view->title = $this->lang->my->common . $this->lang->colon . $this->lang->my->story; $this->view->position[] = $this->lang->my->story; @@ -225,10 +233,37 @@ class my extends control $this->view->orderBy = $orderBy; $this->view->pager = $pager; $this->view->mode = $storyType; + $this->view->URCommon = zget($URPairs, $URSR); + $this->view->SRCommon = zget($SRPairs, $URSR); $this->display(); } + /** + * Set story concept. + * + * @access public + * @return void + */ + public function setStoryConcept() + { + $this->loadModel('setting'); + if($_POST) + { + $URSR = $this->post->URSR; + $this->setting->setItem('system.my.URSR', $URSR); + + die(js::closeModal('parent.parent')); + } + + $URSR = $this->setting->getItem('owner=system&module=my&key=URSR'); + if(!$URSR) $URSR = $this->setting->getItem('owner=system&module=custom&key=URSR'); + + $this->view->URSRList = $this->loadModel('custom')->getURSRPairs(); + $this->view->URSR = $URSR; + $this->display(); + } + /** * My tasks * diff --git a/module/my/lang/de.php b/module/my/lang/de.php index aa2436b843..697cba83f7 100644 --- a/module/my/lang/de.php +++ b/module/my/lang/de.php @@ -2,32 +2,33 @@ $lang->my->common = 'Dashboard'; /* Method List。*/ -$lang->my->index = 'Home'; -$lang->my->todo = 'Meine ToDos'; -$lang->my->calendar = 'Kalender'; -$lang->my->work = 'Work'; -$lang->my->contribute = 'Contribute'; -$lang->my->task = 'Aufgaben'; -$lang->my->bug = 'Bugs'; -$lang->my->testTask = 'Builds'; -$lang->my->testCase = 'Meine Fälle'; -$lang->my->story = 'Meine Storys'; -$lang->my->requirement = 'My Requirements'; -$lang->my->createProgram = 'Create Program'; -$lang->my->project = "My Projects"; -$lang->my->execution = "My {$lang->execution->common}"; -$lang->my->profile = 'Meine Profil'; -$lang->my->dynamic = 'Meine Verlauf'; -$lang->my->editProfile = 'Profil bearbeiten'; -$lang->my->changePassword = 'Passwort ändern'; -$lang->my->unbind = 'Unbind Ranger'; -$lang->my->manageContacts = 'Kontakt pflegen'; -$lang->my->deleteContacts = 'Kontakt löschen'; -$lang->my->shareContacts = 'Liste teilen'; -$lang->my->limited = 'Eingeschränkte Möglichkeiten (Bearbeiten nur eigener Inhalte möglich)'; -$lang->my->score = 'Meine Wertung'; -$lang->my->scoreRule = 'Wertungs regeln'; -$lang->my->noTodo = 'Keine toDos. '; +$lang->my->index = 'Home'; +$lang->my->todo = 'Meine ToDos'; +$lang->my->calendar = 'Kalender'; +$lang->my->work = 'Work'; +$lang->my->contribute = 'Contribute'; +$lang->my->task = 'Aufgaben'; +$lang->my->bug = 'Bugs'; +$lang->my->testTask = 'Builds'; +$lang->my->testCase = 'Meine Fälle'; +$lang->my->story = 'Meine Storys'; +$lang->my->createProgram = 'Create Program'; +$lang->my->project = "My Projects"; +$lang->my->execution = "My {$lang->execution->common}"; +$lang->my->profile = 'Meine Profil'; +$lang->my->dynamic = 'Meine Verlauf'; +$lang->my->editProfile = 'Profil bearbeiten'; +$lang->my->changePassword = 'Passwort ändern'; +$lang->my->unbind = 'Unbind Ranger'; +$lang->my->manageContacts = 'Kontakt pflegen'; +$lang->my->deleteContacts = 'Kontakt löschen'; +$lang->my->shareContacts = 'Liste teilen'; +$lang->my->limited = 'Eingeschränkte Möglichkeiten (Bearbeiten nur eigener Inhalte möglich)'; +$lang->my->score = 'Meine Wertung'; +$lang->my->scoreRule = 'Wertungs regeln'; +$lang->my->setStoryConcept = 'Set Story Concept'; +$lang->my->storyConcept = 'Story Concept'; +$lang->my->noTodo = 'Keine toDos. '; $lang->my->myExecutions = 'My Stage/Sprint/Iteration'; $lang->my->name = 'Name'; diff --git a/module/my/lang/en.php b/module/my/lang/en.php index dcaba4e538..901807e209 100644 --- a/module/my/lang/en.php +++ b/module/my/lang/en.php @@ -2,32 +2,33 @@ $lang->my->common = 'Dashboard'; /* Method List。*/ -$lang->my->index = 'Home'; -$lang->my->todo = 'My Todos'; -$lang->my->calendar = 'Schedule'; -$lang->my->work = 'Work'; -$lang->my->contribute = 'Contribute'; -$lang->my->task = 'My Tasks'; -$lang->my->bug = 'My Bugs'; -$lang->my->testTask = 'My Builds'; -$lang->my->testCase = 'My Cases'; -$lang->my->story = 'My Stories'; -$lang->my->requirement = 'My Requirements'; -$lang->my->createProgram = 'Create Program'; -$lang->my->project = "My Projects"; -$lang->my->execution = "My {$lang->execution->common}"; -$lang->my->profile = 'My Profile'; -$lang->my->dynamic = 'My Dynamics'; -$lang->my->editProfile = 'Edit'; -$lang->my->changePassword = 'Edit Password'; -$lang->my->unbind = 'Unbind from Zdoo'; -$lang->my->manageContacts = 'Manage Contact'; -$lang->my->deleteContacts = 'Delete Contact'; -$lang->my->shareContacts = 'Public'; -$lang->my->limited = 'Limited Actions (Users can only edit what involves them.)'; -$lang->my->score = 'My Points'; -$lang->my->scoreRule = 'Point Rules'; -$lang->my->noTodo = 'No todos yet. '; +$lang->my->index = 'Home'; +$lang->my->todo = 'My Todos'; +$lang->my->calendar = 'Schedule'; +$lang->my->work = 'Work'; +$lang->my->contribute = 'Contribute'; +$lang->my->task = 'My Tasks'; +$lang->my->bug = 'My Bugs'; +$lang->my->testTask = 'My Builds'; +$lang->my->testCase = 'My Cases'; +$lang->my->story = 'My Stories'; +$lang->my->createProgram = 'Create Program'; +$lang->my->project = "My Projects"; +$lang->my->execution = "My {$lang->execution->common}"; +$lang->my->profile = 'My Profile'; +$lang->my->dynamic = 'My Dynamics'; +$lang->my->editProfile = 'Edit'; +$lang->my->changePassword = 'Edit Password'; +$lang->my->unbind = 'Unbind from Zdoo'; +$lang->my->manageContacts = 'Manage Contact'; +$lang->my->deleteContacts = 'Delete Contact'; +$lang->my->shareContacts = 'Public'; +$lang->my->limited = 'Limited Actions (Users can only edit what involves them.)'; +$lang->my->score = 'My Points'; +$lang->my->scoreRule = 'Point Rules'; +$lang->my->setStoryConcept = 'Set Story Concept'; +$lang->my->storyConcept = 'Story Concept'; +$lang->my->noTodo = 'No todos yet. '; $lang->my->myExecutions = "My Stage/Sprint/Iteration"; $lang->my->name = 'Name'; diff --git a/module/my/lang/fr.php b/module/my/lang/fr.php index 0e355beaa8..f35747aec6 100644 --- a/module/my/lang/fr.php +++ b/module/my/lang/fr.php @@ -2,32 +2,33 @@ $lang->my->common = 'Tableau de Bord'; /* Method List。*/ -$lang->my->index = 'Accueil'; -$lang->my->todo = 'Mon Agenda'; -$lang->my->calendar = 'Calendrier'; -$lang->my->work = 'Work'; -$lang->my->contribute = 'Contribute'; -$lang->my->task = 'Mes Tâches'; -$lang->my->bug = 'Mes Bugs'; -$lang->my->testTask = 'Mes Builds'; -$lang->my->testCase = 'Mes CasTests'; -$lang->my->story = 'Mes Stories'; -$lang->my->requirement = 'My Requirements'; -$lang->my->createProgram = 'Create Program'; -$lang->my->project = "My Projects"; -$lang->my->execution = "My {$lang->execution->common}"; -$lang->my->profile = 'Mon Profil'; -$lang->my->dynamic = 'Mon Historique'; -$lang->my->editProfile = 'Edit Profil'; -$lang->my->changePassword = 'Changer le Mot de Passe'; -$lang->my->unbind = 'Dissocier de Zdoo'; -$lang->my->manageContacts = 'Gérer Contact'; -$lang->my->deleteContacts = 'Supprimer Contact'; -$lang->my->shareContacts = 'Public'; -$lang->my->limited = 'Actions Limitées (Les utilisateurs peuvent seulement éditer le contenu de ce qui leur est affecté.)'; -$lang->my->score = 'Mes Points'; -$lang->my->scoreRule = 'Règles Point'; -$lang->my->noTodo = "Je n'ai rien à faire pour l'instant."; +$lang->my->index = 'Accueil'; +$lang->my->todo = 'Mon Agenda'; +$lang->my->calendar = 'Calendrier'; +$lang->my->work = 'Work'; +$lang->my->contribute = 'Contribute'; +$lang->my->task = 'Mes Tâches'; +$lang->my->bug = 'Mes Bugs'; +$lang->my->testTask = 'Mes Builds'; +$lang->my->testCase = 'Mes CasTests'; +$lang->my->story = 'Mes Stories'; +$lang->my->createProgram = 'Create Program'; +$lang->my->project = "My Projects"; +$lang->my->execution = "My {$lang->execution->common}"; +$lang->my->profile = 'Mon Profil'; +$lang->my->dynamic = 'Mon Historique'; +$lang->my->editProfile = 'Edit Profil'; +$lang->my->changePassword = 'Changer le Mot de Passe'; +$lang->my->unbind = 'Dissocier de Zdoo'; +$lang->my->manageContacts = 'Gérer Contact'; +$lang->my->deleteContacts = 'Supprimer Contact'; +$lang->my->shareContacts = 'Public'; +$lang->my->limited = 'Actions Limitées (Les utilisateurs peuvent seulement éditer le contenu de ce qui leur est affecté.)'; +$lang->my->score = 'Mes Points'; +$lang->my->scoreRule = 'Règles Point'; +$lang->my->setStoryConcept = 'Set Story Concept'; +$lang->my->storyConcept = 'Story Concept'; +$lang->my->noTodo = "Je n'ai rien à faire pour l'instant."; $lang->my->myExecutions = 'My Stage/Sprint/Iteration'; $lang->my->name = 'Name'; diff --git a/module/my/lang/vi.php b/module/my/lang/vi.php index 729cb56538..1631140e70 100644 --- a/module/my/lang/vi.php +++ b/module/my/lang/vi.php @@ -2,32 +2,33 @@ $lang->my->common = ''; /* Method List。*/ -$lang->my->index = 'Trang chủ'; -$lang->my->todo = 'Việc của bạn'; -$lang->my->calendar = 'Lịch trình'; -$lang->my->work = 'Work'; -$lang->my->contribute = 'Contribute'; -$lang->my->task = 'Nhiệm vụ'; -$lang->my->bug = 'Bugs của bạn'; -$lang->my->testTask = 'Bản dựng của bạn'; -$lang->my->testCase = 'Tình huống của bạn'; -$lang->my->story = 'Câu chuyện của bạn'; -$lang->my->requirement = 'My Requirements'; -$lang->my->createProgram = 'Create Program'; -$lang->my->project = "My Projects"; -$lang->my->execution = "My {$lang->execution->common}"; -$lang->my->profile = 'Hồ sơ của bạn'; -$lang->my->dynamic = 'Lịch sử của bạn'; -$lang->my->editProfile = 'Sửa'; -$lang->my->changePassword = 'Sửa mật khẩu'; -$lang->my->unbind = 'Gỡ kết nối từ Zdoo'; -$lang->my->manageContacts = 'Quản lý Liên hệ'; -$lang->my->deleteContacts = 'Xóa Liên hệ'; -$lang->my->shareContacts = 'Công khai'; -$lang->my->limited = 'Hành động bị giới hạn (Người dùng chỉ có thể sửa những gì liên quan chúng.)'; -$lang->my->score = 'Điểm của bạn'; -$lang->my->scoreRule = 'Quy định điểm'; -$lang->my->noTodo = 'Chưa có việc nào.'; +$lang->my->index = 'Trang chủ'; +$lang->my->todo = 'Việc của bạn'; +$lang->my->calendar = 'Lịch trình'; +$lang->my->work = 'Work'; +$lang->my->contribute = 'Contribute'; +$lang->my->task = 'Nhiệm vụ'; +$lang->my->bug = 'Bugs của bạn'; +$lang->my->testTask = 'Bản dựng của bạn'; +$lang->my->testCase = 'Tình huống của bạn'; +$lang->my->story = 'Câu chuyện của bạn'; +$lang->my->createProgram = 'Create Program'; +$lang->my->project = "My Projects"; +$lang->my->execution = "My {$lang->execution->common}"; +$lang->my->profile = 'Hồ sơ của bạn'; +$lang->my->dynamic = 'Lịch sử của bạn'; +$lang->my->editProfile = 'Sửa'; +$lang->my->changePassword = 'Sửa mật khẩu'; +$lang->my->unbind = 'Gỡ kết nối từ Zdoo'; +$lang->my->manageContacts = 'Quản lý Liên hệ'; +$lang->my->deleteContacts = 'Xóa Liên hệ'; +$lang->my->shareContacts = 'Công khai'; +$lang->my->limited = 'Hành động bị giới hạn (Người dùng chỉ có thể sửa những gì liên quan chúng.)'; +$lang->my->score = 'Điểm của bạn'; +$lang->my->scoreRule = 'Quy định điểm'; +$lang->my->setStoryConcept = 'Set Story Concept'; +$lang->my->storyConcept = 'Story Concept'; +$lang->my->noTodo = 'Chưa có việc nào.'; $lang->my->myExecutions = "My Stage/Sprint/Iteration"; $lang->my->name = 'Name'; diff --git a/module/my/lang/zh-cn.php b/module/my/lang/zh-cn.php index 2d86b2f7b2..7e371fd024 100644 --- a/module/my/lang/zh-cn.php +++ b/module/my/lang/zh-cn.php @@ -2,34 +2,35 @@ $lang->my->common = '我的地盘'; /* 方法列表。*/ -$lang->my->index = '首页'; -$lang->my->todo = '我的待办'; -$lang->my->calendar = '日程'; -$lang->my->work = '待处理'; -$lang->my->contribute = '贡献'; -$lang->my->task = '我的任务'; -$lang->my->bug = '我的Bug'; -$lang->my->testTask = '我的版本'; -$lang->my->testCase = '我的用例'; -$lang->my->story = "我的{$lang->productSRCommon}"; -$lang->my->requirement = "我的用户{$lang->productSRCommon}"; -$lang->my->createProgram = '添加项目'; -$lang->my->project = "我的项目"; -$lang->my->execution = "我的{$lang->execution->common}"; -$lang->my->issue = '我的问题'; -$lang->my->risk = '我的风险'; -$lang->my->profile = '我的档案'; -$lang->my->dynamic = '我的动态'; -$lang->my->editProfile = '修改档案'; -$lang->my->changePassword = '修改密码'; -$lang->my->unbind = '解除ZDOO绑定'; -$lang->my->manageContacts = '维护联系人'; -$lang->my->deleteContacts = '删除联系人'; -$lang->my->shareContacts = '共享联系人列表'; -$lang->my->limited = '受限操作(只能编辑与自己相关的内容)'; -$lang->my->score = '我的积分'; -$lang->my->scoreRule = '积分规则'; -$lang->my->noTodo = '暂时没有待办。'; +$lang->my->index = '首页'; +$lang->my->todo = '我的待办'; +$lang->my->calendar = '日程'; +$lang->my->work = '待处理'; +$lang->my->contribute = '贡献'; +$lang->my->task = '我的任务'; +$lang->my->bug = '我的Bug'; +$lang->my->testTask = '我的版本'; +$lang->my->testCase = '我的用例'; +$lang->my->story = "我的{$lang->productSRCommon}"; +$lang->my->createProgram = '添加项目'; +$lang->my->project = "我的项目"; +$lang->my->execution = "我的{$lang->execution->common}"; +$lang->my->issue = '我的问题'; +$lang->my->risk = '我的风险'; +$lang->my->profile = '我的档案'; +$lang->my->dynamic = '我的动态'; +$lang->my->editProfile = '修改档案'; +$lang->my->changePassword = '修改密码'; +$lang->my->unbind = '解除ZDOO绑定'; +$lang->my->manageContacts = '维护联系人'; +$lang->my->deleteContacts = '删除联系人'; +$lang->my->shareContacts = '共享联系人列表'; +$lang->my->setStoryConcept = '设置需求概念'; +$lang->my->storyConcept = '需求概念'; +$lang->my->limited = '受限操作(只能编辑与自己相关的内容)'; +$lang->my->score = '我的积分'; +$lang->my->scoreRule = '积分规则'; +$lang->my->noTodo = '暂时没有待办。'; $lang->my->myExecutions = "我参与的阶段/冲刺/迭代"; $lang->my->name = '名称'; diff --git a/module/my/view/setstoryconcept.html.php b/module/my/view/setstoryconcept.html.php new file mode 100644 index 0000000000..be12e8be4a --- /dev/null +++ b/module/my/view/setstoryconcept.html.php @@ -0,0 +1,35 @@ + + * @package task + * @version $Id: setstoryconcept.html.php 935 2010-07-06 07:49:24Z jajacn@126.com $ + * @link http://www.zentao.net + */ +?> + + +