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

* Finish task #36482 and fix bugs.

Browse Source
This commit is contained in:
Yagami
2021-03-09 14:58:08 +08:00
parent e87a149ff7
commit bd061f23dd
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/common/lang/zh-cn.php
+1 -1
View File
@@ -528,7 +528,7 @@ $lang->admin->menu->index = array('link' => '首页|admin|index', 'alias' => '
$lang->admin->menu->company = array('link' => '人员|company|browse|', 'subModule' => ',user,dept,group,', 'alias' => ',dynamic,view,');
$lang->admin->menu->message = array('link' => '通知|message|index', 'subModule' => 'message,mail,webhook');
$lang->admin->menu->custom = array('link' => '自定义|custom|index', 'subModule' => 'custom');
$lang->admin->menu->system = array('link' => '系统|backup|index', 'subModule' => 'cron,admin,backup,action');
$lang->admin->menu->system = array('link' => '系统|backup|index', 'subModule' => 'cron,backup,action');
$lang->company->menu = $lang->company->menu;
$lang->dept->menu = $lang->company->menu;
module/execution/control.php
+3 -3
View File
@@ -2236,15 +2236,15 @@ class execution extends control
$allStories = $this->story->getProductStories(array_keys($products), $branches, $moduleID = '0', $status = 'active', 'story', 'id_desc', $hasParent = false, '', $pager = null);
}
if($execution->execution != 0) $executionStories = $this->story->getStoryPairs($execution->execution);
if($execution->project != 0) $projectStories = $this->story->getExecutionStoryPairs($execution->project);
$executionStories = $this->story->getStoryPairs($executionID);
$executionStories = $this->story->getExecutionStoryPairs($executionID);
foreach($allStories as $id => $story)
{
if(isset($executionStories[$story->id])) unset($allStories[$id]);
if($story->parent < 0) unset($allStories[$id]);
if(!empty($executionStories) and !isset($executionStories[$story->id])) unset($allStories[$id]);
if(!empty($projectStories) and !isset($projectStories[$story->id])) unset($allStories[$id]);
}
/* Pager. */
module/tree/model.php
+1 -1
View File
@@ -875,7 +875,7 @@ class treeModel extends model
* @access public
* @return string
*/
public function createProjectStoryLink($type, $module, $extra)
public function createExecutionStoryLink($type, $module, $extra)
{
$executionID = $extra['executionID'];
$productID = $extra['productID'];
www/theme/default/style.css
+2 -2
View File
@@ -51,8 +51,8 @@ a.showMoreImage:hover {opacity: 1;}
.chosen-container .chosen-drop{z-index: 1100;}
.table-actions .btn{border: 1px solid #1183fb; color: #1183fb}
.table-actions .btn:hover{background: #b3d4fc}
.table-actions .btn {background: #78bdf5; color: #fff; border-color: #78bdf5}
.table-footer .checked+div .btn, .table-actions .btn:hover {background: #16a8f8; border-color: #16a8f8}
#header #toolbar a{color: #fff; font-size: 13px; line-height: 15px; border: #84a2e2 1px solid}
#header #toolbar i{font-size: 16px;}