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

* change name and adjust code format for custom fields.

Browse Source
This commit is contained in:
chenfeiCF
2016-04-29 15:23:15 +08:00
parent 0fc6a0da81
commit 38dbf6e28a
30 changed files with 64 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/config.php
+6 -6
View File
@@ -37,14 +37,14 @@ $config->task->exportFields = '
closedBy, closedDate, closedReason,
lastEditedBy, lastEditedDate,files
';
$config->task->customCreateFields = 'story,estStarted,deadline,mailto,pri,estimate';
$config->task->batchCreateFields = 'module,story,assignedTo,estimate,estStarted,deadline,desc,pri';
$config->task->batchEditFields = 'module,assignedTo,status,pri,estimate,record,left,estStarted,deadline,finishedBy,canceledBy,closedBy,closedReason';
$config->task->customCreateFields = 'story,estStarted,deadline,mailto,pri,estimate';
$config->task->customBatchCreateFields = 'module,story,assignedTo,estimate,estStarted,deadline,desc,pri';
$config->task->customBatchEditFields = 'module,assignedTo,status,pri,estimate,record,left,estStarted,deadline,finishedBy,canceledBy,closedBy,closedReason';
$config->task->custom = new stdclass();
$config->task->custom->create = $config->task->customCreateFields;
$config->task->custom->batchcreate = 'module,story,assignedTo,estimate,desc,pri';
$config->task->custom->batchedit = 'module,assignedTo,status,pri,estimate,record,left,finishedBy,closedBy,closedReason';
$config->task->custom->createFields = $config->task->customCreateFields;
$config->task->custom->batchCreateFields = 'module,story,assignedTo,estimate,desc,pri';
$config->task->custom->batchEditFields = 'module,assignedTo,status,pri,estimate,record,left,finishedBy,closedBy,closedReason';
$config->task->datatable = new stdclass();
$config->task->datatable->defaultField = array('id', 'pri', 'name', 'status', 'deadline', 'openedDate', 'assignedTo', 'finishedBy', 'finishedDate', 'estimate', 'consumed', 'left', 'story', 'actions');
module/task/control.php
+6 -6
View File
@@ -144,7 +144,7 @@ class task extends control
/* Set Custom*/
foreach(explode(',', $this->config->task->customCreateFields) as $field) $customFields[$field] = $this->lang->task->$field;
$this->view->customFields = $customFields;
$this->view->showFields = $this->config->task->custom->create;
$this->view->showFields = $this->config->task->custom->createFields;
$this->view->title = $title;
$this->view->position = $position;
@@ -187,9 +187,9 @@ class task extends control
}
/* Set Custom*/
foreach(explode(',', $this->config->task->batchCreateFields) as $field) $customFields[$field] = $this->lang->task->$field;
foreach(explode(',', $this->config->task->customBatchCreateFields) as $field) $customFields[$field] = $this->lang->task->$field;
$this->view->customFields = $customFields;
$this->view->showFields = $this->config->task->custom->batchcreate;
$this->view->showFields = $this->config->task->custom->batchCreateFields;
$stories = $this->story->getProjectStoryPairs($projectID, 0, 0, 0, 'short');
$members = $this->project->getTeamMemberPairs($projectID, 'nodeleted');
@@ -370,14 +370,14 @@ class task extends control
/* Judge whether the editedTasks is too large and set session. */
$showSuhosinInfo = false;
$showSuhosinInfo = $this->loadModel('common')->judgeSuhosinSetting(count($tasks), count(explode(',', $this->config->task->custom->batchedit)) + 3);
$showSuhosinInfo = $this->loadModel('common')->judgeSuhosinSetting(count($tasks), count(explode(',', $this->config->task->custom->batchEditFields)) + 3);
$this->app->session->set('showSuhosinInfo', $showSuhosinInfo);
if($showSuhosinInfo) $this->view->suhosinInfo = $this->lang->suhosinInfo;
/* Set Custom*/
foreach(explode(',', $this->config->task->batchEditFields) as $field) $customFields[$field] = $this->lang->task->$field;
foreach(explode(',', $this->config->task->customBatchEditFields) as $field) $customFields[$field] = $this->lang->task->$field;
$this->view->customFields = $customFields;
$this->view->showFields = $this->config->task->custom->batchedit;
$this->view->showFields = $this->config->task->custom->batchEditFields;
/* Set ditto option for pri, status and type list. */
$this->lang->task->priList['ditto'] = $this->lang->task->ditto;
module/task/view/batchcreate.html.php
+1 -1
View File
@@ -118,7 +118,7 @@ foreach(explode(',', $showFields) as $field)
</table>
<?php js::set('mainField', 'name');?>
<?php js::set('ditto', $lang->task->ditto);?>
<?php $customLink = $this->createLink('custom', 'ajaxSaveCustom', 'module=task&section=custom&key=batchcreate')?>
<?php $customLink = $this->createLink('custom', 'ajaxSaveCustom', 'module=task&section=custom&key=batchCreateFields')?>
<?php include '../../common/view/customfield.html.php';?>
<?php include '../../common/view/pastetext.html.php';?>
<?php include '../../common/view/footer.html.php';?>
module/task/view/batchedit.html.php
+1 -1
View File
@@ -95,6 +95,6 @@ foreach(explode(',', $showFields) as $field)
</tfoot>
</table>
</form>
<?php $customLink = $this->createLink('custom', 'ajaxSaveCustom', 'module=task&section=custom&key=batchedit')?>
<?php $customLink = $this->createLink('custom', 'ajaxSaveCustom', 'module=task&section=custom&key=batchEditFields')?>
<?php include '../../common/view/customfield.html.php';?>
<?php include '../../common/view/footer.html.php';?>
module/task/view/create.html.php
+1 -1
View File
@@ -154,6 +154,6 @@
<span id='responser'></span>
</form>
</div>
<?php $customLink = $this->createLink('custom', 'ajaxSaveCustom', 'module=task&section=custom&key=create')?>
<?php $customLink = $this->createLink('custom', 'ajaxSaveCustom', 'module=task&section=custom&key=createFields')?>
<?php include '../../common/view/customfield.html.php';?>
<?php include '../../common/view/footer.html.php';?>