Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'master' of https://github.com/easysoft/zentaopms

Browse Source
This commit is contained in:
holan20180123
2020-08-07 17:31:57 +08:00
parent a890c24077 0ac5ab572d
commit 3eb3fcce02
19 changed files with 39 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
module/task/control.php
View File

@@ -43,7 +43,7 @@ class task extends control
* @access public
* @return void
*/
public function create($projectID = 0, $storyID = '', $moduleID = 0, $taskID = 0, $todoID = 0)
public function create($projectID = 0, $storyID = 0, $moduleID = 0, $taskID = 0, $todoID = 0)
{
$this->project->getLimitedProject();
$limitedProjects = !empty($_SESSION['limitedProjects']) ? $_SESSION['limitedProjects'] : '';
@@ -580,9 +580,9 @@ class task extends control
$muletipleTasks = $this->dao->select('root')->from(TABLE_TEAM)->where('type')->eq('task')->andWhere('root')->in($taskIDList)->fetchPairs();
$tasks = $this->task->getByList($taskIDList);
$this->loadModel('action');
foreach($tasks as $taskID => $task)
{
$this->loadModel('action');
if(in_array($taskID, $muletipleTasks) and $task->assignedTo != $this->app->user->account) continue;
$changes = $this->task->assign($taskID);

2
module/task/view/create.html.php
View File

@@ -78,7 +78,7 @@
<span id='storyBox'><?php printf($lang->task->noticeLinkStory, html::a($this->createLink('project', 'linkStory', "projectID=$project->id"), $lang->project->linkStory, '_blank', 'class="text-primary"'), html::a("javascript:loadStories($project->id)", $lang->refresh, '', 'class="text-primary"'));?></span>
<?php else:?>
<div class='input-group'>
<?php echo html::select('story', array($task->story => $stories[$task->story]), $task->story, "class='form-control chosen' onchange='setStoryRelated();'");?>
<?php echo html::select('story', $stories, $task->story, "class='form-control chosen' onchange='setStoryRelated();'");?>
<span class='input-group-btn' id='preview'><a href='#' class='btn iframe'><?php echo $lang->preview;?></a></span>
</div>
<?php endif;?>