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

Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms

Browse Source
This commit is contained in:
liyuchun
2021-08-30 16:48:09 +08:00
parent f35427ab9d 66e2833ee9
commit 24e12278da
4 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/common/model.php
+2 -2
View File
@@ -1365,13 +1365,13 @@ EOD;
$showCount = 0;
foreach($executionPairs as $executionID => $executionName)
{
$html .= "<li style='max-width: 300px;'>" . html::a(helper::createLink('execution', 'task', "executionID=$executionID"), $executionName, '', "title='{$executionName}' class='text-ellipsis'") . '</li>';
$html .= "<li style='max-width: 300px;'>" . html::a(helper::createLink('execution', 'task', "executionID=$executionID"), $executionName, '', "title='{$executionName}' class='text-ellipsis' style='padding: 2px 10px'") . '</li>';
$showCount ++;
if($showCount == 10) break;
}
if(count($executionPairs) > 10) $html .= '<li>' . html::a(helper::createLink('project', 'execution', "status=all&projectID={$object->project}"), $lang->preview . $lang->more, '', "data-app='project'") . '</li>';
if(count($executionPairs) > 10) $html .= '<li>' . html::a(helper::createLink('project', 'execution', "status=all&projectID={$object->project}"), $lang->preview . $lang->more, '', "data-app='project' style='padding: 2px 10px'") . '</li>';
$html .= "</ul></li>\n";
module/doc/model.php
+2 -2
View File
@@ -72,7 +72,7 @@ class docModel extends model
if($lib->project != 0) $lib->name = zget($projects, $lib->project, '') . '/' . $lib->name;
}
$libPairs[$lib->id] = '/' . $lib->name;
$libPairs[$lib->id] = $lib->name;
}
}
@@ -81,7 +81,7 @@ class docModel extends model
$stmt = $this->dao->select('*')->from(TABLE_DOCLIB)->where('id')->in($appendLibs)->orderBy('`order`, id desc')->query();
while($lib = $stmt->fetch())
{
if(!isset($libPairs[$lib->id]) and $this->checkPrivLib($lib, $extra)) $libPairs[$lib->id] = '/' . $lib->name;
if(!isset($libPairs[$lib->id]) and $this->checkPrivLib($lib, $extra)) $libPairs[$lib->id] = $lib->name;
}
}
module/product/model.php
+1
View File
@@ -1540,6 +1540,7 @@ class productModel extends model
$projectProduct = $this->dao->select('t1.product,t1.project')->from(TABLE_PROJECTPRODUCT)->alias('t1')
->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project=t2.id')
->where('t1.product')->in(array_keys($productList))
->andWhere('t1.project')->in($this->app->user->view->projects)
->andWhere('t2.type')->eq('project')
->andWhere('t2.status')->eq('doing')
->andWhere('t2.deleted')->eq('0')
module/product/view/kanban.html.php
+2 -1
View File
@@ -17,6 +17,7 @@
</div>
<?php else:?>
<?php foreach($products as $type => $programs):?>
<?php if(empty($programs)) continue;?>
<div class="cell">
<table class="table text-center" style="border-radius: 0; background: #efefef;">
<caption><?php echo $type == 'myProducts' ? $lang->product->myProduct : $lang->product->otherProduct;?></caption>
@@ -167,7 +168,7 @@ $(function()
}
})
$('.emptyBoard').parent().height($('.board-item').parent().height());
$('.emptyBoard').parent().height($('.project .board').height());
})
</script>
<?php include '../../common/view/footer.html.php';?>