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

Merge branch 'sprint/235_liumengyi_27238' into 'master'

Browse Source 
* Fix bug #27238, and fix bug for set switcher.

See merge request easycorp/zentaopms!5253
This commit is contained in:
孙广明
2022-09-02 05:49:05 +00:00
parent 1a9ba95c43 c5e91ea120
commit 547879695e
4 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/kanban/control.php
+3
View File
@@ -23,6 +23,8 @@ class kanban extends control
*/
public function space($browseType = 'involved', $recTotal = 0, $recPerPage = 15, $pageID = 1)
{
$this->session->set('regionID', 'all', 'kanban');
/* Load pager. */
$this->app->loadClass('pager', $static = true);
$pager = new pager($recTotal, $recPerPage, $pageID);
@@ -421,6 +423,7 @@ class kanban extends control
}
$regions = $this->kanban->getKanbanData($kanbanID);
if(!isset($regions[$regionID])) $this->session->set('regionID', 'all', 'kanban');
$this->view->users = $users;
$this->view->title = $this->lang->kanban->view;
module/kanban/js/view.js
+4 -2
View File
@@ -13,8 +13,10 @@ function loadMore(type, regionID)
var link = createLink('kanban', method, 'regionID=' + regionID);
$(selector).load(link, function()
{
var windowHeight = $(window).height();
$(selector + ' .panel-body').css('height', windowHeight - 100);
var windowHeight = $(window).height();
var affixedHeight = $('#regionTabs.affixed').height() + $('#kanbanContainer .kanban-affixed .kanban-cols').height();
$(selector + ' .panel-body').css('height', windowHeight - affixedHeight);
$(selector).css('top', affixedHeight);
$(selector).animate({right: 0}, 500);
});
}
module/kanban/view/ajaxgetkanbanmenu.html.php
+8 -8
View File
@@ -136,10 +136,10 @@ $closedKanbansHtml .= '</ul>';
<script>
$(function()
{
$('.nav-tabs li span').hide();
$('.nav-tabs li.active').find('span').show();
$('#dropMenu .nav-tabs li span').hide();
$('#dropMenu .nav-tabs li.active').find('span').show();
$('.nav-tabs>li a').click(function()
$('#dropMenu .nav-tabs>li a').click(function()
{
if($('#swapper input[type="search"]').val() == '')
{
@@ -154,14 +154,14 @@ $(function()
{
if(value != '')
{
$('div.hide-in-search').siblings('i').addClass('hide-in-search');
$('.nav-tabs li span').hide();
$('#dropMenu div.hide-in-search').siblings('i').addClass('hide-in-search');
$('#dropMenu .nav-tabs li span').hide();
}
else
{
$('div.hide-in-search').siblings('i').removeClass('hide-in-search');
$('li.has-list div.hide-in-search').removeClass('hidden');
$('.nav-tabs li.active').find('span').show();
$('#dropMenu div.hide-in-search').siblings('i').removeClass('hide-in-search');
$('#dropMenu li.has-list div.hide-in-search').removeClass('hidden');
$('#dropMenu .nav-tabs li.active').find('span').show();
}
})
})
module/kanban/view/view.html.php
+2 -2
View File
@@ -111,8 +111,8 @@ $canViewArchivedColumn = commonModel::hasPriv('kanban', 'viewArchivedColumn');
<?php if($canCreateLane) echo '<li>' . html::a(inlink('createLane', "kanbanID={$kanban->id}&regionID={$region->id}", '', 1), '<i class="icon icon-plus"></i>' . $this->lang->kanban->createLane, '', "class='iframe'") . '</li>';?>
<?php if($canDeleteRegion and count($regions) > 1) echo '<li>' . html::a(inlink('deleteRegion', "regionID={$region->id}"), '<i class="icon icon-trash"></i>' . $this->lang->kanban->deleteRegion, "hiddenwin") . '</li>';?>
<?php if(($canCreateRegion or $canEditRegion or $canCreateLane or ($canDeleteRegion and count($regions) > 1)) and ($kanban->archived and ($canViewArchivedCard or $canViewArchivedColumn)))echo "<li class='divider'></li>"?>
<?php if($canViewArchivedCard and $kanban->archived) echo '<li>' . html::a("javascript:loadMore(\"Card\", $regionID)", '<i class="icon icon-card-archive"></i>' . $this->lang->kanban->viewArchivedCard) . '</li>';?>
<?php if($canViewArchivedColumn and $kanban->archived) echo '<li>' . html::a("javascript:loadMore(\"Column\", $regionID)", '<i class="icon icon-col-archive"></i>' . $this->lang->kanban->viewArchivedColumn) . '</li>';?>
<?php if($canViewArchivedCard and $kanban->archived) echo '<li>' . html::a("javascript:loadMore(\"Card\", $region->id)", '<i class="icon icon-card-archive"></i>' . $this->lang->kanban->viewArchivedCard) . '</li>';?>
<?php if($canViewArchivedColumn and $kanban->archived) echo '<li>' . html::a("javascript:loadMore(\"Column\", $region->id)", '<i class="icon icon-col-archive"></i>' . $this->lang->kanban->viewArchivedColumn) . '</li>';?>
</ul>
<?php endif;?>
</div>