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

* adjust code for task #561.

Browse Source
This commit is contained in:
shiyangyangwork@yahoo.cn
2011-10-10 03:20:33 +00:00
parent b259266519
commit 45bf6919c1
9 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
db/update2.2.sql
+1 -1
View File
@@ -1 +1 @@
ALTER TABLE `zt_story` ADD `origin` VARCHAR( 20 ) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL AFTER `plan` ;
ALTER TABLE `zt_story` ADD `source` VARCHAR( 20 ) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL AFTER `plan` ;
module/mail/control.php
+1 -1
View File
@@ -88,7 +88,7 @@ EOT;
$configPath = $this->app->getModuleExtPath('mail', 'config');
if(is_writable($configPath))
{
if(file_put_contents($configPath . 'zzzmail.php', $config))
if(file_put_contents($configPath . 'zzzemail.php', $config))
{
/* Send test mail */
$this->mail->send($this->app->user->account, $this->lang->mail->subject, $this->lang->mail->content,"");
module/product/config.php
+2 -2
View File
@@ -7,7 +7,7 @@ $config->product->search['fields']['id'] = $lang->story->id;
$config->product->search['fields']['keywords'] = $lang->story->keywords;
$config->product->search['fields']['pri'] = $lang->story->pri;
$config->product->search['fields']['plan'] = $lang->story->plan;
$config->product->search['fields']['origin'] = $lang->story->origin;
$config->product->search['fields']['source'] = $lang->story->source;
$config->product->search['fields']['assignedTo'] = $lang->story->assignedTo;
$config->product->search['fields']['product'] = $lang->story->product;
$config->product->search['fields']['openedBy'] = $lang->story->openedBy;
@@ -22,7 +22,7 @@ $config->product->search['params']['title'] = array('operator' => 'includ
$config->product->search['params']['keywords'] = array('operator' => 'include', 'control' => 'input', 'values' => '');
$config->product->search['params']['pri'] = array('operator' => '=', 'control' => 'select', 'values' => $lang->story->priList);
$config->product->search['params']['plan'] = array('operator' => '=', 'control' => 'select', 'values' => '');
$config->product->search['params']['origin'] = array('operator' => '=', 'control' => 'select', 'values' => $lang->story->originList);
$config->product->search['params']['source'] = array('operator' => '=', 'control' => 'select', 'values' => $lang->story->sourceList);
$config->product->search['params']['product'] = array('operator' => '=', 'control' => 'select', 'values' => '');
$config->product->search['params']['assignedTo'] = array('operator' => '=', 'control' => 'select', 'values' => 'users');
$config->product->search['params']['resolvedBy'] = array('operator' => '=', 'control' => 'select', 'values' => 'users');
module/story/config.php
+1 -1
View File
@@ -9,7 +9,7 @@ $config->story->editor->create = array('id' => 'spec,verify', 'tools' => 'simple
$config->story->editor->change = array('id' => 'spec,verify', 'tools' => 'simpleTools');
$config->story->list->exportFields = '
id, product, module, plan, origin, title, spec, verify, keywords,
id, product, module, plan, source, title, spec, verify, keywords,
pri, estimate, status, stage,
openedBy, openedDate, assignedTo, assignedDate, mailto,
reviewedBy, reviewedDate,
module/story/lang/en.php
+9 -9
View File
@@ -30,7 +30,7 @@ $lang->story->common = 'Story';
$lang->story->id = 'ID';
$lang->story->product = 'Product';
$lang->story->module = 'Module';
$lang->story->origin = 'Origin';
$lang->story->source = 'Source';
$lang->story->release = 'Release';
$lang->story->bug = 'Related Bug';
$lang->story->title = 'Title';
@@ -102,14 +102,14 @@ $lang->story->reviewResultList['revert'] = 'Revert';
$lang->story->reviewResultList['clarify']= 'Clarify';
$lang->story->reviewResultList['reject'] = 'Reject';
$lang->story->originList[''] = '';
$lang->story->originList['custom'] = 'Custom';
$lang->story->originList['PO'] = 'PO';
$lang->story->originList['market'] = 'Market';
$lang->story->originList['service'] = 'Service';
$lang->story->originList['competitor'] = 'Competitor';
$lang->story->originList['partner'] = 'Partner';
$lang->story->originList['other'] = 'Other';
$lang->story->sourceList[''] = '';
$lang->story->sourceList['custom'] = 'Custom';
$lang->story->sourceList['PO'] = 'PO';
$lang->story->sourceList['market'] = 'Market';
$lang->story->sourceList['service'] = 'Service';
$lang->story->sourceList['competitor'] = 'Competitor';
$lang->story->sourceList['partner'] = 'Partner';
$lang->story->sourceList['other'] = 'Other';
$lang->story->priList[] = '';
$lang->story->priList[3] = '3';
module/story/lang/zh-cn.php
+9 -9
View File
@@ -30,7 +30,7 @@ $lang->story->common = '需求';
$lang->story->id = '编号';
$lang->story->product = '所属产品';
$lang->story->module = '所属模块';
$lang->story->origin = '来源';
$lang->story->source = '来源';
$lang->story->release = '发布计划';
$lang->story->bug = '相关bug';
$lang->story->title = '需求名称';
@@ -102,14 +102,14 @@ $lang->story->reviewResultList['revert'] = '撤销变更';
$lang->story->reviewResultList['clarify']= '有待明确';
$lang->story->reviewResultList['reject'] = '拒绝';
$lang->story->originList[''] = '';
$lang->story->originList['custom'] = '客户';
$lang->story->originList['PO'] = '产品经理';
$lang->story->originList['market'] = '市场';
$lang->story->originList['service'] = '客服';
$lang->story->originList['competitor'] = '竞争对手';
$lang->story->originList['partner'] = '合伙人';
$lang->story->originList['other'] = '其他';
$lang->story->sourceList[''] = '';
$lang->story->sourceList['custom'] = '客户';
$lang->story->sourceList['PO'] = '产品经理';
$lang->story->sourceList['market'] = '市场';
$lang->story->sourceList['service'] = '客服';
$lang->story->sourceList['competitor'] = '竞争对手';
$lang->story->sourceList['partner'] = '合伙人';
$lang->story->sourceList['other'] = '其他';
$lang->story->priList[] = '';
$lang->story->priList[3] = '3';
module/story/view/create.html.php
+2 -2
View File
@@ -27,8 +27,8 @@
<td><span id='planIdBox'><?php echo html::select('plan', $plans, $planID, 'class=select-3');?></span></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->story->origin;?></th>
<td><?php echo html::select('origin', $lang->story->originList, '', 'class=select-3');?></td>
<th class='rowhead'><?php echo $lang->story->source;?></th>
<td><?php echo html::select('source', $lang->story->sourceList, '', 'class=select-3');?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->story->title;?></th>
module/story/view/edit.html.php
+2 -2
View File
@@ -54,8 +54,8 @@
<td><span id='planIdBox'><?php echo html::select('plan', $plans, $story->plan, 'class=select-1');?></span></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->story->origin;?></th>
<td><?php echo html::select('origin', $lang->story->originList, $lang->story->originList[$story->origin], 'class=select-1');?></td>
<th class='rowhead'><?php echo $lang->story->source;?></th>
<td><?php echo html::select('source', $lang->story->sourceList, $lang->story->sourceList[$story->source], 'class=select-1');?></td>
</tr>
<tr>
<td class='rowhead'><?php echo $lang->story->status;?></td>
module/story/view/view.html.php
+2 -2
View File
@@ -92,8 +92,8 @@
<td><?php if(isset($story->planTitle)) if(!common::printLink('productplan', 'view', "planID=$story->plan", $story->planTitle)) echo $story->planTitle;?>
</tr>
<tr>
<td class='rowhead'><?php echo $lang->story->origin;?></td>
<td><?php echo $lang->story->originList[$story->origin];?></td>
<td class='rowhead'><?php echo $lang->story->source;?></td>
<td><?php echo $lang->story->sourceList[$story->source];?></td>
</tr>
<tr>
<td class='rowhead'><?php echo $lang->story->status;?></td>