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

* Fix bug #16882, #16924.

Browse Source
This commit is contained in:
liumengyi
2021-12-01 11:25:02 +08:00
parent 86674338d9
commit bba0c40dfe
4 changed files with 10 additions and 14 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 -4
View File
@@ -115,10 +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'>
<div class='checkbox-primary checkbox-inline'>
<input type='checkbox' name='actions[<?php echo $moduleName;?>][]' value='<?php echo $action;?>' <?php if(isset($groupPrivs[$moduleName][$action])) echo "checked='checked'";?> id='actions[<?php echo $moduleName . "]" . $action;?>' title='<?php echo $lang->$moduleName->$actionLabel;?>';>
<label for='actions[<?php echo $moduleName . "]" . $action;?>' ><?php echo $lang->$moduleName->$actionLabel;?></label>
</div>
<?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/project/view/managepriv.html.php
+1 -4
View File
@@ -120,10 +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'>
<div class='checkbox-primary checkbox-inline'>
<input type='checkbox' name='actions[<?php echo $moduleName;?>][]' value='<?php echo $action;?>' <?php if(isset($groupPrivs[$moduleName][$action])) echo "checked='checked'";?> id='actions[<?php echo $moduleName . "]" . $action;?>' title='<?php echo $lang->$moduleName->$actionLabel;?>';>
<label for='actions[<?php echo $moduleName . "]" . $action;?>' ><?php echo $lang->$moduleName->$actionLabel;?></label>
</div>
<?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>