diff --git a/module/common/model.php b/module/common/model.php index 14e0311bee..5b88b47fa7 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -1365,13 +1365,13 @@ EOD; $showCount = 0; foreach($executionPairs as $executionID => $executionName) { - $html .= "
  • " . html::a(helper::createLink('execution', 'task', "executionID=$executionID"), $executionName, '', "title='{$executionName}' class='text-ellipsis'") . '
  • '; + $html .= "
  • " . html::a(helper::createLink('execution', 'task', "executionID=$executionID"), $executionName, '', "title='{$executionName}' class='text-ellipsis' style='padding: 2px 10px'") . '
  • '; $showCount ++; if($showCount == 10) break; } - if(count($executionPairs) > 10) $html .= '
  • ' . html::a(helper::createLink('project', 'execution', "status=all&projectID={$object->project}"), $lang->preview . $lang->more, '', "data-app='project'") . '
  • '; + if(count($executionPairs) > 10) $html .= '
  • ' . html::a(helper::createLink('project', 'execution', "status=all&projectID={$object->project}"), $lang->preview . $lang->more, '', "data-app='project' style='padding: 2px 10px'") . '
  • '; $html .= "\n"; diff --git a/module/doc/model.php b/module/doc/model.php index b467edd37b..90359b8903 100644 --- a/module/doc/model.php +++ b/module/doc/model.php @@ -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; } } diff --git a/module/product/model.php b/module/product/model.php index 6e6e99da5b..1c754dd805 100644 --- a/module/product/model.php +++ b/module/product/model.php @@ -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') diff --git a/module/product/view/kanban.html.php b/module/product/view/kanban.html.php index 06b4edb7c5..fea369c397 100644 --- a/module/product/view/kanban.html.php +++ b/module/product/view/kanban.html.php @@ -17,6 +17,7 @@ $programs):?> +
    @@ -167,7 +168,7 @@ $(function() } }) - $('.emptyBoard').parent().height($('.board-item').parent().height()); + $('.emptyBoard').parent().height($('.project .board').height()); })
    product->myProduct : $lang->product->otherProduct;?>