* @package bug
* @version $Id$
diff --git a/module/search/model.php b/module/search/model.php
index 2aa5ac969f..e77b97ecf0 100644
--- a/module/search/model.php
+++ b/module/search/model.php
@@ -162,12 +162,6 @@ class searchModel extends model
->orderBy('id_asc')
->fetchPairs();
if(!$queries) return array('' => $this->lang->search->myQuery);
- $i = ord('A');
- foreach($queries as $key => $value)
- {
- $queries[$key] = chr($i) . ': ' . $value;
- $i ++;
- }
$queries = array('' => $this->lang->search->myQuery) + $queries;
return $queries;
}
diff --git a/module/story/control.php b/module/story/control.php
index 467419d2bd..37f06ea3cf 100644
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -110,12 +110,11 @@ class story extends control
}
$this->commonAction($storyID);
- $story = $this->story->getById($storyID);
/* 赋值到模板。*/
$this->view->header->title = $this->view->product->name . $this->lang->colon . $this->lang->story->edit . $this->lang->colon . $this->view->story->title;
$this->view->position[] = $this->lang->story->edit;
- $this->view->users = $this->user->setDeleted($this->user->getPairs('nodeleted'), $story->assignedTo);
+ $this->view->users = $this->user->setDeleted($this->user->getPairs('nodeleted'), $this->view->story->assignedTo);
$this->display();
}
@@ -319,8 +318,7 @@ class story extends control
public function tasks($storyID, $projectID = 0)
{
$this->loadModel('task');
- $tasks = $this->task->getStoryTaskPairs($storyID, $projectID);
- $this->view->tasks = $tasks;
+ $this->view->tasks = $this->task->getStoryTaskPairs($storyID, $projectID);
$this->display();
exit;
}
diff --git a/module/task/control.php b/module/task/control.php
index be6e9cfa7f..07ab039274 100644
--- a/module/task/control.php
+++ b/module/task/control.php
@@ -122,15 +122,11 @@ class task extends control
die(js::locate($this->createLink('task', 'view', "taskID=$taskID"), 'parent'));
}
- $task = $this->task->getByID($taskID);
- $project = $this->project->getById($task->project);
- $members = $this->project->getTeamMemberPairs($project->id ,'nodeleted');
-
/* 赋值。*/
$this->view->header->title = $this->lang->task->edit;
$this->view->position[] = $this->lang->task->edit;
$this->view->stories = $this->story->getProjectStoryPairs($this->view->project->id);
- $this->view->members = $this->loadModel('user')->setDeleted($members, $task->owner);
+ $this->view->members = $this->loadModel('user')->setDeleted($this->view->members, $this->view->task->owner);
$this->display();
}
diff --git a/module/task/view/view.html.php b/module/task/view/view.html.php
index ba00cfc2d9..3549d60519 100644
--- a/module/task/view/view.html.php
+++ b/module/task/view/view.html.php
@@ -112,7 +112,7 @@
| show($lang->task->priList, $task->pri);?> |
- | task->mailto;?> |
+ task->mailto;?> |
mailto)); foreach($mailto as $account) echo ' ' . $users[$account]; ?> |
diff --git a/module/user/control.php b/module/user/control.php
index 7096633452..a9528b455c 100644
--- a/module/user/control.php
+++ b/module/user/control.php
@@ -296,7 +296,7 @@ class user extends control
}
/* 用户提交了登陆信息,则检查用户的身份。*/
- if(!empty($_POST) or !empty($_GET))
+ if(!empty($_POST) or (isset($_GET['account']) and isset($_GET['password'])))
{
$account = '';
$password = '';