Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

+ re tag it.

Browse Source
This commit is contained in:
wangchunsheng
2010-07-06 09:00:44 +00:00
parent 916f801e6b df0ccf11f5
commit 7a841b580e
8 changed files with 6 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
db/update1.0.1.sql
View File

@@ -10,7 +10,6 @@ CREATE TABLE IF NOT EXISTS `zt_userQuery` (
`title` varchar(90) NOT NULL,
`form` text NOT NULL,
`sql` text NOT NULL,
`mode` varchar(10) NOT NULL,
PRIMARY KEY (`id`),
KEY `company` (`company`),
KEY `account` (`account`),

1
db/zentao.sql
View File

@@ -548,7 +548,6 @@ CREATE TABLE IF NOT EXISTS `zt_userQuery` (
`title` varchar(90) NOT NULL,
`form` text NOT NULL,
`sql` text NOT NULL,
`mode` varchar(10) NOT NULL,
PRIMARY KEY (`id`),
KEY `company` (`company`),
KEY `account` (`account`),

2
module/bug/view/report.html.php
View File

@@ -15,7 +15,7 @@
* You should have received a copy of the GNU Lesser General Public License
* along with ZenTaoMS. If not, see <http://www.gnu.org/licenses/>.
*
* @copyright Copyright 2009-2010 ?????????????????????(www.cnezsoft.com)
* @copyright Copyright 2009-2010 青岛易软天创网络科技有限公司(www.cnezsoft.com)
* @author Chunsheng Wang <chunsheng@cnezsoft.com>
* @package bug
* @version $Id$

6
module/search/model.php
View File

@@ -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;
}

6
module/story/control.php
View File

@@ -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;
}

6
module/task/control.php
View File

@@ -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();
}

2
module/task/view/view.html.php
View File

@@ -112,7 +112,7 @@
<td><?php $lang->show($lang->task->priList, $task->pri);?></td>
</tr>
<tr>
<td class='rowhead w-p20'><?php echo $lang->task->mailto;?></td>
<td class='rowhead'><?php echo $lang->task->mailto;?></td>
<td><?php $mailto = explode(',', str_replace(' ', '', $task->mailto)); foreach($mailto as $account) echo ' ' . $users[$account]; ?></td>
</tr>
</table>

2
module/user/control.php
View File

@@ -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 = '';