diff --git a/module/project/ui/managemembers.html.php b/module/project/ui/managemembers.html.php index 54a34599aa..65fdb32eb4 100644 --- a/module/project/ui/managemembers.html.php +++ b/module/project/ui/managemembers.html.php @@ -284,7 +284,7 @@ div 'text' => $lang->save, 'type' => 'primary', 'btnType' => 'button', - 'onclick' => 'changeProjectMembers()' + 'onclick' => commonModel::isTutorialMode() ? '' : 'changeProjectMembers()' ), 'cancel' )) diff --git a/module/tutorial/control.php b/module/tutorial/control.php index 8f30bcc74c..8e883ef13c 100644 --- a/module/tutorial/control.php +++ b/module/tutorial/control.php @@ -79,7 +79,6 @@ class tutorial extends control { $this->session->set('tutorialMode', false); $this->loadModel('setting')->setItem($this->app->user->account . '.common.global.novice', 0); - if(empty($referer)) $referer = helper::safe64Encode(helper::createLink('my', 'index', '', 'html')); return $this->send(array('result' => 'success', 'open' => $this->createLink('index', 'index'))); } diff --git a/module/tutorial/js/index.ui.js b/module/tutorial/js/index.ui.js index 6b9ee1b149..a873ddc98f 100644 --- a/module/tutorial/js/index.ui.js +++ b/module/tutorial/js/index.ui.js @@ -263,7 +263,7 @@ $(function() if(task.nav.formType === 'table') { targetStatus.form = true; - if(current === 'manageTeam') fieldSelector = '#' + task.nav.requiredFields; + if(current === 'manageTeam') fieldSelector = 'input[name="' + task.nav.requiredFields + '"]'; else fieldSelector = '.dtable-checkbox'; var $formItem = $$(fieldSelector); @@ -301,6 +301,7 @@ $(function() if(showToolTipTask) clearTimeout(showToolTipTask); $submitTarget.addClass('active'); + clearTips(); if(task.nav.submit) showToolTip($form.find(task.nav.submit), $submitTarget.text(), {placement: 'top'}); } else @@ -388,7 +389,7 @@ $(function() if(task.nav.formType === 'table') { - if(current === 'manageTeam') fieldSelector = '#' + task.nav.requiredFields; + if(current === 'manageTeam') fieldSelector = 'input[name="' + task.nav.requiredFields + '"]'; else fieldSelector = '.dtable-checkbox'; } else if(requiredFields) @@ -430,7 +431,7 @@ $(function() } else { - $checkbox = $$(task.nav.target).on('click', function(){ + $$(task.nav.target).on('click', function(){ var current = this setTimeout( function() diff --git a/module/tutorial/lang/zh-cn.php b/module/tutorial/lang/zh-cn.php index 8d7ce774a7..7b1eec0c48 100644 --- a/module/tutorial/lang/zh-cn.php +++ b/module/tutorial/lang/zh-cn.php @@ -122,10 +122,11 @@ $lang->tutorial->tasks['manageTeam']['nav'] = array(); $lang->tutorial->tasks['manageTeam']['nav']['app'] = 'project'; $lang->tutorial->tasks['manageTeam']['nav']['module'] = 'project'; $lang->tutorial->tasks['manageTeam']['nav']['method'] = 'managemembers'; +$lang->tutorial->tasks['manageTeam']['nav']['vars'] = 'projectID=0'; $lang->tutorial->tasks['manageTeam']['nav']['menuModule'] = ''; $lang->tutorial->tasks['manageTeam']['nav']['menu'] = '#actionBar, #header > .container > #heading > .toolbar, #table-tutorial-wizard > .dtable-body > .dtable-cells > .dtable-cells-container > .dtable-cell[data-col="name"] > .dtable-cell-content > a, #table-project-browse > .dtable-body > .dtable-cells > .dtable-cells-container > .dtable-cell[data-col="name"] > .dtable-cell-content > a, .nav-item > a[data-id="settings"], #mainNavbar > .container > .nav > .nav-item > a[data-id="members"]'; $lang->tutorial->tasks['manageTeam']['nav']['form'] = '#teamForm'; -$lang->tutorial->tasks['manageTeam']['nav']['requiredFields'] = 'account1'; +$lang->tutorial->tasks['manageTeam']['nav']['requiredFields'] = 'accounts[1]'; $lang->tutorial->tasks['manageTeam']['nav']['formType'] = 'table'; $lang->tutorial->tasks['manageTeam']['nav']['submit'] = '.form-row > .form-actions > button:first-child'; $lang->tutorial->tasks['manageTeam']['nav']['target'] = '.manage-team-btn'; @@ -156,8 +157,8 @@ $lang->tutorial->tasks['linkStory']['nav']['app'] = 'execution'; $lang->tutorial->tasks['linkStory']['nav']['module'] = 'execution'; $lang->tutorial->tasks['linkStory']['nav']['method'] = 'linkStory'; $lang->tutorial->tasks['linkStory']['nav']['menuModule'] = 'story'; -$lang->tutorial->tasks['linkStory']['nav']['menu'] = '#heading > .toolbar > a[title="执行"], #table-execution-all > .dtable-body > .dtable-cells > .dtable-cells-container > .dtable-cell[data-col="name"], .link-story-btn'; -$lang->tutorial->tasks['linkStory']['nav']['form'] = '#table-tutorial-wizard'; +$lang->tutorial->tasks['linkStory']['nav']['menu'] = '#heading > .toolbar > a[title="执行"], #table-execution-all > .dtable-body > .dtable-cells > .dtable-cells-container > .dtable-cell[data-col="nameCol"] > .dtable-cell-content > .dtable-cell-html, .link-story-btn'; +$lang->tutorial->tasks['linkStory']['nav']['form'] = '#table-tutorial-wizard,#table-execution-linkstory'; $lang->tutorial->tasks['linkStory']['nav']['formType'] = 'table'; $lang->tutorial->tasks['linkStory']['nav']['submit'] = '.link-story-btn'; $lang->tutorial->tasks['linkStory']['nav']['target'] = '.dtable-checkbox'; @@ -173,7 +174,8 @@ $lang->tutorial->tasks['createTask']['nav']['app'] = 'execution'; $lang->tutorial->tasks['createTask']['nav']['module'] = 'task'; $lang->tutorial->tasks['createTask']['nav']['method'] = 'create'; $lang->tutorial->tasks['createTask']['nav']['menuModule'] = 'story'; -$lang->tutorial->tasks['createTask']['nav']['menu'] = '#heading > .toolbar > .toolbar-item, .create-task-btn'; +$lang->tutorial->tasks['createTask']['nav']['vars'] = 'executionID=2&storyID=0'; +$lang->tutorial->tasks['createTask']['nav']['menu'] = '#heading > .toolbar > .toolbar-item, .create-task-btn, #table-execution-all > .dtable-body > .dtable-cells > .dtable-cells-container > .dtable-cell[data-col="nameCol"] > .dtable-cell-content > .dtable-cell-html'; $lang->tutorial->tasks['createTask']['nav']['form'] = '#mainContent'; $lang->tutorial->tasks['createTask']['nav']['submit'] = 'button[type=submit]'; $lang->tutorial->tasks['createTask']['nav']['target'] = '.create-task-btn';