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

* fix for batch assign in safari.

Browse Source
This commit is contained in:
wangyidong
2017-10-13 09:16:31 +08:00
parent 09e803a091
commit fe7eea2227
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/project/view/task.html.php
+4 -4
View File
@@ -73,11 +73,11 @@ js::set('browseType', $browseType);
echo "<ul class='dropdown-menu' id='moreActionMenu'>";
$actionLink = $this->createLink('task', 'batchClose');
$misc = $canBatchClose ? "onclick=\"setFormAction('$actionLink','hiddenwin')\"" : "class='disabled'";
$misc = $canBatchClose ? "onclick=\"setFormAction('$actionLink', 'hiddenwin', '#moreAction')\"" : "class='disabled'";
echo "<li>" . html::a('#', $lang->close, '', $misc) . "</li>";
$actionLink = $this->createLink('task', 'batchCancel');
$misc = $canBatchCancel ? "onclick=\"setFormAction('$actionLink','hiddenwin')\"" : "class='disabled'";
$misc = $canBatchCancel ? "onclick=\"setFormAction('$actionLink', 'hiddenwin', '#moreAction')\"" : "class='disabled'";
echo "<li>" . html::a('#', $lang->task->cancel, '', $misc) . "</li>";
if($canBatchChangeModule)
@@ -90,7 +90,7 @@ js::set('browseType', $browseType);
foreach($modules as $moduleId => $module)
{
$actionLink = $this->createLink('task', 'batchChangeModule', "moduleID=$moduleId");
echo "<li class='option' data-key='$moduleID'>" . html::a('#', $module, '', "onclick=\"setFormAction('$actionLink','hiddenwin')\"") . "</li>";
echo "<li class='option' data-key='$moduleID'>" . html::a('#', $module, '', "onclick=\"setFormAction('$actionLink', 'hiddenwin', '#moreAction')\"") . "</li>";
}
echo '</ul>';
if($withSearch) echo "<div class='menu-search'><div class='input-group input-group-sm'><input type='text' class='form-control' placeholder=''><span class='input-group-addon'><i class='icon-search'></i></span></div></div>";
@@ -114,7 +114,7 @@ js::set('browseType', $browseType);
foreach ($memberPairs as $key => $value)
{
if(empty($key)) continue;
echo "<li class='option' data-key='$key'>" . html::a("javascript:$(\".table-actions #assignedTo\").val(\"$key\");setFormAction(\"$actionLink\")", $value, '', '') . '</li>';
echo "<li class='option' data-key='$key'>" . html::a("javascript:$(\".table-actions #assignedTo\").val(\"$key\");setFormAction(\"$actionLink\", \"hiddenwin\", \"#moreAction\")", $value, '', '') . '</li>';
}
echo "</ul>";
if($withSearch) echo "<div class='menu-search'><div class='input-group input-group-sm'><input type='text' class='form-control' placeholder=''><span class='input-group-addon'><i class='icon-search'></i></span></div></div>";
module/task/control.php
+2 -1
View File
@@ -473,6 +473,7 @@ class task extends control
$taskIDList = $this->post->taskIDList;
unset($_POST['taskIDList']);
if(!is_array($taskIDList)) die(js::locate($this->createLink('project', 'task', "projectID=$project"), 'parent'));
$taskIDList = array_unique($taskIDList);
foreach($taskIDList as $taskID)
{
$this->loadModel('action');
@@ -482,7 +483,7 @@ class task extends control
$this->action->logHistory($actionID, $changes);
$this->task->sendmail($taskID, $actionID);
}
die(js::locate($this->createLink('project', 'task', "projectID=$project"), 'parent'));
die(js::reload('parent'));
}
}
module/task/model.php
+1 -1
View File
@@ -519,7 +519,7 @@ class taskModel extends model
->cleanFloat('left')
->setDefault('lastEditedBy', $this->app->user->account)
->setDefault('lastEditedDate', $now)
->remove('comment')
->remove('comment,showModule')
->setDefault('assignedDate', $now)
->get();