* adjust code.

This commit is contained in:
wangyidong
2014-11-07 02:14:17 +00:00
parent 6d5ab1e0e0
commit 92e7e933cc
5 changed files with 7 additions and 12 deletions

View File

@@ -606,7 +606,6 @@ class project extends control
/* team member pairs. */
$memberPairs = array();
$memberPairs['0'] = '';
foreach($this->view->teamMembers as $key => $member)
{
$memberPairs[$key] = $member->realname;

View File

@@ -4,9 +4,6 @@
#hideButton{cursor:pointer;}
#hideButton span{padding:2px 10px; background:url(theme/default/images/main/zt-icons.png) -100px -161px;}
#featurebar .f-right .icon-green-task-import {padding:2px 8px; background:url(theme/default/images/main/zt-icons.png) 0px -82px;}
table .dropdown-menu{width:auto; max-width:1000px;}
table .dropdown-menu tr{border:0px;}
table .dropdown-menu tr td{border:0px; border-right: 1px dotted #ddd; border-bottom: 1px dotted #ddd;}
.assign-menu {min-width: 150px; overflow: hidden; max-height: 305px}
.assign-menu.with-search {padding-bottom: 34px;}

View File

@@ -47,9 +47,9 @@
</thead>
<tbody>
<?php
$totalEstimate = 0;
$canBatchEdit = common::hasPriv('story', 'batchEdit');
$canBatchClose = common::hasPriv('story', 'batchClose');
$totalEstimate = 0;
$canBatchEdit = common::hasPriv('story', 'batchEdit');
$canBatchClose = common::hasPriv('story', 'batchClose');
?>
<?php foreach($stories as $key => $story):?>
<?php
@@ -108,7 +108,7 @@
{
if($canBatchEdit or $canBatchClose) echo "<div class='btn-group'>" . html::selectButton() . '</div>';
echo "<div class='btn-group'>";
echo "<div class='btn-group dropup'>";
if($canBatchEdit)
{
$actionLink = $this->createLink('story', 'batchEdit', "productID=0&projectID=$project->id");

View File

@@ -39,7 +39,7 @@
</div>
<div class='main'>
<form method='post' id='projectTaskForm'>
<table class='table table-condensed table-hover table-striped tablesorter table-fixed' id='taskList' data-checkable='true' data-fixed-left-width='450' data-fixed-right-width='150'>
<table class='table table-condensed table-hover table-striped tablesorter table-fixed' id='taskList'>
<?php $vars = "projectID=$project->id&status=$status&parma=$param&orderBy=%s&recTotal=$recTotal&recPerPage=$recPerPage"; ?>
<thead>
<tr>
@@ -70,7 +70,7 @@
<tbody>
<?php foreach($tasks as $task):?>
<?php $class = $task->assignedTo == $app->user->account ? 'style=color:red' : ''; ?>
<tr class='text-center' data-id='<?php echo $task->id?>'>
<tr class='text-center'>
<td>
<input type='checkbox' name='taskIDList[]' value='<?php echo $task->id;?>'/>
<?php if(!common::printLink('task', 'view', "task=$task->id", sprintf('%03d', $task->id))) printf('%03d', $task->id);?>
@@ -162,7 +162,6 @@
if($canBatchAssignTo)
{
$withSearch = count($memberPairs) > 4;
unset($memberPairs['0']);
$actionLink = $this->createLink('task', 'batchAssignTo', "projectID=$projectID");
echo html::select('assignedTo', $memberPairs, '', 'class="hidden"');
echo "<li class='dropdown-submenu'>";

View File

@@ -402,7 +402,7 @@ class taskModel extends model
->setDefault('lastEditedBy', $this->app->user->account)
->setDefault('lastEditedDate', $now)
->remove('comment')
->add('assignedDate', $now)
->setDefault('assignedDate', $now)
->get();
$this->dao->update(TABLE_TASK)