From 8c5d04e49c356e9282477c5e6fe04a24d32068cf Mon Sep 17 00:00:00 2001
From: wangchunsheng <chunsheng@cnezsoft.com>
Date: Sun, 2 Sep 2012 05:53:18 +0000
Subject: [PATCH]  * adjust the copy project feature.

---
 module/common/lang/en.php           |  1 -
 module/common/lang/zh-cn.php        |  1 -
 module/project/control.php          |  2 ++
 module/project/lang/en.php          |  1 +
 module/project/lang/zh-cn.php       |  1 +
 module/project/view/create.html.php | 11 ++++++++++-
 6 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index e2b545f0e1..e9010e3818 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -173,7 +173,6 @@ $lang->project->menu->product   = array('link' => 'Product|project|manageproduct
 $lang->project->menu->view      = 'Info|project|view|projectID=%s';
 $lang->project->menu->order     = 'Order|project|order|projectID=%s';
 $lang->project->menu->create    = array('link' => '<span class="icon-add1">&nbsp;</span>New|project|create', 'float' => 'right');
-$lang->project->menu->copy      = array('link' => '<span class="icon-copy">&nbsp;</span>Copy|project|create|projectID=&copyProjectID=%s', 'float' => 'right');
 $lang->project->menu->all       = array('link' => '<span class="icon-all">&nbsp;</span>Projects|project|index|locate=no', 'float' => 'right');
 $lang->task->menu               = $lang->project->menu;
 $lang->build->menu              = $lang->project->menu;
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index 941250f4e4..6a464abf70 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -172,7 +172,6 @@ $lang->project->menu->product   = '产品|project|manageproducts|projectID=%s';
 $lang->project->menu->view      = array('link' => '概况|project|view|projectID=%s', 'alias' => 'edit');
 $lang->project->menu->order     = '排序|project|order|projectID=%s';
 $lang->project->menu->create    = array('link' => '<span class="icon-add1">&nbsp;</span>新增项目|project|create', 'float' => 'right');
-$lang->project->menu->copy      = array('link' => '<span class="icon-copy">&nbsp;</span>复制项目|project|create|projectID=&copyProjectID=%s', 'float' => 'right');
 $lang->project->menu->all       = array('link' => '<span class="icon-all">&nbsp;</span>所有项目|project|index|locate=false', 'float' => 'right');
 $lang->task->menu               = $lang->project->menu;
 $lang->build->menu              = $lang->project->menu;
diff --git a/module/project/control.php b/module/project/control.php
index 4bddd50e0a..3fa93d1a0f 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -776,6 +776,7 @@ class project extends control
             $projectID = $copyProjectID == '' ? $this->project->create() : $this->project->create($copyProjectID);
             $this->project->updateProducts($projectID);
             if(dao::isError()) die(js::error(dao::getError()));
+
             $this->loadModel('action')->create('project', $projectID, 'opened');
             die(js::locate($this->createLink('project', 'create', "projectID=$projectID"), 'parent'));
         }
@@ -793,6 +794,7 @@ class project extends control
         $this->view->products      = $products ;
         $this->view->whitelist     = $whitelist;
         $this->view->acl           = $acl      ;
+        $this->view->copyProjectID = $copyProjectID;
         $this->display();
     }
 
diff --git a/module/project/lang/en.php b/module/project/lang/en.php
index 1c1991db09..ba8b630b50 100644
--- a/module/project/lang/en.php
+++ b/module/project/lang/en.php
@@ -98,6 +98,7 @@ $lang->project->manageProducts  = 'Link product';
 $lang->project->linkStory       = 'Link story';
 $lang->project->view            = "Info";
 $lang->project->create          = "Add";
+$lang->project->copy            = "Copy a project";
 $lang->project->delete          = "Delete";
 $lang->project->browse          = "Browse";
 $lang->project->edit            = "Edit";
diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php
index c531975f0b..acf92a0b67 100644
--- a/module/project/lang/zh-cn.php
+++ b/module/project/lang/zh-cn.php
@@ -98,6 +98,7 @@ $lang->project->manageProducts  = '关联产品';
 $lang->project->linkStory       = '关联需求';
 $lang->project->view            = "基本信息";
 $lang->project->create          = "添加项目";
+$lang->project->copy            = "复制项目";
 $lang->project->delete          = "删除项目";
 $lang->project->browse          = "浏览项目";
 $lang->project->edit            = "编辑项目";
diff --git a/module/project/view/create.html.php b/module/project/view/create.html.php
index 1960e223ea..c8504b3141 100644
--- a/module/project/view/create.html.php
+++ b/module/project/view/create.html.php
@@ -35,7 +35,16 @@ $(document).ready(function()
 <script>var holders=<?php echo json_encode($lang->project->placeholder);?></script>
 <form method='post' target='hiddenwin' id='dataform'>
   <table align='center' class='table-1 a-left'> 
-    <caption><?php echo $lang->project->create;?></caption>
+    <caption>
+      <div class='f-left'><?php echo $lang->project->create;?></div>
+      <div class='f-right'><?php echo html::checkbox('', $lang->project->copy . '?', '', 'onclick=switchCopyProject(this);');?></div>
+    </caption>
+    <?php if($projects):?>
+    <tr id='copyProjectBox' <?php if($copyProjectID == 0) echo "class='hidden'";?>>
+      <th class='rowhead'><?php echo $lang->project->copy;?></th>
+      <td><?php echo html::select('', $projects, $copyProjectID, "class='select-3' onchange=setCopyProject(this.value)");?></td>
+    </tr>  
+    <?php endif;?>
     <tr>
       <th class='rowhead'><?php echo $lang->project->name;?></th>
       <td><?php echo html::input('name', $name, "class='text-3'");?></td>