From 01d630040b770d86c7d14f8c0ab8aad979ce9cf3 Mon Sep 17 00:00:00 2001
From: sgm0422 <976204163@qq.com>
Date: Wed, 1 Jul 2020 16:57:13 +0800
Subject: [PATCH] * Add program to repo.

---
 db/update15.0.sql                | 2 +-
 db/zentao.sql                    | 1 +
 module/repo/control.php          | 5 +++--
 module/repo/lang/en.php          | 1 +
 module/repo/lang/zh-cn.php       | 1 +
 module/repo/model.php            | 2 +-
 module/repo/view/create.html.php | 4 ++++
 7 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/db/update15.0.sql b/db/update15.0.sql
index bc1ae2b0ba..a3187e62dd 100644
--- a/db/update15.0.sql
+++ b/db/update15.0.sql
@@ -20,7 +20,7 @@ ALTER TABLE `zt_product` ADD `program` mediumint(8) unsigned NOT NULL AFTER `id`
 ALTER TABLE `zt_task` ADD `program` mediumint(8) unsigned NOT NULL AFTER `id`;
 ALTER TABLE `zt_doc` ADD `program` mediumint(8) unsigned NOT NULL AFTER `id`;
 ALTER TABLE `zt_story` ADD `program` mediumint(8) unsigned NOT NULL AFTER `id`;
-ALTER TABLE `zt_repo` ADD `program` mediumint(8) unsigned NOT NULL AFTER `id`;
+ALTER TABLE `zt_repo` ADD `program` varchar(255) NOT NULL AFTER `id`;
 ALTER TABLE `zt_bug` ADD `program` mediumint(8) unsigned NOT NULL AFTER `id`;
 ALTER TABLE `zt_case` ADD `program` mediumint(8) unsigned NOT NULL AFTER `id`;
 ALTER TABLE `zt_testtask` ADD `program` mediumint(8) unsigned NOT NULL AFTER `id`;
diff --git a/db/zentao.sql b/db/zentao.sql
index 1bbc8ba8a7..eca051d0fc 100644
--- a/db/zentao.sql
+++ b/db/zentao.sql
@@ -656,6 +656,7 @@ CREATE TABLE IF NOT EXISTS `zt_release` (
 -- DROP TABLE IF EXISTS `zt_repo`;
 CREATE TABLE IF NOT EXISTS `zt_repo` (
   `id` mediumint(9) NOT NULL AUTO_INCREMENT,
+  `program` varchar(255) NOT NULL,
   `name` varchar(255) NOT NULL,
   `path` varchar(255) NOT NULL,
   `prefix` varchar(100) NOT NULL,
diff --git a/module/repo/control.php b/module/repo/control.php
index 05e193f169..4270c64886 100644
--- a/module/repo/control.php
+++ b/module/repo/control.php
@@ -88,8 +88,9 @@ class repo extends control
         $this->repo->setMenu($this->repos, '', false);
         $this->app->loadLang('action');
 
-        $this->view->groups = $this->loadModel('group')->getPairs();
-        $this->view->users  = $this->loadModel('user')->getPairs('noletter|noempty|nodeleted');
+        $this->view->groups   = $this->loadModel('group')->getPairs();
+        $this->view->users    = $this->loadModel('user')->getPairs('noletter|noempty|nodeleted');
+        $this->view->programs = $this->loadModel('program')->getPairs();
 
         $this->view->title      = $this->lang->repo->common . $this->lang->colon . $this->lang->repo->create;
         $this->view->position[] = html::a(inlink('maintain'), $this->lang->repo->common);
diff --git a/module/repo/lang/en.php b/module/repo/lang/en.php
index 9e254cf61f..40559f5441 100644
--- a/module/repo/lang/en.php
+++ b/module/repo/lang/en.php
@@ -2,6 +2,7 @@
 $lang->repo->common          = 'Repo';
 $lang->repo->browse          = 'View';
 $lang->repo->viewRevision    = 'View Revision';
+$lang->repo->program         = 'Program';
 $lang->repo->create          = 'Create';
 $lang->repo->createAction    = 'Create Repo';
 $lang->repo->maintain        = 'Repo List';
diff --git a/module/repo/lang/zh-cn.php b/module/repo/lang/zh-cn.php
index 6fe790f7f5..e0e7565cfe 100644
--- a/module/repo/lang/zh-cn.php
+++ b/module/repo/lang/zh-cn.php
@@ -2,6 +2,7 @@
 $lang->repo->common          = '代码';
 $lang->repo->browse          = '浏览';
 $lang->repo->viewRevision    = '查看修订';
+$lang->repo->program         = '所属项目';
 $lang->repo->create          = '创建';
 $lang->repo->createAction    = '创建版本库';
 $lang->repo->maintain        = '版本库列表';
diff --git a/module/repo/model.php b/module/repo/model.php
index 7f81ad7a1f..907251009e 100644
--- a/module/repo/model.php
+++ b/module/repo/model.php
@@ -189,7 +189,7 @@ class repoModel extends model
         $this->checkConnection();
         $data = fixer::input('post')
             ->skipSpecial('path,client,account,password')
-            ->add('program', $this->session->program)
+            ->join('program', ',')
             ->get();
 
         $data->acl = empty($data->acl) ? '' : json_encode($data->acl);
diff --git a/module/repo/view/create.html.php b/module/repo/view/create.html.php
index 5784e72076..cd7a3e42c1 100644
--- a/module/repo/view/create.html.php
+++ b/module/repo/view/create.html.php
@@ -24,6 +24,10 @@
       </div>
       <form id='repoForm' method='post' class='form-ajax'>
         <table class='table table-form'>
+          <tr>
+            <th><?php echo $lang->repo->program; ?></th>
+            <td class='required'><?php echo html::select('program[]', $programs, $this->session->program, "class='form-control chosen' multiple"); ?></td>
+          </tr>
           <tr>
             <th class='thWidth'><?php echo $lang->repo->type; ?></th>
             <td style="width:550px"><?php echo html::select('SCM', $lang->repo->scmList, 'Git', "onchange='scmChanged(this.value)' class='form-control'"); ?></td>