From 7cb180b540c23c1e586a447a26b219463d43722c Mon Sep 17 00:00:00 2001 From: Catouse Date: Mon, 9 Jul 2018 13:28:29 +0800 Subject: [PATCH 01/28] * make table in group/view sortalbe. --- module/group/view/browse.html.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/module/group/view/browse.html.php b/module/group/view/browse.html.php index 48cc40ea97..9e8497e1c6 100644 --- a/module/group/view/browse.html.php +++ b/module/group/view/browse.html.php @@ -11,6 +11,7 @@ */ ?> + group->confirmDelete);?>
- +
From 97d0357070242d3b90ecd52b446a3b8ebb7d29ae Mon Sep 17 00:00:00 2001 From: Catouse Date: Mon, 9 Jul 2018 13:28:44 +0800 Subject: [PATCH 02/28] * finish task #4556. --- module/productplan/view/view.html.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/productplan/view/view.html.php b/module/productplan/view/view.html.php index 6846403005..3c896024fa 100644 --- a/module/productplan/view/view.html.php +++ b/module/productplan/view/view.html.php @@ -21,7 +21,7 @@
id;?> - title;?> + title;?> type !== 'normal') echo "" . $branches[$branch] . '';?> begin == '2030-01-01' || $plan->end == '2030-01-01') ? $lang->productplan->future : $plan->begin . '~' . $plan->end;?> @@ -67,8 +67,8 @@
'> - +
id, \"story\")", ' ' . $lang->productplan->linkStory, '', "class='btn btn-primary'");?>
From dccf32171b4b6e423d5ce94655361caf69664e38 Mon Sep 17 00:00:00 2001 From: Catouse Date: Mon, 9 Jul 2018 13:33:25 +0800 Subject: [PATCH 03/28] * fix $versionName not defined error. --- module/misc/view/changelog.html.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/misc/view/changelog.html.php b/module/misc/view/changelog.html.php index 890b1ca869..a2a1f1d868 100644 --- a/module/misc/view/changelog.html.php +++ b/module/misc/view/changelog.html.php @@ -1,13 +1,13 @@
-
+

changeLog ?>

 diff --git a/module/bug/view/linkbugs.html.php b/module/bug/view/linkbugs.html.php index 11a9ba8dc2..d9870ae8b7 100644 --- a/module/bug/view/linkbugs.html.php +++ b/module/bug/view/linkbugs.html.php @@ -11,7 +11,7 @@ */ ?> -
+

id;?> @@ -19,11 +19,11 @@ arrow . $lang->bug->linkBugs;?>

-
+
group->id;?>
-
    - linkBugTitles)) - { - foreach($bug->linkBugTitles as $linkBugID => $linkBugTitle) - { - echo '
  • '; - echo html::a(inlink('view', "bugID=$linkBugID"), "#$linkBugID " . $linkBugTitle, '_blank'); - echo html::a("javascript:unlinkBug($bug->id, $linkBugID)", '', '', "title='{$lang->unlink}' style='float:right'"); - echo '
    • '; - } - } - ?> +
      + linkBugTitles)) + { + foreach($bug->linkBugTitles as $linkBugID => $linkBugTitle) + { + echo "
    • "; + echo ""; + echo ""; + echo '
      • '; + } + } + ?> +
- +
@@ -64,10 +64,33 @@
-
+
id);?>
+ diff --git a/module/story/control.php b/module/story/control.php index 71451e3dfb..6e81e64589 100644 --- a/module/story/control.php +++ b/module/story/control.php @@ -1156,32 +1156,6 @@ class story extends control $this->display(); } - /** - * AJAX: if type is linkStories, get related stories else get child stories. - * - * @param int $storyID - * @param string $type - * @access public - * @return string - */ - public function ajaxGetLinkedStories($storyID, $type = '') - { - /* Get linked stories. */ - $stories = $this->story->getLinkedStories($storyID, $type); - - /* Build linked stories list. */ - $output = ''; - foreach($stories as $storyId => $storyTitle) - { - $output .= '
  • '; - $output .= html::a(inlink('view', "storyID=$storyId"), "#$storyId " . $storyTitle, '_blank'); - $output .= html::a("javascript:unlinkStory($storyID, \"$type\", $storyId)", '', '', "title='{$this->lang->unlink}' style='float:right'"); - $output .= '
    • '; - } - - die($output); - } - /** * AJAX: get stories of a project in html select. * diff --git a/module/story/model.php b/module/story/model.php index fe25918d7c..5d6c5cb632 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -1270,20 +1270,6 @@ class storyModel extends model } } - /** - * Get linked stories. - * - * @param string $storyID - * @param string $type - * @access public - * @return array - */ - public function getLinkedStories($storyID, $type = 'linkStories') - { - $story = $this->getById($storyID); - return $this->dao->select('id, title')->from(TABLE_STORY)->where('id')->in($story->$type)->fetchPairs(); - } - /** * Get stories list of a product. * diff --git a/module/story/view/edit.html.php b/module/story/view/edit.html.php index b9049fe557..7521b86081 100644 --- a/module/story/view/edit.html.php +++ b/module/story/view/edit.html.php @@ -49,8 +49,6 @@ -
    linkStories);?>
    -
    childStories);?>
    lastEditedDate); @@ -200,23 +198,24 @@ -