From 0cf45cb10148dc881629faa4e678a3874401dfb8 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Thu, 12 Jul 2018 13:14:46 +0800 Subject: [PATCH 01/13] * adjust for create task in project for limited user. --- module/task/control.php | 16 ++++++++++++++++ module/task/lang/en.php | 1 + module/task/lang/zh-cn.php | 1 + 3 files changed, 18 insertions(+) diff --git a/module/task/control.php b/module/task/control.php index a4c0d879f1..ba8539f1cf 100644 --- a/module/task/control.php +++ b/module/task/control.php @@ -45,6 +45,14 @@ class task extends control */ public function create($projectID = 0, $storyID = 0, $moduleID = 0, $taskID = 0, $todoID = 0) { + $this->project->getLimitedProject(); + $limitedProjects = !empty($_SESSION['limitedProjects']) ? $_SESSION['limitedProjects'] : ''; + if(strpos(",{$limitedProjects},", ",$projectID,") !== false) + { + echo js::alert($this->lang->task->createDenied); + die(js::locate($this->createLink('project', 'task', "projectID=$projectID"))); + } + $task = new stdClass(); $task->module = $moduleID; $task->assignedTo = ''; @@ -195,6 +203,14 @@ class task extends control */ public function batchCreate($projectID = 0, $storyID = 0, $moduleID = 0, $taskID = 0, $iframe = 0) { + $this->project->getLimitedProject(); + $limitedProjects = !empty($_SESSION['limitedProjects']) ? $_SESSION['limitedProjects'] : ''; + if(strpos(",{$limitedProjects},", ",$projectID,") !== false) + { + echo js::alert($this->lang->task->createDenied); + die(js::locate($this->createLink('project', 'task', "projectID=$projectID"))); + } + $project = $this->project->getById($projectID); $taskLink = $this->createLink('project', 'browse', "projectID=$projectID&tab=task"); $storyLink = $this->session->storyList ? $this->session->storyList : $this->createLink('project', 'story', "projectID=$projectID"); diff --git a/module/task/lang/en.php b/module/task/lang/en.php index 38add30f65..28489151c8 100644 --- a/module/task/lang/en.php +++ b/module/task/lang/en.php @@ -173,6 +173,7 @@ $lang->task->noticeSaveRecord = 'Your Hour is not saved. Please save it fir $lang->task->commentActions = '%s. %s, commented by %s.'; $lang->task->deniedNotice = 'Only the %s can %s the task.'; $lang->task->noTask = 'No tasks. '; +$lang->task->createDenied = 'Create task is denied in this project'; $lang->task->error = new stdclass(); $lang->task->error->consumedNumber = '"Consumed" must be numbers.'; diff --git a/module/task/lang/zh-cn.php b/module/task/lang/zh-cn.php index dee4bdf397..41b2782cbd 100644 --- a/module/task/lang/zh-cn.php +++ b/module/task/lang/zh-cn.php @@ -173,6 +173,7 @@ $lang->task->noticeSaveRecord = '您有尚未保存的工时记录，请先 $lang->task->commentActions = '%s. %s, 由 %s 添加备注。'; $lang->task->deniedNotice = '当前任务只有%s才可以%s。'; $lang->task->noTask = '暂时没有任务。'; +$lang->task->createDenied = '你不能在该项目添加任务'; $lang->task->error = new stdclass(); $lang->task->error->consumedNumber = '"已经消耗"必须为数字'; From 9e4a9f8eb87818b9671517cb2ba198001e363dc1 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Thu, 12 Jul 2018 13:34:51 +0800 Subject: [PATCH 02/13] * adjust style when bind ranzhi in biz version. --- www/theme/default/bindranzhi.css | 3 +++ 1 file changed, 3 insertions(+) diff --git a/www/theme/default/bindranzhi.css b/www/theme/default/bindranzhi.css index c55efb62f9..efbc6b0611 100644 --- a/www/theme/default/bindranzhi.css +++ b/www/theme/default/bindranzhi.css @@ -6,3 +6,6 @@ body{padding-bottom:0px;} .datatable .scroll-wrapper .scroll-slide {bottom:-55px;} .table-footer.fixed-footer{bottom:0px !important;} #footer{display:none;} + +#header #mainHeader #navbar li[data-id='oa']{display:none;} +#subNavbar li[data-id='review']{display:none;} From 2e39603dae24a15eaac4f567ed38eba6093918f6 Mon Sep 17 00:00:00 2001 From: daitingting Date: Thu, 12 Jul 2018 14:15:04 +0800 Subject: [PATCH 03/13] * Adjust codes. --- module/task/model.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/module/task/model.php b/module/task/model.php index d7b5f32f37..02a629ef26 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -498,6 +498,8 @@ class taskModel extends model if(isset($task)) { + if($this->post->status) return $currentTask; + if($currentTask->consumed == 0) { $currentTask->status = 'wait'; From 8083ea07fc9387ebc1817327b599b3a56d01be25 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Thu, 12 Jul 2018 14:33:40 +0800 Subject: [PATCH 04/13] * fix bug #2036. --- module/message/css/setting.css | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/module/message/css/setting.css b/module/message/css/setting.css index 63d3fcce1c..9279a6ca13 100644 --- a/module/message/css/setting.css +++ b/module/message/css/setting.css @@ -1,3 +1,6 @@ .checkbox-primary + .checkbox-primary {margin:0px;} -.checkbox-primary {margin:0px; margin-right:10px !important; width:100px;display:inline-block} +.checkbox-primary {margin:0px; margin-right:10px !important; width:120px;display:inline-block} +.checkbox-primary label{white-space:nowrap; overflow:hidden; text-overflow:ellipsis;} div.chosen-container + select + div.chosen-container > .chosen-choices {border-top:0px;} + +.table-bordered thead .checkbox-primary{width:200px;} From c699bd74a5782eb311a7a845614562aa1b0a7c22 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Thu, 12 Jul 2018 14:35:36 +0800 Subject: [PATCH 05/13] * change for batch change stage. --- module/product/view/browse.html.php | 5 +++-- module/story/model.php | 6 ++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php index 6f69f3b44a..d4f5dace8b 100644 --- a/module/product/view/browse.html.php +++ b/module/product/view/browse.html.php @@ -270,8 +270,9 @@ echo "
  • "; echo html::a('javascript:;', $lang->story->stageAB, '', "id='stageItem'"); echo "
      "; - $lang->story->stageList[''] = $lang->null; - foreach($lang->story->stageList as $key => $stage) + $stageList['verified'] = $lang->story->stageList['verified']; + $stageList['closed'] = $lang->story->stageList['closed']; + foreach($stageList as $key => $stage) { $actionLink = $this->createLink('story', 'batchChangeStage', "stage=$key"); echo "
    • " . html::a('#', $stage, '', "onclick=\"setFormAction('$actionLink','hiddenwin')\"") . "
      • "; diff --git a/module/story/model.php b/module/story/model.php index dc0ce05950..bbf8280118 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -1040,12 +1040,10 @@ class storyModel extends model $story->lastEditedDate = $now; $story->stage = $stage; - /* When stage is verified then only change to released. */ - if($oldStory->stage == 'verified' and $story->stage != 'released') + if($stage == 'verified' or $stage == 'closed') { - $story->stage = 'verified'; $this->dao->update(TABLE_STORY)->data($story)->autoCheck()->where('id')->eq((int)$storyID)->exec(); - $this->dao->update(TABLE_STORYSTAGE)->set('stage')->eq('verified')->where('story')->eq((int)$storyID)->exec(); + $this->dao->update(TABLE_STORYSTAGE)->set('stage')->eq($stage)->where('story')->eq((int)$storyID)->exec(); if(!dao::isError()) $allChanges[$storyID] = common::createChanges($oldStory, $story); } } From 73c335b3de887ecaa61bca080f50ca9011891111 Mon Sep 17 00:00:00 2001 From: daitingting Date: Thu, 12 Jul 2018 14:38:36 +0800 Subject: [PATCH 06/13] * Adjust style. --- module/custom/view/flow.html.php | 51 +++++++++++++-------------- module/custom/view/score.html.php | 53 ++++++++++++++--------------- module/custom/view/working.html.php | 41 +++++++++++----------- 3 files changed, 68 insertions(+), 77 deletions(-) diff --git a/module/custom/view/flow.html.php b/module/custom/view/flow.html.php index 31af5a105c..9e9fb217b2 100644 --- a/module/custom/view/flow.html.php +++ b/module/custom/view/flow.html.php @@ -11,34 +11,31 @@ */ ?> -
      - -
      -
      -
      -
      - custom->flow?> -
      +
      + +
      +
      + custom->flow?>
      - - - - custom->productProject) ? $config->custom->productProject : '0_0' ?> - - - - - - -
      custom->select;?> - custom->productProject->relation as $key => $value):?> -

      - -
      -
      custom->productProject->notice?>
      -
      - -
      +
      + + + + custom->productProject) ? $config->custom->productProject : '0_0' ?> + + + + + + +
      custom->select;?> + custom->productProject->relation as $key => $value):?> +

      + +
      +
      custom->productProject->notice?>
      +
      +