diff --git a/module/project/model.php b/module/project/model.php index 24f780dc60..881da5981d 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -1124,7 +1124,7 @@ class projectModel extends model */ public function getTeamMembers($projectID) { - return $this->dao->select('t1.*, t1.hours * t1.days AS totalHours, t2.realname')->from(TABLE_TEAM)->alias('t1') + return $this->dao->select("t1.*, t1.hours * t1.days AS totalHours, if(t2.deleted='0', t2.realname, t1.account) as realname")->from(TABLE_TEAM)->alias('t1') ->leftJoin(TABLE_USER)->alias('t2')->on('t1.account = t2.account') ->where('t1.project')->eq((int)$projectID) ->fetchAll('account'); diff --git a/module/project/view/team.html.php b/module/project/view/team.html.php index 0d25c74060..af4e4f5614 100644 --- a/module/project/view/team.html.php +++ b/module/project/view/team.html.php @@ -1,74 +1,74 @@ - - * @package project - * @version $Id: team.html.php 4143 2013-01-18 07:01:06Z wyd621@gmail.com $ - * @link http://www.zentao.net - */ -?> - - -project->confirmUnlinkMember)?> -
-
-
- icons['team']);?> project->team;?> -
-
- id", $lang->project->manageMembers, '', "class='btn btn-primary'");?> -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
team->account;?>team->role;?>team->join;?>team->days;?>team->hours;?>team->totalHours;?>actions;?>
- account", $member->realname)) print $member->realname; - $memberHours = $member->days * $member->hours; - $totalHours += $memberHours; - ?> - role;?>join, 2);?>days;?>hours;?> - createLink('project', 'unlinkMember', "projectID=$project->id&account=$member->account&confirm=yes"); - echo html::a("javascript:ajaxDelete(\"$unlinkURL\",\"memberList\",confirmUnlinkMember)", '', '', "class='btn-icon' title='{$lang->project->unlinkMember}'"); - } - ?> -
-
team->totalHours . ':' . "$totalHours";?>
-
-
- + * @author Chunsheng Wang + * @package project + * @version $Id: team.html.php 4143 2013-01-18 07:01:06Z wyd621@gmail.com $ + * @link http://www.zentao.net + */ +?> + + +project->confirmUnlinkMember)?> +
+
+
+ icons['team']);?> project->team;?> +
+
+ id", $lang->project->manageMembers, '', "class='btn btn-primary'");?> +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
team->account;?>team->role;?>team->join;?>team->days;?>team->hours;?>team->totalHours;?>actions;?>
+ account", $member->realname)) print $member->realname; + $memberHours = $member->days * $member->hours; + $totalHours += $memberHours; + ?> + role;?>join, 2);?>days;?>hours;?> + createLink('project', 'unlinkMember', "projectID=$project->id&account=$member->account&confirm=yes"); + echo html::a("javascript:ajaxDelete(\"$unlinkURL\",\"memberList\",confirmUnlinkMember)", '', '', "class='btn-icon' title='{$lang->project->unlinkMember}'"); + } + ?> +
+
team->totalHours . ':' . "$totalHours";?>
+
+
+