From a1eb251907e9f3f7e8d592af07acef042cb1cbbc Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Sat, 2 Apr 2022 10:13:13 +0800
Subject: [PATCH] * Fix bug #15460,17587.

---
 module/design/control.php              |  7 ++++---
 module/design/css/viewcommit.css       |  2 ++
 module/design/js/viewcommit.js         | 20 ++++++++++++++++++++
 module/design/view/browse.html.php     |  4 ++--
 module/design/view/viewcommit.html.php |  8 +++-----
 5 files changed, 31 insertions(+), 10 deletions(-)
 create mode 100644 module/design/css/viewcommit.css
 create mode 100644 module/design/js/viewcommit.js

diff --git a/module/design/control.php b/module/design/control.php
index 1beea92865..601a926bca 100644
--- a/module/design/control.php
+++ b/module/design/control.php
@@ -308,8 +308,6 @@ class design extends control
         $repos  = $this->loadModel('repo')->getRepoPairs('project', $design->project);
         $repoID = $repoID ? $repoID : key($repos);
 
-        if(empty($repoID)) return print(js::locate(helper::createLink('repo', 'create', "objectID=$design->project")));
-
         $repo      = $this->loadModel('repo')->getRepoByID($repoID);
         $revisions = $this->repo->getCommits($repo, '', 'HEAD', '', '', $begin, $end);
 
@@ -399,12 +397,15 @@ class design extends control
         $this->app->loadClass('pager', $static = true);
         $pager   = pager::init(0, $recPerPage, $pageID);
 
+        $design = $this->design->getCommit($designID, $pager);
+
         $this->view->title      = $this->lang->design->common . $this->lang->colon . $this->lang->design->submission;
         $this->view->position[] = $this->lang->design->submission;
 
-        $this->view->design = $this->design->getCommit($designID, $pager);
+        $this->view->design = $design;
         $this->view->pager  = $pager;
         $this->view->users  = $this->loadModel('user')->getPairs('noletter');
+        $this->view->repos  = $this->loadModel('repo')->getRepoPairs('project', $design->project);
 
         $this->display();
     }
diff --git a/module/design/css/viewcommit.css b/module/design/css/viewcommit.css
new file mode 100644
index 0000000000..f14cfda20e
--- /dev/null
+++ b/module/design/css/viewcommit.css
@@ -0,0 +1,2 @@
+#mainContent .pull-right{margin-bottom: 10px}
+.table{border: 1px solid #ddd;}
diff --git a/module/design/js/viewcommit.js b/module/design/js/viewcommit.js
new file mode 100644
index 0000000000..56db3f864e
--- /dev/null
+++ b/module/design/js/viewcommit.js
@@ -0,0 +1,20 @@
+$(function()
+{
+    $('#linkCommit').click(function()
+    {
+        if(repos.length == 0)
+        {
+            var onlybody    = config.onlybody;
+            config.onlybody = 'no';
+
+            var link = createLink('repo', 'create', 'objectID=' + projectID);
+
+            config.onlybody = onlybody;
+            window.parent.$.apps.open(link, 'devops');
+
+            parent.$('#triggerModal').modal('hide');
+
+            return false;
+        }
+    });
+});
diff --git a/module/design/view/browse.html.php b/module/design/view/browse.html.php
index d080b42d5c..7ebc91caec 100644
--- a/module/design/view/browse.html.php
+++ b/module/design/view/browse.html.php
@@ -51,9 +51,9 @@
             <td class='c-actions text-center'>
               <?php
               $vars = "design={$design->id}";
-              common::printIcon('design', 'edit',       $vars, $design, 'list', 'alter', '', '', '', '', '', $design->project);
+              common::printIcon('design', 'edit',       $vars, $design, 'list', 'alter');
               common::printIcon('design', 'viewCommit', $vars, $design, 'list', 'list-alt', '', 'iframe showinonlybody', true);
-              common::printIcon('design', 'delete',     $vars, $design, 'list', 'trash', 'hiddenwin', '', '', '', '', $design->project);
+              common::printIcon('design', 'delete',     $vars, $design, 'list', 'trash', 'hiddenwin');
               ?>
             </td>
           </tr>
diff --git a/module/design/view/viewcommit.html.php b/module/design/view/viewcommit.html.php
index 883dcd88b5..052201b658 100644
--- a/module/design/view/viewcommit.html.php
+++ b/module/design/view/viewcommit.html.php
@@ -11,10 +11,8 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
-<style>
-#mainContent .pull-right{margin-bottom: 10px}
-.table{border: 1px solid #ddd;}
-</style>
+<?php js::set('repos', $repos);?>
+<?php js::set('projectID', $design->project);?>
 <div id="mainContent">
   <div class='main-header'>
     <h2>
@@ -24,7 +22,7 @@
     </h2>
   </div>
   <div class='btn-toolbar pull-right'>
-    <?php common::printLink('design', 'linkCommit', "designID=$design->id", "<i class='icon icon-plus'></i>" . $lang->design->linkCommit, '_blank', "class='btn btn-primary'");?>
+    <?php common::printLink('design', 'linkCommit', "designID=$design->id", "<i class='icon icon-plus'></i>" . $lang->design->linkCommit, '', "class='btn btn-primary' id='linkCommit'");?>
   </div>
   <?php if(empty($design->commit)):?>
   <div class="table-empty-tip">