From 00a4aa1d6de7eeaf46cd38151d59468fcfb6522d Mon Sep 17 00:00:00 2001
From: wangchunsheng <chunsheng@cnezsoft.com>
Date: Thu, 25 Mar 2010 07:10:54 +0000
Subject: [PATCH]  * adjust the ui.

---
 module/bug/config.php           | 5 +++--
 module/bug/model.php            | 2 +-
 module/bug/view/browse.html.php | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/module/bug/config.php b/module/bug/config.php
index fb58394a95..b885004ba7 100644
--- a/module/bug/config.php
+++ b/module/bug/config.php
@@ -52,5 +52,6 @@ $config->bug->search['params']['closedDate']    = array('operator' => '>=',
 $config->bug->search['params']['lastEditedDate']= array('operator' => '>=',      'control' => 'input',  'values' => '');
 $config->bug->search['params']['assignedDate']  = array('operator' => '>=',      'control' => 'input',  'values' => '');
 
-$config->bug->create->requiredFields = 'title,openedBuild';
-$config->bug->edit->requiredFields   = $config->bug->create->requiredFields;
+$config->bug->create->requiredFields  = 'title,openedBuild';
+$config->bug->edit->requiredFields    = $config->bug->create->requiredFields;
+$config->bug->resolve->requiredFields = 'resolution';
diff --git a/module/bug/model.php b/module/bug/model.php
index da1f7bf8c4..e0f7a2b541 100644
--- a/module/bug/model.php
+++ b/module/bug/model.php
@@ -154,7 +154,7 @@ class bugModel extends model
 
         $this->dao->update(TABLE_BUG)->data($bug)
             ->autoCheck()
-            ->check('resolution', 'notempty')
+            ->batchCheck($this->config->bug->resolve->requiredFields, 'notempty')
             ->checkIF($bug->resolution == 'duplicate', 'duplicateBug', 'notempty')
             ->where('id')->eq((int)$bugID)
             ->exec();
diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php
index d361a75819..8048b35c17 100644
--- a/module/bug/view/browse.html.php
+++ b/module/bug/view/browse.html.php
@@ -101,7 +101,7 @@ function browseBySearch(active)
         <?php foreach($bugs as $bug):?>
         <tr class='a-center'>
           <td><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), sprintf('%03d', $bug->id));?></td>
-          <td><?php echo $bug->severity?></td>
+          <td><?php echo $lang->bug->severityList[$bug->severity]?></td>
           <td class='a-left nobr'><?php echo $bug->title;?></td>
           <td><?php echo $users[$bug->openedBy];?></td>
           <td <?php if($bug->assignedTo == $this->app->user->account) echo 'style=color:red';?>><?php echo $users[$bug->assignedTo];?></td>