From 5f35a32c08d90181eee828eb95e76e926f3da912 Mon Sep 17 00:00:00 2001
From: fujia <yuren_@126.com>
Date: Tue, 3 Aug 2010 02:47:37 +0000
Subject: [PATCH]  * when create a doc for product or project, select product
 or project first.

---
 trunk/module/doc/control.php          |  2 ++
 trunk/module/doc/lang/zh-cn.php       |  2 +-
 trunk/module/doc/lang/zh-tw.php       |  2 +-
 trunk/module/doc/view/browse.html.php |  2 +-
 trunk/module/doc/view/create.html.php | 13 ++++++++++++-
 trunk/module/doc/view/edit.html.php   |  2 +-
 6 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/trunk/module/doc/control.php b/trunk/module/doc/control.php
index a5a968a96a..3375740387 100644
--- a/trunk/module/doc/control.php
+++ b/trunk/module/doc/control.php
@@ -187,6 +187,8 @@ class doc extends control
         $this->view->moduleID         = $moduleID;
         $this->view->productID        = $productID;
         $this->view->projectID        = $projectID;
+        $this->view->products         = $this->loadModel('product')->getPairs();
+        $this->view->projects         = $this->loadModel('project')->getPairs();
         //$this->view->type      = $type;
         //$this->view->digest    = $digest;
         //$this->view->content   = $content;
diff --git a/trunk/module/doc/lang/zh-cn.php b/trunk/module/doc/lang/zh-cn.php
index 4db030a1c1..59ebf24e86 100644
--- a/trunk/module/doc/lang/zh-cn.php
+++ b/trunk/module/doc/lang/zh-cn.php
@@ -25,7 +25,7 @@
 $lang->doc->common         = '文档视图';
 $lang->doc->id             = '文档编号';
 $lang->doc->product        = '所属产品';
-$lang->doc->product        = '所属项目';
+$lang->doc->project        = '所属项目';
 $lang->doc->lib            = '所属文档库';
 $lang->doc->module         = '所属分类';
 $lang->doc->title          = '文档标题';
diff --git a/trunk/module/doc/lang/zh-tw.php b/trunk/module/doc/lang/zh-tw.php
index 367cc64ee3..7b9983c391 100644
--- a/trunk/module/doc/lang/zh-tw.php
+++ b/trunk/module/doc/lang/zh-tw.php
@@ -25,7 +25,7 @@
 $lang->doc->common         = '文檔視圖';
 $lang->doc->id             = '文檔編號';
 $lang->doc->product        = '所屬產品';
-$lang->doc->product        = '所屬項目';
+$lang->doc->project        = '所屬項目';
 $lang->doc->lib            = '所屬文檔庫';
 $lang->doc->module         = '所屬分類';
 $lang->doc->title          = '文檔標題';
diff --git a/trunk/module/doc/view/browse.html.php b/trunk/module/doc/view/browse.html.php
index a317a153e1..b5c9ded681 100644
--- a/trunk/module/doc/view/browse.html.php
+++ b/trunk/module/doc/view/browse.html.php
@@ -57,7 +57,7 @@ $(document).ready(function()
             <th class='w-id'> <?php common::printOrderLink('id',    $orderBy, $vars, $lang->idAB);?></th>
             <th><?php common::printOrderLink('title', $orderBy, $vars, $lang->doc->title);?></th>
             <th class='w-100px'><?php common::printOrderLink('addedBy',   $orderBy, $vars, $lang->doc->addedBy);?></th>
-            <th class='w-100px'><?php common::printOrderLink('addedDate', $orderBy, $vars, $lang->doc->addedDate);?></th>
+            <th class='w-120px'><?php common::printOrderLink('addedDate', $orderBy, $vars, $lang->doc->addedDate);?></th>
             <th class='w-100px {sorter:false}'><?php echo $lang->actions;?></th>
           </tr>
         </thead>
diff --git a/trunk/module/doc/view/create.html.php b/trunk/module/doc/view/create.html.php
index a43dc77f6c..93af0aa375 100644
--- a/trunk/module/doc/view/create.html.php
+++ b/trunk/module/doc/view/create.html.php
@@ -31,9 +31,20 @@ $(document).ready(function()
 });
 </script>
 <div class='yui-d0'>
-  <form method='post' enctype='multipart/form-data' target='hiddenwin2'>
+  <form method='post' enctype='multipart/form-data' target='hiddenwin'>
     <table class='table-1'> 
       <caption><?php echo $lang->doc->create;?></caption>
+      <?php if($libID == 'product'):?>
+      <tr>
+        <th class='rowhead'><?php echo $lang->doc->product;?></th>
+        <td><?php echo html::select('product', $products, $productID, "class='select-3'");?></td>
+      </tr>  
+      <?php elseif($libID == 'project'):?>
+      <tr>
+        <th class='rowhead'><?php echo $lang->doc->project;?></th>
+        <td><?php echo html::select('project', $projects, $projectID, "class='select-3'");?></td>
+      </tr>  
+      <?php endif;?>
       <tr>
         <th class='rowhead'><?php echo $lang->doc->module;?></th>
         <td><?php echo html::select('module', $moduleOptionMenu, $moduleID, "class='select-3'");?></td>
diff --git a/trunk/module/doc/view/edit.html.php b/trunk/module/doc/view/edit.html.php
index 427a0c694f..942e9cfe93 100644
--- a/trunk/module/doc/view/edit.html.php
+++ b/trunk/module/doc/view/edit.html.php
@@ -33,7 +33,7 @@ $(document).ready(function()
 <div class='yui-d0'>
   <form method='post' enctype='multipart/form-data' target='hiddenwin'>
     <table class='table-1'> 
-      <caption><?php echo $lang->doc->create;?></caption>
+      <caption><?php echo $lang->doc->edit;?></caption>
       <tr>
         <th class='rowhead'><?php echo $lang->doc->module;?></th>
         <td><?php echo html::select('module', $moduleOptionMenu, $moduleID, "class='select-3'");?></td>