From 561bfadb73fd311faa969125037f74dda548666d Mon Sep 17 00:00:00 2001
From: wyd621 <wyd621@163.com>
Date: Thu, 6 Mar 2014 09:17:06 +0000
Subject: [PATCH]  * code for task #1802.

---
 db/update5.2.1.sql                |  1 +
 module/build/js/common.js         | 18 ++++++++++++++++++
 module/build/lang/en.php          |  4 ++++
 module/build/lang/zh-cn.php       |  4 ++++
 module/build/model.php            | 10 +++++++++-
 module/build/view/create.html.php |  5 +++++
 module/build/view/edit.html.php   |  5 +++++
 7 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/db/update5.2.1.sql b/db/update5.2.1.sql
index 35954e5826..93f10e2b08 100644
--- a/db/update5.2.1.sql
+++ b/db/update5.2.1.sql
@@ -1 +1,2 @@
 ALTER TABLE `zt_project` DROP `goal`;
+ALTER TABLE `zt_build` ADD `packageType` varchar(10) COLLATE 'utf8_general_ci' NOT NULL DEFAULT 'path' AFTER `scmPath`;
diff --git a/module/build/js/common.js b/module/build/js/common.js
index 6be4439ece..c20857ad4d 100644
--- a/module/build/js/common.js
+++ b/module/build/js/common.js
@@ -1,4 +1,22 @@
 $(document).ready(function()
 {
     $("a.preview").colorbox({width:1000, height:550, iframe:true, transition:'none', scrolling:true});
+    if(typeof(packageType) != 'undefined')
+    {
+        var hiddenDom = packageType == 'filePath' ? 'fileform' : 'filePath';
+        $('#' + hiddenDom).parents('tr').addClass('hidden');
+    }
+    $("input[name='packageType']").bind('click', function()
+    {
+        if($(this).val() == 'path')
+        {
+            $('#filePath').parents('tr').removeClass('hidden');
+            $('#fileform').parents('tr').addClass('hidden');
+        }
+        else
+        {
+            $('#filePath').parents('tr').addClass('hidden');
+            $('#fileform').parents('tr').removeClass('hidden');
+        }
+    })
 })
diff --git a/module/build/lang/en.php b/module/build/lang/en.php
index 739540b721..73bd42b969 100644
--- a/module/build/lang/en.php
+++ b/module/build/lang/en.php
@@ -37,6 +37,10 @@ $lang->build->linkStories        = 'Stories';
 $lang->build->linkBugs           = 'Bugs';
 $lang->build->stories            = 'Linked stories';
 $lang->build->bugs               = 'Linked bugs';
+$lang->build->packageType        = 'Package type';
 
 $lang->build->finishStories = 'The total demand for a complete %s';
 $lang->build->resolvedBugs  = 'The total solution of bug%s';
+
+$lang->build->packageTypeList['path'] = 'Shared file';
+$lang->build->packageTypeList['file'] = 'Upload file';
diff --git a/module/build/lang/zh-cn.php b/module/build/lang/zh-cn.php
index b95d89718c..b5da78d3cf 100644
--- a/module/build/lang/zh-cn.php
+++ b/module/build/lang/zh-cn.php
@@ -37,6 +37,10 @@ $lang->build->linkStories        = '相关需求';
 $lang->build->linkBugs           = '相关Bug';
 $lang->build->stories            = '已关联需求';
 $lang->build->bugs               = '已关联Bug';
+$lang->build->packageType        = '发行包方式';
 
 $lang->build->finishStories = '本次共完成需求%s个';
 $lang->build->resolvedBugs  = '本次共解决Bug%s个';
+
+$lang->build->packageTypeList['path'] = '文件共享';
+$lang->build->packageTypeList['file'] = '上传附件';
diff --git a/module/build/model.php b/module/build/model.php
index d16136edd5..79fe0f6508 100644
--- a/module/build/model.php
+++ b/module/build/model.php
@@ -156,7 +156,12 @@ class buildModel extends model
             ->setDefault('product', 0)
             ->join('stories', ',')
             ->join('bugs', ',')
-            ->add('project', (int)$projectID)->remove('resolvedBy,allchecker,files,labels')->get();
+            ->add('project', (int)$projectID)
+            ->remove('resolvedBy,allchecker,files,labels')
+            ->get();
+
+        if($build->packageType == 'path') unset($_FILES);
+
         $this->dao->insert(TABLE_BUILD)->data($build)->autoCheck()->batchCheck($this->config->build->create->requiredFields, 'notempty')->check('name', 'unique', "product = {$build->product}")->exec();
         if(!dao::isError())
         {
@@ -185,6 +190,9 @@ class buildModel extends model
             ->join('bugs', ',')
             ->remove('allchecker,resolvedBy,files,labels')
             ->get();
+
+        if($build->packageType == 'path') unset($_FILES);
+
         $this->dao->update(TABLE_BUILD)->data($build)
             ->autoCheck()
             ->batchCheck($this->config->build->edit->requiredFields, 'notempty')
diff --git a/module/build/view/create.html.php b/module/build/view/create.html.php
index e7ac2b0de6..3f9799fad7 100644
--- a/module/build/view/create.html.php
+++ b/module/build/view/create.html.php
@@ -39,6 +39,10 @@
       <th class='rowhead'><?php echo $lang->build->scmPath;?></th>
       <td><?php echo html::input('scmPath', '', "class='text-1'");?></td>
     </tr>  
+    <tr>
+      <th class='rowhead'><?php echo $lang->build->packageType;?></th>
+      <td><?php echo html::radio('packageType', $lang->build->packageTypeList, 'path');?></td>
+    </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->build->filePath;?></th>
       <td><?php echo html::input('filePath', '', "class='text-1'");?></td>
@@ -114,4 +118,5 @@
     <tr><td colspan='2' class='a-center'><?php echo html::submitButton() . html::backButton();?></td></tr>
   </table>
 </form>
+<?php js::set('packageType', 'filePath')?>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/build/view/edit.html.php b/module/build/view/edit.html.php
index f7bc359e24..df65e9ddac 100644
--- a/module/build/view/edit.html.php
+++ b/module/build/view/edit.html.php
@@ -36,6 +36,10 @@
       <th class='rowhead'><?php echo $lang->build->scmPath;?></th>
       <td><?php echo html::input('scmPath', $build->scmPath, "class='text-1'");?></td>
     </tr>  
+    <tr>
+      <th class='rowhead'><?php echo $lang->build->packageType;?></th>
+      <td><?php echo html::radio('packageType', $lang->build->packageTypeList, $build->packageType);?></td>
+    </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->build->filePath;?></th>
       <td><?php echo html::input('filePath', $build->filePath, "class='text-1'");?></td>
@@ -130,4 +134,5 @@
     <tr><td colspan='2' class='a-center'><?php echo html::submitButton() . html::backButton() .html::hidden('project', $build->project);?></td></tr>
   </table>
 </form>
+<?php js::set('packageType', $build->packageType == 'file' ? 'fileform' : 'filePath')?>
 <?php include '../../common/view/footer.html.php';?>