From 1b0020ce2df3b56fa5d49e1d32841c1849b44d73 Mon Sep 17 00:00:00 2001
From: "shiyangyangwork@yahoo.cn" <shiyangyang@cnezsoft.com>
Date: Tue, 10 Jan 2012 01:27:33 +0000
Subject: [PATCH]  * adjust code for manageMembers in project, if the same
 account has been selected unset it.

---
 module/project/model.php           |  1 +
 module/story/control.php           | 10 +++-------
 module/story/view/view.html.php    |  2 +-
 module/testcase/control.php        | 13 ++++---------
 module/testcase/view/view.html.php |  2 +-
 5 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/module/project/model.php b/module/project/model.php
index 7bc806911b..283908ef14 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -791,6 +791,7 @@ class projectModel extends model
     {
         extract($_POST);
 
+        $accounts = array_unique($accounts);
         foreach($accounts as $key => $account)
         {
             if(empty($account)) continue;
diff --git a/module/story/control.php b/module/story/control.php
index cf982d5e03..a49a078eba 100644
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -236,17 +236,13 @@ class story extends control
      * @access public
      * @return void
      */
-    public function edit($storyID, $comment = false)
+    public function edit($storyID)
     {
         $this->loadModel('action');
         if(!empty($_POST))
         {
-            $changes = array();
-            if($comment == false)
-            {
-                $changes = $this->story->update($storyID);
-                if(dao::isError()) die(js::error(dao::getError()));
-            }
+            $changes = $this->story->update($storyID);
+            if(dao::isError()) die(js::error(dao::getError()));
             if($this->post->comment != '' or !empty($changes))
             {
                 $action   = !empty($changes) ? 'Edited' : 'Commented';
diff --git a/module/story/view/view.html.php b/module/story/view/view.html.php
index 8f7ff3d003..a751b4f8a0 100644
--- a/module/story/view/view.html.php
+++ b/module/story/view/view.html.php
@@ -65,7 +65,7 @@
       <div id='comment' class='hidden'>
         <fieldset>
           <legend><?php echo $lang->comment;?></legend>
-          <form method='post' action='<?php echo inlink('edit', "storyID=$story->id&comment=true")?>'>
+          <form method='post' action='<?php echo inlink('edit', "storyID=$story->id")?>'>
             <table align='center' class='table-1'>
             <tr><td><?php echo html::textarea('comment', '',"rows='5' class='w-p100'");?></td></tr>
             <tr><td><?php echo html::submitButton() . html::resetButton();?></td></tr>
diff --git a/module/testcase/control.php b/module/testcase/control.php
index 870bad72d2..b03f074c90 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -340,20 +340,15 @@ class testcase extends control
      * @access public
      * @return void
      */
-    public function edit($caseID, $comment = false)
+    public function edit($caseID)
     {
         $this->loadModel('story');
 
         if(!empty($_POST))
         {
-            $changes = array();
-            $files   = array();
-            if($comment == false)
-            {
-                $changes = $this->testcase->update($caseID);
-                if(dao::isError()) die(js::error(dao::getError()));
-                $files = $this->loadModel('file')->saveUpload('testcase', $caseID);
-            }
+            $changes = $this->testcase->update($caseID);
+            if(dao::isError()) die(js::error(dao::getError()));
+            $files = $this->loadModel('file')->saveUpload('testcase', $caseID);
             if($this->post->comment != '' or !empty($changes) or !empty($files))
             {
                 $this->loadModel('action');
diff --git a/module/testcase/view/view.html.php b/module/testcase/view/view.html.php
index 0319c97b9b..82ef21cfa2 100644
--- a/module/testcase/view/view.html.php
+++ b/module/testcase/view/view.html.php
@@ -72,7 +72,7 @@
       <div id='comment' class='hidden'>
         <fieldset>
           <legend><?php echo $lang->comment;?></legend>
-          <form method='post' action='<?php echo inlink('edit', "caseID=$case->id&comment=true")?>'>
+          <form method='post' action='<?php echo inlink('edit', "caseID=$case->id")?>'>
             <table align='center' class='table-1'>
             <tr><td><?php echo html::textarea('comment', '',"rows='5' class='w-p100'");?></td></tr>
             <tr><td><?php echo html::submitButton() . html::resetButton();?></td></tr>