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

* Finish task #54349.

Browse Source
This commit is contained in:
liumengyi
2022-05-17 16:51:19 +08:00
parent 71cb47e7eb
commit dfa70c678b
5 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/custom/view/kanban.html.php
+1 -1
View File
@@ -16,7 +16,7 @@
<tr>
<th class='w-150px'><?php echo $lang->custom->closedKanban;?></th>
<td class='w-300px text-left'>
<?php $checkedKey = isset($config->CRKanban) ? $config->CRKanban : 0;?>
<?php $checkedKey = isset($config->CRKanban) ? $config->CRKanban : 1;?>
<?php foreach($lang->custom->CRKanban as $key => $value):?>
<label class="radio-inline"><input type="radio" name="kanban" value="<?php echo $key?>"<?php echo $key == $checkedKey ? " checked='checked'" : ''?> id="kanban<?php echo $key;?>"><?php echo $value;?></label>
<?php endforeach;?>
module/group/lang/resource.php
+1
View File
@@ -1270,6 +1270,7 @@ $lang->resource->custom->editStoryConcept = 'editStoryConcept';
$lang->resource->custom->browseStoryConcept = 'browseStoryConcept';
$lang->resource->custom->setDefaultConcept = 'setDefaultConcept';
$lang->resource->custom->deleteStoryConcept = 'deleteStoryConcept';
$lang->resource->custom->kanban = 'kanban';
$lang->custom->methodOrder[5] = 'index';
$lang->custom->methodOrder[10] = 'set';
module/kanban/js/view.js
+2 -1
View File
@@ -78,13 +78,13 @@ function fullScreen()
function exitFullScreen()
{
$('.region-actions > div > .action').show();
$(".title").attr("disabled", false).css("pointer-events", "auto");
if(kanban.status == 'closed') return;
$('#kanbanContainer').removeClass('fullscreen')
.off('scroll', tryUpdateKanbanAffix);
$('.actions').show();
$('.action').show();
$('.kanban-group-header').show();
$(".title").attr("disabled", false).css("pointer-events", "auto");
$('.kanban-col.kanban-header-col').css('padding', '0px 30px');
window.sortableDisabled = false;
$.cookie('isFullScreen', 0);
@@ -1417,6 +1417,7 @@ $(function()
{
fullScreen();
$('.region-actions > div > .action').show();
$(".title").attr("disabled", false).css("pointer-events", "auto");
}
});
module/kanban/model.php
+1 -1
View File
@@ -2940,7 +2940,7 @@ class kanbanModel extends model
$actions .= "<div class='btn-group'>";
$actions .= "<a href='javascript:fullScreen();' id='fullScreenBtn' $btnColor class='btn btn-link'><i class='icon icon-fullscreen'></i> {$this->lang->kanban->fullScreen}</a>";
$CRKanban = ($this->config->CRKanban or $kanban->status != 'closed');
$CRKanban = !($this->config->CRKanban === '0' and $kanban->status === 'closed');
$printRegionBtn = ($CRKanban and (common::hasPriv('kanban', 'createRegion') or $printSetHeightBtn or common::hasPriv('kanban', 'performable') or common::hasPriv('kanban', 'enableArchived') or common::hasPriv('kanban', 'import') or common::hasPriv('kanban', 'setColumnWidth')));
$printKanbanBtn = (common::hasPriv('kanban', 'edit') or common::hasPriv('kanban', 'close') or common::hasPriv('kanban', 'delete'));
module/kanban/view/viewcard.html.php
+1 -1
View File
@@ -34,7 +34,7 @@
</div>
<div class='main-actions'>
<div class="btn-toolbar">
<?php if(!$card->deleted and !$card->archived):?>
<?php if(!$card->deleted and !$card->archived and !($this->config->CRKanban === '0' and $kanban->status === 'closed')):?>
<?php
//common::printLink('kanban', 'assigntoCard', "cardID=$card->id", "<i class='icon icon-hand-right'></i><span class='text'>{$lang->kanbancard->assign}</span>", '', "class='btn btn-link iframe' title='{$lang->kanbancard->assign}'", true, true);
if($kanban->archived)