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

* adjust code for add files to story from bug and search for dynamic in company.

Browse Source
This commit is contained in:
shiyangyangwork@yahoo.cn
2011-12-28 06:23:44 +00:00
parent b9722ff866
commit e23be60bb7
6 changed files with 107 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/action/lang/en.php
+33 -32
View File
@@ -147,35 +147,36 @@ $lang->action->label->user = 'user';
$lang->action->label->space = ' ';
/* Display action for search. */
$lang->action->search->label->created = $lang->action->label->created;
$lang->action->search->label->opened = $lang->action->label->opened;
$lang->action->search->label->changed = $lang->action->label->changed;
$lang->action->search->label->edited = $lang->action->label->edited;
$lang->action->search->label->assigned = $lang->action->label->assigned;
$lang->action->search->label->closed = $lang->action->label->closed;
$lang->action->search->label->deleted = $lang->action->label->deleted;
$lang->action->search->label->deletedfile = $lang->action->label->deletedfile;
$lang->action->search->label->editfile = $lang->action->label->editfile;
$lang->action->search->label->erased = $lang->action->label->erased;
$lang->action->search->label->undeleted = $lang->action->label->undeleted;
$lang->action->search->label->commented = $lang->action->label->commented;
$lang->action->search->label->activated = $lang->action->label->activated;
$lang->action->search->label->resolved = $lang->action->label->resolved;
$lang->action->search->label->reviewed = $lang->action->label->reviewed;
$lang->action->search->label->moved = $lang->action->label->moved;
$lang->action->search->label->confirmed = $lang->action->label->confirmed;
$lang->action->search->label->bugconfirmed = $lang->action->label->bugconfirmed;
$lang->action->search->label->tostory = $lang->action->label->tostory;
$lang->action->search->label->frombug = $lang->action->label->frombug;
$lang->action->search->label->totask = $lang->action->label->totask;
$lang->action->search->label->svncommited = $lang->action->label->svncommited;
$lang->action->search->label->linked2plan = $lang->action->label->linked2plan;
$lang->action->search->label->unlinkedfromplan = $lang->action->label->unlinkedfromplan;
$lang->action->search->label->linked2project = $lang->action->label->linked2project;
$lang->action->search->label->unlinkedfromproject = $lang->action->label->unlinkedfromproject;
$lang->action->search->label->marked = $lang->action->label->marked;
$lang->action->search->label->started = $lang->action->label->started;
$lang->action->search->label->canceled = $lang->action->label->canceled;
$lang->action->search->label->finished = $lang->action->label->finished;
$lang->action->search->label->login = $lang->action->label->login;
$lang->action->search->label->logout = $lang->action->label->logout;
$lang->action->search->label[''] = '';
$lang->action->search->label['created'] = $lang->action->label->created;
$lang->action->search->label['opened'] = $lang->action->label->opened;
$lang->action->search->label['changed'] = $lang->action->label->changed;
$lang->action->search->label['edited'] = $lang->action->label->edited;
$lang->action->search->label['assigned'] = $lang->action->label->assigned;
$lang->action->search->label['closed'] = $lang->action->label->closed;
$lang->action->search->label['deleted'] = $lang->action->label->deleted;
$lang->action->search->label['deletedfile'] = $lang->action->label->deletedfile;
$lang->action->search->label['editfile'] = $lang->action->label->editfile;
$lang->action->search->label['erased'] = $lang->action->label->erased;
$lang->action->search->label['undeleted'] = $lang->action->label->undeleted;
$lang->action->search->label['commented'] = $lang->action->label->commented;
$lang->action->search->label['activated'] = $lang->action->label->activated;
$lang->action->search->label['resolved'] = $lang->action->label->resolved;
$lang->action->search->label['reviewed'] = $lang->action->label->reviewed;
$lang->action->search->label['moved'] = $lang->action->label->moved;
$lang->action->search->label['confirmed'] = $lang->action->label->confirmed;
$lang->action->search->label['bugconfirmed'] = $lang->action->label->bugconfirmed;
$lang->action->search->label['tostory'] = $lang->action->label->tostory;
$lang->action->search->label['frombug'] = $lang->action->label->frombug;
$lang->action->search->label['totask'] = $lang->action->label->totask;
$lang->action->search->label['svncommited'] = $lang->action->label->svncommited;
$lang->action->search->label['linked2plan'] = $lang->action->label->linked2plan;
$lang->action->search->label['unlinkedfromplan'] = $lang->action->label->unlinkedfromplan;
$lang->action->search->label['linked2project'] = $lang->action->label->linked2project;
$lang->action->search->label['unlinkedfromproject'] = $lang->action->label->unlinkedfromproject;
$lang->action->search->label['marked'] = $lang->action->label->marked;
$lang->action->search->label['started'] = $lang->action->label->started;
$lang->action->search->label['canceled'] = $lang->action->label->canceled;
$lang->action->search->label['finished'] = $lang->action->label->finished;
$lang->action->search->label['login'] = $lang->action->label->login;
$lang->action->search->label['logout'] = $lang->action->label->logout;
module/action/lang/zh-cn.php
+33 -32
View File
@@ -147,35 +147,36 @@ $lang->action->label->user = '用户';
$lang->action->label->space = '　';
/* 用来在动态显示中显示动作 */
$lang->action->search->label->created = $lang->action->label->created;
$lang->action->search->label->opened = $lang->action->label->opened;
$lang->action->search->label->changed = $lang->action->label->changed;
$lang->action->search->label->edited = $lang->action->label->edited;
$lang->action->search->label->assigned = $lang->action->label->assigned;
$lang->action->search->label->closed = $lang->action->label->closed;
$lang->action->search->label->deleted = $lang->action->label->deleted;
$lang->action->search->label->deletedfile = $lang->action->label->deletedfile;
$lang->action->search->label->editfile = $lang->action->label->editfile;
$lang->action->search->label->erased = $lang->action->label->erased;
$lang->action->search->label->undeleted = $lang->action->label->undeleted;
$lang->action->search->label->commented = $lang->action->label->commented;
$lang->action->search->label->activated = $lang->action->label->activated;
$lang->action->search->label->resolved = $lang->action->label->resolved;
$lang->action->search->label->reviewed = $lang->action->label->reviewed;
$lang->action->search->label->moved = $lang->action->label->moved;
$lang->action->search->label->confirmed = $lang->action->label->confirmed;
$lang->action->search->label->bugconfirmed = $lang->action->label->bugconfirmed;
$lang->action->search->label->tostory = $lang->action->label->tostory;
$lang->action->search->label->frombug = $lang->action->label->frombug;
$lang->action->search->label->totask = $lang->action->label->totask;
$lang->action->search->label->svncommited = $lang->action->label->svncommited;
$lang->action->search->label->linked2plan = $lang->action->label->linked2plan;
$lang->action->search->label->unlinkedfromplan = $lang->action->label->unlinkedfromplan;
$lang->action->search->label->linked2project = $lang->action->label->linked2project;
$lang->action->search->label->unlinkedfromproject = $lang->action->label->unlinkedfromproject;
$lang->action->search->label->marked = $lang->action->label->marked;
$lang->action->search->label->started = $lang->action->label->started;
$lang->action->search->label->canceled = $lang->action->label->canceled;
$lang->action->search->label->finished = $lang->action->label->finished;
$lang->action->search->label->login = $lang->action->label->login;
$lang->action->search->label->logout = $lang->action->label->logout;
$lang->action->search->label[''] = '';
$lang->action->search->label['created'] = $lang->action->label->created;
$lang->action->search->label['opened'] = $lang->action->label->opened;
$lang->action->search->label['changed'] = $lang->action->label->changed;
$lang->action->search->label['edited'] = $lang->action->label->edited;
$lang->action->search->label['assigned'] = $lang->action->label->assigned;
$lang->action->search->label['closed'] = $lang->action->label->closed;
$lang->action->search->label['deleted'] = $lang->action->label->deleted;
$lang->action->search->label['deletedfile'] = $lang->action->label->deletedfile;
$lang->action->search->label['editfile'] = $lang->action->label->editfile;
$lang->action->search->label['erased'] = $lang->action->label->erased;
$lang->action->search->label['undeleted'] = $lang->action->label->undeleted;
$lang->action->search->label['commented'] = $lang->action->label->commented;
$lang->action->search->label['activated'] = $lang->action->label->activated;
$lang->action->search->label['resolved'] = $lang->action->label->resolved;
$lang->action->search->label['reviewed'] = $lang->action->label->reviewed;
$lang->action->search->label['moved'] = $lang->action->label->moved;
$lang->action->search->label['confirmed'] = $lang->action->label->confirmed;
$lang->action->search->label['bugconfirmed'] = $lang->action->label->bugconfirmed;
$lang->action->search->label['tostory'] = $lang->action->label->tostory;
$lang->action->search->label['frombug'] = $lang->action->label->frombug;
$lang->action->search->label['totask'] = $lang->action->label->totask;
$lang->action->search->label['svncommited'] = $lang->action->label->svncommited;
$lang->action->search->label['linked2plan'] = $lang->action->label->linked2plan;
$lang->action->search->label['unlinkedfromplan'] = $lang->action->label->unlinkedfromplan;
$lang->action->search->label['linked2project'] = $lang->action->label->linked2project;
$lang->action->search->label['unlinkedfromproject'] = $lang->action->label->unlinkedfromproject;
$lang->action->search->label['marked'] = $lang->action->label->marked;
$lang->action->search->label['started'] = $lang->action->label->started;
$lang->action->search->label['canceled'] = $lang->action->label->canceled;
$lang->action->search->label['finished'] = $lang->action->label->finished;
$lang->action->search->label['login'] = $lang->action->label->login;
$lang->action->search->label['logout'] = $lang->action->label->logout;
module/company/config.php
-2
View File
@@ -11,7 +11,6 @@ $config->company->dynamic->search['fields']['objectID'] = $lang->action->objec
$config->company->dynamic->search['fields']['project'] = $lang->action->project;
$config->company->dynamic->search['fields']['objectType'] = $lang->action->objectType;
$config->company->dynamic->search['fields']['date'] = $lang->action->date;
$config->company->dynamic->search['fields']['actionID'] = $lang->action->actionID;
$config->company->dynamic->search['fields']['action'] = $lang->action->action;
$config->company->dynamic->search['params']['product'] = array('operator' => '=', 'control' => 'select', 'values' => '');
@@ -20,5 +19,4 @@ $config->company->dynamic->search['params']['objectID'] = array('operator' =>
$config->company->dynamic->search['params']['project'] = array('operator' => '=', 'control' => 'select', 'values' => '');
$config->company->dynamic->search['params']['objectType'] = array('operator' => '=', 'control' => 'select', 'values' => $lang->action->search->objectTypeList);
$config->company->dynamic->search['params']['date'] = array('operator' => '>=', 'control' => 'input', 'values' => '');
$config->company->dynamic->search['params']['actionID'] = array('operator' => '>=', 'control' => 'input', 'values' => '');
$config->company->dynamic->search['params']['action'] = array('operator' => '=', 'control' => 'select', 'values' => $lang->action->search->label);
module/company/control.php
+15 -15
View File
@@ -140,7 +140,7 @@ class company extends control
/**
* Company dynamic.
*
* @param string $type
* @param string $browseType
* @param string $orderBy
* @param int $recTotal
* @param int $recPerPage
@@ -148,7 +148,7 @@ class company extends control
* @access public
* @return void
*/
public function dynamic($type = 'today', $param = '', $orderBy = 'date_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
public function dynamic($browseType = 'today', $param = '', $orderBy = 'date_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
{
$this->app->loadLang('user');
$this->app->loadLang('project');
@@ -174,11 +174,11 @@ class company extends control
$this->view->pager = $pager;
/* Set the user and type. */
$account = $type == 'account' ? $param : 'all';
$product = $type == 'product' ? $param : 'all';
$project = $type == 'project' ? $param : 'all';
$period = ($type == 'account' or $type == 'product' or $type == 'project') ? 'all' : $type;
$queryID = ($type == 'bysearch') ? (int)$param : 0;
$account = $browseType == 'account' ? $param : 'all';
$product = $browseType == 'product' ? $param : 'all';
$project = $browseType == 'project' ? $param : 'all';
$period = ($browseType == 'account' or $browseType == 'product' or $browseType == 'project') ? 'all' : $browseType;
$queryID = ($browseType == 'bysearch') ? (int)$param : 0;
/* Get products' list.*/
$products = $this->loadModel('product')->getPairs();
@@ -200,7 +200,7 @@ class company extends control
$this->view->position[] = $this->lang->company->dynamic;
/* Get actions. */
if($type != 'bysearch')
if($browseType != 'bysearch')
{
$actions = $this->action->getDynamic($account, $period, $orderBy, $pager, $product, $project);
}
@@ -217,7 +217,7 @@ class company extends control
ksort($products);
$projects['all'] = $this->lang->project->allProject;
$products['all'] = $this->lang->product->allProduct;
$this->config->company->dynamic->search['actionURL'] = $this->createLink('company', 'dynamic', "type=bysearch&param=myQueryID");
$this->config->company->dynamic->search['actionURL'] = $this->createLink('company', 'dynamic', "browseType=bysearch&param=myQueryID");
$this->config->company->dynamic->search['queryID'] = $queryID;
$this->config->company->dynamic->search['params']['project']['values'] = $projects;
$this->config->company->dynamic->search['params']['product']['values'] = $products;
@@ -225,12 +225,12 @@ class company extends control
$this->view->searchForm = $this->fetch('search', 'buildForm', $this->config->company->dynamic->search);
/* Assign. */
$this->view->type = $type;
$this->view->account = $account;
$this->view->product = $product;
$this->view->project = $project;
$this->view->queryID = $queryID;
$this->view->actions = $actions;
$this->view->browseType = $browseType;
$this->view->account = $account;
$this->view->product = $product;
$this->view->project = $project;
$this->view->queryID = $queryID;
$this->view->actions = $actions;
$this->display();
}
}
module/company/view/dynamic.html.php
+10 -10
View File
@@ -13,18 +13,18 @@
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/tablesorter.html.php';?>
<script language='Javascript'>
var browseType = '<?php echo $type;?>';
var browseType = '<?php echo $browseType;?>';
</script>
<div id='featurebar'>
<?php
echo '<span id="today">' . html::a(inlink('dynamic', "type=today"), $lang->action->dynamic->today) . '</span>';
echo '<span id="yesterday">' . html::a(inlink('dynamic', "type=yesterday"), $lang->action->dynamic->yesterday) . '</span>';
echo '<span id="twodaysago">' . html::a(inlink('dynamic', "type=twodaysago"), $lang->action->dynamic->twoDaysAgo) . '</span>';
echo '<span id="thisweek">' . html::a(inlink('dynamic', "type=thisweek"), $lang->action->dynamic->thisWeek) . '</span>';
echo '<span id="lastweek">' . html::a(inlink('dynamic', "type=lastweek"), $lang->action->dynamic->lastWeek) . '</span>';
echo '<span id="thismonth">' . html::a(inlink('dynamic', "type=thismonth"), $lang->action->dynamic->thisMonth) . '</span>';
echo '<span id="lastmonth">' . html::a(inlink('dynamic', "type=lastmonth"), $lang->action->dynamic->lastMonth) . '</span>';
echo '<span id="all">' . html::a(inlink('dynamic', "type=all"), $lang->action->dynamic->all) . '</span>';
echo '<span id="today">' . html::a(inlink('dynamic', "browseType=today"), $lang->action->dynamic->today) . '</span>';
echo '<span id="yesterday">' . html::a(inlink('dynamic', "browseType=yesterday"), $lang->action->dynamic->yesterday) . '</span>';
echo '<span id="twodaysago">' . html::a(inlink('dynamic', "browseType=twodaysago"), $lang->action->dynamic->twoDaysAgo) . '</span>';
echo '<span id="thisweek">' . html::a(inlink('dynamic', "browseType=thisweek"), $lang->action->dynamic->thisWeek) . '</span>';
echo '<span id="lastweek">' . html::a(inlink('dynamic', "browseType=lastweek"), $lang->action->dynamic->lastWeek) . '</span>';
echo '<span id="thismonth">' . html::a(inlink('dynamic', "browseType=thismonth"), $lang->action->dynamic->thisMonth) . '</span>';
echo '<span id="lastmonth">' . html::a(inlink('dynamic', "browseType=lastmonth"), $lang->action->dynamic->lastMonth) . '</span>';
echo '<span id="all">' . html::a(inlink('dynamic', "browseType=all"), $lang->action->dynamic->all) . '</span>';
echo "<span id='account'>" . html::select('account', $users, $account, 'onchange=changeUser(this.value)') . '</span>';
echo "<span id='product'>" . html::select('product', $products, $product, 'onchange=changeProduct(this.value)') . '</span>';
echo "<span id='project'>" . html::select('project', $projects, $project, 'onchange=changeProject(this.value)') . '</span>';
@@ -58,5 +58,5 @@ var browseType = '<?php echo $type;?>';
</tbody>
<tfoot><tr><td colspan='6'><?php $pager->show();?></td></tr></tfoot>
</table>
<script>$('#<?php echo $type;?>').addClass('active')</script>
<script>$('#<?php echo $browseType;?>').addClass('active')</script>
<?php include '../../common/view/footer.html.php';?>
module/story/model.php
+16
View File
@@ -157,6 +157,22 @@ class storyModel extends model
$this->loadModel('action')->create('bug', $bugID, 'ToStory', '', $storyID);
$this->action->create('bug', $bugID, 'Closed');
/* add files to story from bug. */
$files = $this->dao->select('*')->from(TABLE_FILE)
->where('objectType')->eq('bug')
->andWhere('objectID')->eq($bugID)
->fetchAll();
if(!empty($files))
{
foreach($files as $file)
{
$file->objectType = 'story';
$file->objectID = $storyID;
unset($file->id);
$this->dao->insert(TABLE_FILE)->data($file)->exec();
}
}
}
return $storyID;
}