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

* Adjust issue operation button.

Browse Source
This commit is contained in:
leiyong
2020-09-09 09:47:39 +08:00
parent d27efffa6d
commit 34fb096e96
3 changed files with 38 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/issue/model.php
+21
View File
@@ -416,4 +416,25 @@ class issueModel extends model
$this->loadModel('search')->setSearchParams($this->config->issue->search);
}
/**
* Adjust the action is clickable.
*
* @param int $issue
* @param int $action
*
* @access public
* @return bool
*/
public static function isClickable($issue, $action)
{
$action = strtolower($action);
if($action == 'resolve') return $issue->status != 'resolved';
if($action == 'close') return $issue->status != 'closed';
if($action == 'activate') return $issue->status != 'active';
if($action == 'cancel') return $issue->status != 'canceled';
return true;
}
}
module/issue/view/browse.html.php
+8 -7
View File
@@ -62,14 +62,15 @@
<td title="<?php echo $issue->createdDate;?>"><?php echo $issue->createdDate;?></td>
<td class="c-actions">
<?php
echo common::printIcon('issue', 'resolve', "issueID=$issue->id", $issue, 'list', 'checked', '', 'iframe', 'yes', '', $lang->issue->resolve);
echo common::printIcon('issue', 'assignTo', "issueID=$issue->id", $issue, 'list', 'hand-right', '', 'iframe', 'yes', '', $lang->issue->assignTo);
echo common::printIcon('issue', 'close', "issueID=$issue->id", $issue, 'list', 'off', '', 'iframe', 'yes');
echo common::printIcon('issue', 'cancel', "issueID=$issue->id", $issue, 'list', 'ban-circle', '', 'iframe', 'yes');
echo common::printIcon('issue', 'activate', "issueID=$issue->id", $issue, 'list', 'magic', '', 'iframe', 'yes', '', $lang->issue->activate);
echo common::printIcon('issue', 'edit', "issueID=$issue->id", $issue, 'list', 'edit');
$params = "issueID=$issue->id";
echo common::printIcon('issue', 'resolve', $params, $issue, 'list', 'checked', '', 'iframe', 'yes', '', $lang->issue->resolve);
echo common::printIcon('issue', 'assignTo', $params, $issue, 'list', 'hand-right', '', 'iframe', 'yes', '', $lang->issue->assignTo);
echo common::printIcon('issue', 'close', $params, $issue, 'list', 'off', '', 'iframe', 'yes');
echo common::printIcon('issue', 'cancel', $params, $issue, 'list', 'ban-circle', '', 'iframe', 'yes');
echo common::printIcon('issue', 'activate', $params, $issue, 'list', 'magic', '', 'iframe', 'yes', '', $lang->issue->activate);
echo common::printIcon('issue', 'edit', $params, $issue, 'list', 'edit');
$deleteClass = common::hasPriv('issue', 'delete') ? 'btn' : 'btn disabled';
echo html::a($this->createLink('issue', 'delete', "issueID=$issue->id"), '<i class="icon-trash"></i>', 'hiddenwin', "title='{$lang->issue->delete}' class='$deleteClass'");
echo html::a($this->createLink('issue', 'delete', $params), '<i class="icon-trash"></i>', 'hiddenwin', "title='{$lang->issue->delete}' class='$deleteClass'");
?>
</td>
</tr>
module/issue/view/view.html.php
+9 -8
View File
@@ -55,14 +55,15 @@ foreach($issue as $field => $value)
<?php if(!isonlybody()) echo "<div class='divider'></div>";?>
<?php if(!$issue->deleted):?>
<?php
common::printIcon('issue', 'resolve', "issueID=$issue->id", $issue, 'button', 'checked', '', 'iframe showinonlybody', true);
common::printIcon('issue', 'assignTo', "issueID=$issue->id", $issue, 'button', '', '', 'iframe showinonlybody', true);
common::printIcon('issue', 'cancel', "issueID=$issue->id", $issue, 'button', '', '', 'iframe showinonlybody', true);
common::printIcon('issue', 'close', "issueID=$issue->id", $issue, 'button', '', '', 'iframe showinonlybody', true);
common::printIcon('issue', 'activate', "issueID=$issue->id", $issue, 'button', '', '', 'iframe showinonlybody', true);
echo "<div class='divider'></div>";
common::printIcon('issue', 'edit', "issueID=$issue->id", $issue);
common::printIcon('issue', 'delete', "issueID=$issue->id", $issue, 'button', 'trash', 'hiddenwin');
$params = "issueID=$issue->id";
common::printIcon('issue', 'resolve', $params, $issue, 'button', 'checked', '', 'iframe showinonlybody', true);
common::printIcon('issue', 'assignTo', $params, $issue, 'button', '', '', 'iframe showinonlybody', true);
common::printIcon('issue', 'cancel', $params, $issue, 'button', '', '', 'iframe showinonlybody', true);
common::printIcon('issue', 'close', $params, $issue, 'button', '', '', 'iframe showinonlybody', true);
common::printIcon('issue', 'activate', $params, $issue, 'button', '', '', 'iframe showinonlybody', true);
echo "<div class='divider'></div>";
common::printIcon('issue', 'edit', $params, $issue);
common::printIcon('issue', 'delete', $params, $issue, 'button', 'trash', 'hiddenwin');
?>
<?php endif;?>
</div>