From 258f2cad9c49b79763a9fa557856e4df7cd1e2c9 Mon Sep 17 00:00:00 2001 From: Catouse Date: Mon, 21 May 2018 11:29:00 +0800 Subject: [PATCH] * refactor codes. --- module/bug/view/view.html.php | 16 +++--- module/common/model.php | 2 +- module/common/view/action.html.php | 2 +- module/story/view/view.html.php | 10 ++-- module/task/view/view.html.php | 86 ++++++++++++++++-------------- module/testcase/view/view.html.php | 8 +-- www/js/zui/min.js | 2 +- www/theme/zui/css/min.css | 2 +- 8 files changed, 66 insertions(+), 62 deletions(-) diff --git a/module/bug/view/view.html.php b/module/bug/view/view.html.php index 5541edc1b7..517d6db1d8 100644 --- a/module/bug/view/view.html.php +++ b/module/bug/view/view.html.php @@ -199,7 +199,7 @@ bug->resolutionList[$bug->resolution]; - if(isset($bug->duplicateBugTitle)) echo " #$bug->duplicateBug:" . html::a($this->createLink('bug', 'view', "bugID=$bug->duplicateBug"), $bug->duplicateBugTitle); + if(isset($bug->duplicateBugTitle)) echo " #$bug->duplicateBug:" . html::a($this->createLink('bug', 'view', "bugID=$bug->duplicateBug", '', true), $bug->duplicateBugTitle, '', "class='iframe' data-width='80%'"); ?> @@ -230,7 +230,7 @@ bug->story;?> story) echo html::a($this->createLink('story', 'view', "storyID=$bug->story"), "#$bug->story $bug->storyTitle"); + if($bug->story) echo html::a($this->createLink('story', 'view', "storyID=$bug->story", '', true), "#$bug->story $bug->storyTitle", '', "class='iframe' data-width='80%'"); if($bug->storyStatus == 'active' and $bug->latestStoryVersion > $bug->storyVersion) { echo "({$lang->story->changed} "; @@ -242,7 +242,7 @@ bug->task;?> - task) echo html::a($this->createLink('task', 'view', "taskID=$bug->task"), $bug->taskName);?> + task) echo html::a($this->createLink('task', 'view', "taskID=$bug->task", '', true), $bug->taskName, '', "class='iframe' data-width='80%'");?> @@ -263,7 +263,7 @@ { foreach($bug->linkBugTitles as $linkBugID => $linkBugTitle) { - echo html::a($this->createLink('bug', 'view', "bugID=$linkBugID"), "#$linkBugID $linkBugTitle", '_blank') . '
'; + echo html::a($this->createLink('bug', 'view', "bugID=$linkBugID", '', true), "#$linkBugID $linkBugTitle", '', "class='iframe' data-width='80%'") . '
'; } } ?> @@ -272,7 +272,7 @@ case):?> bug->fromCase;?> - createLink('testcase', 'view', "caseID=$bug->case"), "#$bug->case $bug->caseTitle", '_blank');?> + createLink('testcase', 'view', "caseID=$bug->case", '', true), "#$bug->case $bug->caseTitle", '', "class='iframe' data-width='80%'");?> toCases):?> @@ -282,7 +282,7 @@ toCases as $caseID => $case) { - echo '

' . html::a($this->createLink('testcase', 'view', "caseID=$caseID"), $case) . '

'; + echo '

' . html::a($this->createLink('testcase', 'view', "caseID=$caseID", '', true), $case, '', "class='iframe' data-width='80%'") . '

'; } ?> @@ -292,13 +292,13 @@ toStory != 0):?> bug->toStory;?> - createLink('story', 'view', "storyID=$bug->toStory"), "#$bug->toStory $bug->toStoryTitle", '_blank');?> + createLink('story', 'view', "storyID=$bug->toStory", '', true), "#$bug->toStory $bug->toStoryTitle", '', "class='iframe' data-width='80%'");?> toTask != 0):?> bug->toTask;?> - createLink('task', 'view', "taskID=$bug->toTask"), "#$bug->toTask $bug->toTaskTitle", '_blank');?> + createLink('task', 'view', "taskID=$bug->toTask", '', true), "#$bug->toTask $bug->toTaskTitle", '', "class='iframe' data-width='80%'");?> diff --git a/module/common/model.php b/module/common/model.php index 8486cdbdd3..362001b21f 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -680,7 +680,7 @@ class commonModel extends model