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

*Fix bug

Browse Source
This commit is contained in:
zhengrunyu
2022-01-24 09:32:24 +08:00
parent e9776236d4
commit cff61e144d
3 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/kanban/control.php
+1 -1
View File
@@ -793,7 +793,7 @@ class kanban extends control
* @access public
* @return void
*/
public function activate($cardID, $kanbanID)
public function activateCard($cardID, $kanbanID)
{
$this->dao->update(TABLE_KANBANCARD)->set('status')->eq('doing')->where('id')->eq($cardID)->exec();
if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
module/kanban/lang/en.php
+2 -2
View File
@@ -100,10 +100,10 @@ $lang->kanban->aclGroup['extend'] = 'Extend';
$lang->kanban->aclList['extend'] = 'Extend (Accessible with space view permissions)';
$lang->kanban->aclList['private'] = 'Private (For the kanban team, whitelist members and space owner only)';
$lang->kanban->archiveList['0'] = 'No Enable';
$lang->kanban->archiveList['0'] = 'Disabled ';
$lang->kanban->archiveList['1'] = 'Enable';
$lang->kanban->enableFinished['0'] = 'No Enable';
$lang->kanban->enableFinished['0'] = 'Disabled ';
$lang->kanban->enableFinished['1'] = 'Enable';
$lang->kanban->type = array();
module/kanban/model.php
+1 -5
View File
@@ -2635,11 +2635,7 @@ class kanbanModel extends model
if(common::hasPriv('kanban', 'delete')) $kanbanActions .= '<li>' . html::a(helper::createLink('kanban', 'delete', "kanbanID=$kanban->id"), '<i class="icon icon-trash"></i>' . $this->lang->kanban->delete, 'hiddenwin', "class='btn btn-link'") . '</li>';
if($kanbanActions)
{
<<<<<<< module/kanban/model.php
$actions .= ((common::hasPriv('kanban', 'createRegion') or $printSetHeight or common::hasPriv('kanban', 'setDoneFunction')) and (common::hasPriv('kanban', 'edit') or common::hasPriv('kanban', 'close') or common::hasPriv('kanban', 'enableArchived') or common::hasPriv('kanban', 'delete'))) ? "<div class='divider'></div>" . $kanbanActions : $kanbanActions;
=======
$actions .= ((common::hasPriv('kanban', 'createRegion') or $printSetHeight or common::hasPriv('kanban', 'performable')) and (common::hasPriv('kanban', 'edit') or common::hasPriv('kanban', 'close') or common::hasPriv('kanban', 'delete'))) ? "<div class='divider'></div>" . $kanbanActions : $kanbanActions;
>>>>>>> module/kanban/model.php
$actions .= ((common::hasPriv('kanban', 'createRegion') or $printSetHeight or common::hasPriv('kanban', 'performable')) and (common::hasPriv('kanban', 'edit') or common::hasPriv('kanban', 'close') or common::hasPriv('kanban', 'enableArchived') or common::hasPriv('kanban', 'delete'))) ? "<div class='divider'></div>" . $kanbanActions : $kanbanActions;
}
$actions .= "</ul>";
}