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

Merge branch 'sprint/175_liumengyi_16882' into 'master'

Browse Source 
* Fix bug #16882.

See merge request easycorp/zentaopms!690
This commit is contained in:
李玉春
2021-12-01 05:01:11 +00:00
parent c470e13c6e bba0c40dfe
commit 20ae1dba85
5 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/action/model.php
+6 -4
View File
@@ -1482,12 +1482,14 @@ class actionModel extends model
{
$dateGroup = array_reverse($dateGroup);
}
elseif($this->app->rawModule == 'company' and (($direction == 'next' and $orderBy == 'date_asc') or ($direction == 'pre' and $orderBy == 'date_desc')))
elseif($this->app->rawModule == 'company')
{
$dateGroup = array_reverse($dateGroup);
foreach($dateGroup as $key => $dateItem) $dateGroup[$key] = array_reverse($dateItem);
if($direction == 'pre') $dateGroup = array_reverse($dateGroup);
if(($direction == 'next' and $orderBy == 'date_asc') or ($direction == 'pre' and $orderBy == 'date_desc'))
{
foreach($dateGroup as $key => $dateItem) $dateGroup[$key] = array_reverse($dateItem);
}
}
return $dateGroup;
}
module/company/css/dynamic.css
+2 -2
View File
@@ -18,6 +18,6 @@
.dynamic.collapsed .timeline > li + li {display: none;}
.dynamic.collapsed .dynamic-btn > .icon:before {content: '\f0d8';}
.c-project, .c-product, .c-execution {width: 140px !important; overflow: unset;}
.c-user,.c-order {width: 100px !important; overflow: unset;}
.c-project, .c-product, .c-execution {width: 110px !important; overflow: unset;}
.c-user,.c-order {width: 90px !important; overflow: unset;}
.c-date {width: 200px;}
module/group/view/privbygroup.html.php
+1 -1
View File
@@ -115,7 +115,7 @@
<?php if(!empty($lang->$moduleName->menus) and $action == 'browse') continue;;?>
<?php if(!empty($version) and strpos($changelogs, ",$moduleName-$actionLabel,") === false) continue;?>
<div class='group-item'>
<?php echo html::checkbox("actions[{$moduleName}]", array($action => $lang->$moduleName->$actionLabel), isset($groupPrivs[$moduleName][$action]) ? $action : '', '', 'inline');?>
<?php echo html::checkbox("actions[{$moduleName}]", array($action => $lang->$moduleName->$actionLabel), isset($groupPrivs[$moduleName][$action]) ? $action : '', "title='{$lang->$moduleName->$actionLabel}'", 'inline');?>
</div>
<?php endforeach;?>
</td>
module/group/view/privbymodule.html.php
+1 -1
View File
@@ -17,7 +17,7 @@
<small class='text-muted'> <?php echo $lang->group->byModuleTips; ?></small>
</h2>
</div>
<form class='table-bymodule pdb-20' method='post' target='hiddenwin'>
<table class='table table-form'>
<tr class='text-center'>
module/project/view/managepriv.html.php
+1 -1
View File
@@ -120,7 +120,7 @@ td.menus + td {border-left: 0;}
<?php if(!empty($lang->$moduleName->menus) and $action == 'browse') continue;;?>
<?php if(!empty($version) and strpos($changelogs, ",$moduleName-$actionLabel,") === false) continue;?>
<div class='group-item'>
<?php echo html::checkbox("actions[{$moduleName}]", array($action => $lang->$moduleName->$actionLabel), isset($groupPrivs[$moduleName][$action]) ? $action : '', '', 'inline');?>
<?php echo html::checkbox("actions[{$moduleName}]", array($action => $lang->$moduleName->$actionLabel), isset($groupPrivs[$moduleName][$action]) ? $action : '', "title='{$lang->$moduleName->$actionLabel}'", 'inline');?>
</div>
<?php endforeach;?>
</td>