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

Merge branch 'sprint/tianshujie_bug21028' into 'master'

Browse Source 
Sprint/tianshujie bug21028

See merge request easycorp/zentaopms!2605
This commit is contained in:
李玉春
2022-03-29 03:30:23 +00:00
parent 53468f156f 93d7e2dd1d
commit 91b8835642
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/project/view/browsebylist.html.php
+9 -9
View File
@@ -14,14 +14,14 @@
.project-type-label.label-outline {width: 50px; min-width: 50px;}
.project-type-label.label {overflow: unset !important; text-overflow: unset !important; white-space: unset !important;}
#projectTableList .project-name {position: relative; display: flex; align-items: center;}
#projectTableList .project-name > span,
#projectTableList .project-name > span {flex: none;}
#projectTableList .project-name > a {color: #0c60e1; display: inline-block; max-width: calc(100% - 50px);}
#projectTableList .project-name.has-prefix > a,
#projectTableList .project-name.has-suffix > a {max-width: calc(100% - 100px);}
#projectTableList .project-name.has-prefix > a {padding-left: 5px;}
#projectTableList .project-name.has-suffix > a {padding-right: 5px;}
.project-name {position: relative; display: flex; align-items: center;}
.project-name > span,
.project-name > span {flex: none;}
.project-name > a {color: #0c60e1; display: inline-block; max-width: calc(100% - 50px);}
.project-name.has-prefix > a,
.project-name.has-suffix > a {max-width: calc(100% - 100px);}
.project-name.has-prefix > a {padding-left: 5px;}
.project-name.has-suffix > a {padding-right: 5px;}
.table-footer {z-index: 1;}
</style>
<div id="mainMenu" class="clearfix">
@@ -109,7 +109,7 @@
?>
</tr>
</thead>
<tbody class="sortable" id='projectTableList'>
<tbody class="sortable">
<?php foreach($projectStats as $project):?>
<?php $project->from = 'project';?>
<tr data-id="<?php echo $project->id;?>">
module/user/model.php
+1 -1
View File
@@ -102,7 +102,7 @@ class userModel extends model
->beginIF(strpos($params, 'nodeleted') !== false or empty($this->config->user->showDeleted))->andWhere('deleted')->eq('0')->fi()
->beginIF(strpos($params, 'all') === false)->andWhere('type')->eq($type)->fi()
->beginIF($accounts)->andWhere('account')->in($accounts)->fi()
->beginIF($this->config->vision)->andWhere("CONCAT(',', visions, ',')")->like("%,{$this->config->vision},%")->fi()
->beginIF($this->config->vision and $this->app->rawModule !== 'kanban')->andWhere("CONCAT(',', visions, ',')")->like("%,{$this->config->vision},%")->fi()
->orderBy($orderBy)
->beginIF($maxCount)->limit($maxCount)->fi()
->fetchAll($keyField);