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

Merge branch 'master' of https://github.com/easysoft/zentaopms

Browse Source
This commit is contained in:
reneeteng
2019-06-19 11:05:48 +08:00
parent f813cda32e 811d68443c
commit 14ce4572e5
41 changed files with 211 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/action/lang/en.php
+145 -122
View File
@@ -211,6 +211,7 @@ $lang->action->label->managed = "managed";
/* 动态信息按照对象分组 */
$lang->action->dynamicAction = new stdclass;
<<<<<<< HEAD
$lang->action->dynamicAction->todo['opened'] = 'created a todo';
$lang->action->dynamicAction->todo['edited'] = 'edited a todo';
$lang->action->dynamicAction->todo['erased'] = 'deleted a todo';
@@ -221,131 +222,144 @@ $lang->action->dynamicAction->todo['deleted'] = 'deleted a todo';
$lang->action->dynamicAction->todo['assigned'] = 'assigned a todo';
$lang->action->dynamicAction->todo['undeleted'] = 'restored a todo';
$lang->action->dynamicAction->todo['hidden'] = 'hid a todo';
=======
$lang->action->dynamicAction->todo['opened'] = 'Create Todo';
$lang->action->dynamicAction->todo['edited'] = 'Edit Todo';
$lang->action->dynamicAction->todo['erased'] = 'Delete Todo';
$lang->action->dynamicAction->todo['finished'] = 'Finish Todo';
$lang->action->dynamicAction->todo['activated'] = 'Activate Todo';
$lang->action->dynamicAction->todo['closed'] = 'Close Todo';
$lang->action->dynamicAction->todo['deleted'] = 'Delete Todo';
$lang->action->dynamicAction->todo['assigned'] = 'Assign Todo';
$lang->action->dynamicAction->todo['undeleted'] = 'Restore Todo';
$lang->action->dynamicAction->todo['hidden'] = 'Hide Todo';
>>>>>>> 811d68443ca24d3a7d686b938b61661eab12ac8e
$lang->action->dynamicAction->product['opened'] = 'created a ' . $lang->productCommon;
$lang->action->dynamicAction->product['edited'] = 'edited a ' . $lang->productCommon;
$lang->action->dynamicAction->product['deleted'] = 'deleted a ' . $lang->productCommon;
$lang->action->dynamicAction->product['closed'] = 'closed a ' . $lang->productCommon;
$lang->action->dynamicAction->product['undeleted'] = 'restored a ' . $lang->productCommon;
$lang->action->dynamicAction->product['hidden'] = 'hid a ' . $lang->productCommon;
$lang->action->dynamicAction->productplan['opened'] = 'created a plan';
$lang->action->dynamicAction->productplan['edited'] = 'edited a plan';
$lang->action->dynamicAction->release['opened'] = 'created a release';
$lang->action->dynamicAction->release['edited'] = 'edited a release';
$lang->action->dynamicAction->release['changestatus'] = 'changed release status';
$lang->action->dynamicAction->release['undeleted'] = 'restored a release';
$lang->action->dynamicAction->release['hidden'] = 'hid a release';
$lang->action->dynamicAction->story['opened'] = 'created a story';
$lang->action->dynamicAction->story['edited'] = 'edited a story';
$lang->action->dynamicAction->story['activated'] = 'activated a story';
$lang->action->dynamicAction->story['reviewed'] = 'reviewed a story';
$lang->action->dynamicAction->story['closed'] = 'closed a story';
$lang->action->dynamicAction->story['assigned'] = 'assigned a story';
$lang->action->dynamicAction->story['changed'] = 'changed a story';
$lang->action->dynamicAction->story['linked2plan'] = 'linked to a plan';
$lang->action->dynamicAction->story['unlinkedfromplan'] = 'unlinked from a plan';
$lang->action->dynamicAction->story['linked2release'] = 'linked to a release';
$lang->action->dynamicAction->story['unlinkedfromrelease'] = 'unlinked from a plan';
$lang->action->dynamicAction->story['linked2build'] = 'linked to a build';
$lang->action->dynamicAction->story['unlinkedfrombuild'] = 'unlinked from a build';
$lang->action->dynamicAction->story['unlinkedfromproject'] = 'unlinked a project';
$lang->action->dynamicAction->story['undeleted'] = 'restored a story';
$lang->action->dynamicAction->story['hidden'] = 'hid a story';
$lang->action->dynamicAction->product['opened'] = 'Create ' . $lang->productCommon;
$lang->action->dynamicAction->product['edited'] = 'Edit ' . $lang->productCommon;
$lang->action->dynamicAction->product['deleted'] = 'Delete ' . $lang->productCommon;
$lang->action->dynamicAction->product['closed'] = 'Close ' . $lang->productCommon;
$lang->action->dynamicAction->product['undeleted'] = 'Restore ' . $lang->productCommon;
$lang->action->dynamicAction->product['hidden'] = 'Hide ' . $lang->productCommon;
$lang->action->dynamicAction->productplan['opened'] = 'Create Plan';
$lang->action->dynamicAction->productplan['edited'] = 'Edit Plan';
$lang->action->dynamicAction->release['opened'] = 'Create Release';
$lang->action->dynamicAction->release['edited'] = 'Edit Release';
$lang->action->dynamicAction->release['changestatus'] = 'Change Release Status';
$lang->action->dynamicAction->release['undeleted'] = 'Restore Release';
$lang->action->dynamicAction->release['hidden'] = 'Hide Release';
$lang->action->dynamicAction->story['opened'] = 'Create Story';
$lang->action->dynamicAction->story['edited'] = 'Edit Story';
$lang->action->dynamicAction->story['activated'] = 'Activate Story';
$lang->action->dynamicAction->story['reviewed'] = 'Review Story';
$lang->action->dynamicAction->story['closed'] = 'Close Story';
$lang->action->dynamicAction->story['assigned'] = 'Assign Story';
$lang->action->dynamicAction->story['changed'] = 'Change Story';
$lang->action->dynamicAction->story['linked2plan'] = 'Link Story to Plan';
$lang->action->dynamicAction->story['unlinkedfromplan'] = 'Unlink Story from Plan';
$lang->action->dynamicAction->story['linked2release'] = 'Link Story to Release';
$lang->action->dynamicAction->story['unlinkedfromrelease'] = 'Unlink Story from Plan';
$lang->action->dynamicAction->story['linked2build'] = 'Link Story to Build';
$lang->action->dynamicAction->story['unlinkedfrombuild'] = 'Unlink Story from Build';
$lang->action->dynamicAction->story['unlinkedfromproject'] = 'Unlink Project';
$lang->action->dynamicAction->story['undeleted'] = 'Restore Story';
$lang->action->dynamicAction->story['hidden'] = 'Hide Story';
$lang->action->dynamicAction->project['opened'] = 'created a ' . $lang->projectCommon;
$lang->action->dynamicAction->project['edited'] = 'edited a ' . $lang->projectCommon;
$lang->action->dynamicAction->project['deleted'] = 'deleted a' . $lang->projectCommon;
$lang->action->dynamicAction->project['started'] = 'started a ' . $lang->projectCommon;
$lang->action->dynamicAction->project['delayed'] = 'delayed a ' . $lang->projectCommon;
$lang->action->dynamicAction->project['suspended'] = 'suspended a ' . $lang->projectCommon;
$lang->action->dynamicAction->project['activated'] = 'activated a ' . $lang->projectCommon;
$lang->action->dynamicAction->project['closed'] = 'closed a ' . $lang->projectCommon;
$lang->action->dynamicAction->project['managed'] = 'managed a ' . $lang->projectCommon;
$lang->action->dynamicAction->project['undeleted'] = 'restored a ' . $lang->projectCommon;
$lang->action->dynamicAction->project['hidden'] = 'hid a ' . $lang->projectCommon;
$lang->action->dynamicAction->project['moved'] = 'improted a task';
$lang->action->dynamicAction->task['opened'] = 'created a task';
$lang->action->dynamicAction->task['edited'] = 'edited a task';
$lang->action->dynamicAction->task['commented'] = 'commented a task';
$lang->action->dynamicAction->task['assigned'] = 'assigned a task';
$lang->action->dynamicAction->task['confirmed'] = 'confirmed a task';
$lang->action->dynamicAction->task['started'] = 'started a task';
$lang->action->dynamicAction->task['finished'] = 'finished a task';
$lang->action->dynamicAction->task['recordestimate'] = 'added estimates';
$lang->action->dynamicAction->task['editestimate'] = 'edited estimates';
$lang->action->dynamicAction->task['deleteestimate'] = 'delete estimates';
$lang->action->dynamicAction->task['paused'] = 'paused a task';
$lang->action->dynamicAction->task['closed'] = 'closed a task';
$lang->action->dynamicAction->task['canceled'] = 'cancelled a task';
$lang->action->dynamicAction->task['activated'] = 'activated a task';
$lang->action->dynamicAction->task['createchildren'] = 'created a child task';
$lang->action->dynamicAction->task['unlinkparenttask'] = 'unlinked a parent task';
$lang->action->dynamicAction->task['linkparenttask'] = 'linked a parent task';
$lang->action->dynamicAction->task['linkchildtask'] = 'linked a child task';
$lang->action->dynamicAction->task['undeleted'] = 'restored a task';
$lang->action->dynamicAction->task['hidden'] = 'Hid a task';
$lang->action->dynamicAction->task['svncommited'] = 'SVN commited';
$lang->action->dynamicAction->task['gitcommited'] = 'GIT commited';
$lang->action->dynamicAction->build['opened'] = 'created a build';
$lang->action->dynamicAction->build['edited'] = 'edited a build';
$lang->action->dynamicAction->project['opened'] = 'Create ' . $lang->projectCommon;
$lang->action->dynamicAction->project['edited'] = 'Edit ' . $lang->projectCommon;
$lang->action->dynamicAction->project['deleted'] = 'Delete ' . $lang->projectCommon;
$lang->action->dynamicAction->project['started'] = 'Start ' . $lang->projectCommon;
$lang->action->dynamicAction->project['delayed'] = 'Delay ' . $lang->projectCommon;
$lang->action->dynamicAction->project['suspended'] = 'Suspend ' . $lang->projectCommon;
$lang->action->dynamicAction->project['activated'] = 'Activate ' . $lang->projectCommon;
$lang->action->dynamicAction->project['closed'] = 'Close ' . $lang->projectCommon;
$lang->action->dynamicAction->project['managed'] = 'Manage ' . $lang->projectCommon;
$lang->action->dynamicAction->project['undeleted'] = 'Restore ' . $lang->projectCommon;
$lang->action->dynamicAction->project['hidden'] = 'Hide ' . $lang->projectCommon;
$lang->action->dynamicAction->project['moved'] = 'Improt Task';
$lang->action->dynamicAction->task['opened'] = 'Create Task';
$lang->action->dynamicAction->task['edited'] = 'Edit Task';
$lang->action->dynamicAction->task['commented'] = 'Task Comment';
$lang->action->dynamicAction->task['assigned'] = 'Assign Task';
$lang->action->dynamicAction->task['confirmed'] = 'Confirm Task';
$lang->action->dynamicAction->task['started'] = 'Start Task';
$lang->action->dynamicAction->task['finished'] = 'Finish Task';
$lang->action->dynamicAction->task['recordestimate'] = 'Add Estimates';
$lang->action->dynamicAction->task['editestimate'] = 'Edit Estimates';
$lang->action->dynamicAction->task['deleteestimate'] = 'Delete Estimates';
$lang->action->dynamicAction->task['paused'] = 'Pause Task';
$lang->action->dynamicAction->task['closed'] = 'Close Task';
$lang->action->dynamicAction->task['canceled'] = 'Cancel Task';
$lang->action->dynamicAction->task['activated'] = 'Activate Task';
$lang->action->dynamicAction->task['createchildren'] = 'Create Child Task';
$lang->action->dynamicAction->task['unlinkparenttask'] = 'Unlink Parent Task';
$lang->action->dynamicAction->task['linkparenttask'] = 'Link Parent Task';
$lang->action->dynamicAction->task['linkchildtask'] = 'Link Child Task';
$lang->action->dynamicAction->task['undeleted'] = 'Restore Task';
$lang->action->dynamicAction->task['hidden'] = 'Hide Task';
$lang->action->dynamicAction->task['svncommited'] = 'SVN Commit';
$lang->action->dynamicAction->task['gitcommited'] = 'GIT Commit';
$lang->action->dynamicAction->build['opened'] = 'Create Build';
$lang->action->dynamicAction->build['edited'] = 'Edit Build';
$lang->action->dynamicAction->bug['opened'] = 'reported a bug';
$lang->action->dynamicAction->bug['edited'] = 'edited a bug';
$lang->action->dynamicAction->bug['activated'] = 'activated a bug';
$lang->action->dynamicAction->bug['assigned'] = 'assigned a bug';
$lang->action->dynamicAction->bug['closed'] = 'closed a bug';
$lang->action->dynamicAction->bug['bugconfirmed'] = 'confirmed a bug';
$lang->action->dynamicAction->bug['resolved'] = 'resolved a bug';
$lang->action->dynamicAction->bug['undeleted'] = 'restored a bug';
$lang->action->dynamicAction->bug['hidden'] = 'hid a bug';
$lang->action->dynamicAction->bug['confirmed'] = 'confirmed story change';
$lang->action->dynamicAction->bug['tostory'] = 'converted to a story';
$lang->action->dynamicAction->bug['totask'] = 'converted to a task';
$lang->action->dynamicAction->bug['linked2plan'] = 'linked a plan';
$lang->action->dynamicAction->bug['unlinkedfromplan'] = 'unlinked from a plan';
$lang->action->dynamicAction->bug['linked2release'] = 'linked a release';
$lang->action->dynamicAction->bug['unlinkedfromrelease'] = 'unlinked from a plan';
$lang->action->dynamicAction->bug['linked2bug'] = 'linked a build';
$lang->action->dynamicAction->bug['unlinkedfrombuild'] = 'unlinked a build';
$lang->action->dynamicAction->testtask['opened'] = 'created a test request';
$lang->action->dynamicAction->testtask['edited'] = 'edited a test request';
$lang->action->dynamicAction->testtask['started'] = 'started a test request';
$lang->action->dynamicAction->testtask['activated'] = 'activated a test request';
$lang->action->dynamicAction->testtask['closed'] = 'closes a test request';
$lang->action->dynamicAction->testtask['blocked'] = 'blocked a test request';
$lang->action->dynamicAction->case['opened'] = 'created a case';
$lang->action->dynamicAction->case['edited'] = 'edited a case';
$lang->action->dynamicAction->case['deleted'] = 'deleted a case';
$lang->action->dynamicAction->case['undeleted'] = 'restored a case';
$lang->action->dynamicAction->case['hidden'] = 'hid a case';
$lang->action->dynamicAction->case['reviewed'] = 'added a review result';
$lang->action->dynamicAction->case['confirmed'] = 'confirmed a case';
$lang->action->dynamicAction->case['fromlib'] = 'imported from a case library';
$lang->action->dynamicAction->testreport['opened'] = 'created a testing report';
$lang->action->dynamicAction->testreport['edited'] = 'edited a testing report';
$lang->action->dynamicAction->testreport['deleted'] = 'deleted a testing report';
$lang->action->dynamicAction->testreport['undeleted'] = 'restored a testing report';
$lang->action->dynamicAction->testreport['hidden'] = 'hid testing report';
$lang->action->dynamicAction->testsuite['opened'] = 'created a test suite';
$lang->action->dynamicAction->testsuite['edited'] = 'edited a test suite';
$lang->action->dynamicAction->testsuite['deleted'] = 'deleted a test suite';
$lang->action->dynamicAction->testsuite['undeleted'] = 'restored a test suite';
$lang->action->dynamicAction->testsuite['hidden'] = 'hid a test suite';
$lang->action->dynamicAction->caselib['opened'] = 'created a case library';
$lang->action->dynamicAction->caselib['edited'] = 'edited a case library';
$lang->action->dynamicAction->caselib['deleted'] = 'deleted a case library';
$lang->action->dynamicAction->caselib['undeleted'] = 'restored a case library';
$lang->action->dynamicAction->caselib['hidden'] = 'hid a case library';
$lang->action->dynamicAction->bug['opened'] = 'Report Bug';
$lang->action->dynamicAction->bug['edited'] = 'Edit Bug';
$lang->action->dynamicAction->bug['activated'] = 'Activate Bug';
$lang->action->dynamicAction->bug['assigned'] = 'Assign Bug';
$lang->action->dynamicAction->bug['closed'] = 'Close Bug';
$lang->action->dynamicAction->bug['bugconfirmed'] = 'Confirm Bug';
$lang->action->dynamicAction->bug['resolved'] = 'Solve Bug';
$lang->action->dynamicAction->bug['undeleted'] = 'Restore Bug';
$lang->action->dynamicAction->bug['hidden'] = 'Hide Bug';
$lang->action->dynamicAction->bug['confirmed'] = 'Confirm Story Change';
$lang->action->dynamicAction->bug['tostory'] = 'Convert to Story';
$lang->action->dynamicAction->bug['totask'] = 'Convert to Task';
$lang->action->dynamicAction->bug['linked2plan'] = 'Link Plan';
$lang->action->dynamicAction->bug['unlinkedfromplan'] = 'Unlink Plan';
$lang->action->dynamicAction->bug['linked2release'] = 'Link Release';
$lang->action->dynamicAction->bug['unlinkedfromrelease'] = 'Unlink Plan';
$lang->action->dynamicAction->bug['linked2bug'] = 'Link Build';
$lang->action->dynamicAction->bug['unlinkedfrombuild'] = 'Unlink Build';
$lang->action->dynamicAction->testtask['opened'] = 'Create Test Request';
$lang->action->dynamicAction->testtask['edited'] = 'Edit Test Request';
$lang->action->dynamicAction->testtask['started'] = 'Start Test Request';
$lang->action->dynamicAction->testtask['activated'] = 'Activate Test Request';
$lang->action->dynamicAction->testtask['closed'] = 'Close Test Request';
$lang->action->dynamicAction->testtask['blocked'] = 'Blocked Test Request';
$lang->action->dynamicAction->case['opened'] = 'Create Case';
$lang->action->dynamicAction->case['edited'] = 'Edit Case';
$lang->action->dynamicAction->case['deleted'] = 'Delete Case';
$lang->action->dynamicAction->case['undeleted'] = 'Restore Case';
$lang->action->dynamicAction->case['hidden'] = 'Hide Case';
$lang->action->dynamicAction->case['reviewed'] = 'Add Review Result';
$lang->action->dynamicAction->case['confirmed'] = 'Confirm Case';
$lang->action->dynamicAction->case['fromlib'] = 'Import from Case Lib';
$lang->action->dynamicAction->testreport['opened'] = 'Create Test Report';
$lang->action->dynamicAction->testreport['edited'] = 'Edit Test Report';
$lang->action->dynamicAction->testreport['deleted'] = 'Delete Test Report';
$lang->action->dynamicAction->testreport['undeleted'] = 'Restore Test Report';
$lang->action->dynamicAction->testreport['hidden'] = 'Hide Test Report';
$lang->action->dynamicAction->testsuite['opened'] = 'Create Test Suite';
$lang->action->dynamicAction->testsuite['edited'] = 'Edit Test Suite';
$lang->action->dynamicAction->testsuite['deleted'] = 'Delete Test Suite';
$lang->action->dynamicAction->testsuite['undeleted'] = 'Restore Test Suite';
$lang->action->dynamicAction->testsuite['hidden'] = 'Hide Test Suite';
$lang->action->dynamicAction->caselib['opened'] = 'Create Case Lib';
$lang->action->dynamicAction->caselib['edited'] = 'Edit Case Lib';
$lang->action->dynamicAction->caselib['deleted'] = 'Delete Case Lib';
$lang->action->dynamicAction->caselib['undeleted'] = 'Restore Case Lib';
$lang->action->dynamicAction->caselib['hidden'] = 'Hide Case Lib';
$lang->action->dynamicAction->doclib['created'] = 'created a document library';
$lang->action->dynamicAction->doclib['edited'] = 'edited a document library';
$lang->action->dynamicAction->doc['created'] = 'created a document';
$lang->action->dynamicAction->doc['edited'] = 'edited a document';
$lang->action->dynamicAction->doc['commented'] = 'commented a document';
$lang->action->dynamicAction->doc['deleted'] = 'deleted a document';
$lang->action->dynamicAction->doc['undeleted'] = 'restored a document';
$lang->action->dynamicAction->doc['hidden'] = 'hide a document';
$lang->action->dynamicAction->doclib['created'] = 'Create Doc Library';
$lang->action->dynamicAction->doclib['edited'] = 'Edit Doc Library';
$lang->action->dynamicAction->doc['created'] = 'Create Document';
$lang->action->dynamicAction->doc['edited'] = 'Edit Document';
$lang->action->dynamicAction->doc['commented'] = 'Comment Document';
$lang->action->dynamicAction->doc['deleted'] = 'Delete Document';
$lang->action->dynamicAction->doc['undeleted'] = 'Restore Document';
$lang->action->dynamicAction->doc['hidden'] = 'Hide Document';
<<<<<<< HEAD
$lang->action->dynamicAction->user['created'] = 'create a user';
$lang->action->dynamicAction->user['edited'] = 'edited au user';
$lang->action->dynamicAction->user['login'] = 'login';
@@ -353,9 +367,18 @@ $lang->action->dynamicAction->user['logout'] = 'logout';
$lang->action->dynamicAction->user['undeleted'] = 'restored user';
$lang->action->dynamicAction->user['hidden'] = 'hid a user';
$lang->action->dynamicAction->user['loginxuanxuan'] = 'login desktop';
=======
$lang->action->dynamicAction->user['created'] = 'Create User';
$lang->action->dynamicAction->user['edited'] = 'Edit User';
$lang->action->dynamicAction->user['login'] = 'User Login';
$lang->action->dynamicAction->user['logout'] = 'User Logout';
$lang->action->dynamicAction->user['undeleted'] = 'Restore User';
$lang->action->dynamicAction->user['hidden'] = 'Hide User';
$lang->action->dynamicAction->user['loginxuanxuan'] = 'Login Xuan';
>>>>>>> 811d68443ca24d3a7d686b938b61661eab12ac8e
$lang->action->dynamicAction->entry['created'] = 'edited an application';
$lang->action->dynamicAction->entry['edited'] = 'edited an application';
$lang->action->dynamicAction->entry['created'] = 'Add Application';
$lang->action->dynamicAction->entry['edited'] = 'Edit Application';
/* 用来生成相应对象的链接。*/
$lang->action->label->product = $lang->productCommon . '|product|view|productID=%s';
module/admin/view/log.html.php
+5 -5
View File
@@ -10,10 +10,13 @@
* @link http://www.zentao.net
*/
?>
<?php include $this->app->getModuleRoot() . 'message/view/header.html.php';?>
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/form.html.php';?>
<div id='mainContent' class='main-content'>
<div class='center-block mw-600px'>
<div class='main-header'>
<h2><?php echo $lang->webhook->setting;?></h2>
</div>
<div class='center-block mw-700px'>
<form id='logForm' method='post' class='ajaxForm'>
<table class='table table-form'>
<tr>
@@ -31,7 +34,4 @@
</form>
</div>
</div>
<script>
$(function(){$('#mainMenu #webhookTab').addClass('btn-active-text');})
</script>
<?php include '../../common/view/footer.html.php';?>
module/admin/view/safe.html.php
+3 -2
View File
@@ -22,8 +22,9 @@
<form class="load-indicator main-form form-ajax" method='post'>
<table class='table table-form'>
<tr>
<th class='w-130px'><?php echo $lang->admin->safe->password?></th>
<td class='w-200px'><?php echo html::radio('mode', $lang->admin->safe->modeList, isset($config->safe->mode) ? $config->safe->mode : 0, "onclick=showModeRule(this.value)")?></td>
<?php $colWidth = $app->getClientLang() == 'en' ? 'w-300px' : 'w-130px';?>
<th class='<?php echo $colWidth;?>'><?php echo $lang->admin->safe->password?></th>
<td class='w-230px'><?php echo html::radio('mode', $lang->admin->safe->modeList, isset($config->safe->mode) ? $config->safe->mode : 0, "onclick=showModeRule(this.value)")?></td>
<td><?php echo $lang->admin->safe->noticeMode?></td>
</tr>
<tr id='mode1Rule' class='hidden'>
module/bug/control.php
+1 -1
View File
@@ -181,7 +181,7 @@ class bug extends control
* @access public
* @return void
*/
public function report($productID, $browseType, $branchID, $moduleID, $chartType = '')
public function report($productID, $browseType, $branchID, $moduleID, $chartType = 'default')
{
$this->loadModel('report');
$this->view->charts = array();
module/bug/view/report.html.php
+1 -1
View File
@@ -43,7 +43,7 @@
<div class='cell'>
<div class='btn-toolbar'>
<?php foreach($lang->report->typeList as $type => $typeName):?>
<?php echo html::a("javascript:changeChartType(\"$type\")", ($type == 'default' ? "<i class='icon icon-list-alt muted'></i> " : "<i class='icon icon-chart-{$type}'></i>") . $typeName, '', "class='btn btn-link " . ($type == $chartType ? 'btn-active-line' : '') . "'")?>
<?php echo html::a("javascript:changeChartType(\"$type\")", ($type == 'default' ? "<i class='icon icon-list-alt muted'></i> " : "<i class='icon icon-chart-{$type} muted'></i>") . $typeName, '', "class='btn btn-link " . ($type == $chartType ? 'btn-active-line' : '') . "'")?>
<?php endforeach;?>
<div class='pull-right with-padding text-muted'><?php echo $lang->report->notice->help;?></div>
</div>
module/build/css/create.css
+1
View File
@@ -0,0 +1 @@
#product_chosen .chosen-single{border-right:0px;}
module/common/lang/en.php
-1
View File
@@ -262,7 +262,6 @@ $lang->task = new stdclass();
$lang->build = new stdclass();
$lang->task->menu = $lang->project->menu;
$lang->build->menu = $lang->project->menu;
$lang->build->menu->qa = array('link' => 'Build|project|build|projectID=%s', 'subModule' => 'bug,build,testtask', 'alias' => 'build,testtask', 'class' => 'dropdown dropdown-hover');
/* QA menu settings. */
$lang->qa = new stdclass();
module/common/lang/zh-cn.php
-1
View File
@@ -262,7 +262,6 @@ $lang->task = new stdclass();
$lang->build = new stdclass();
$lang->task->menu = $lang->project->menu;
$lang->build->menu = $lang->project->menu;
$lang->build->menu->qa = array('link' => '版本|project|build|projectID=%s', 'subModule' => 'bug,build,testtask', 'alias' => 'build,testtask', 'class' => 'dropdown dropdown-hover');
/* QA视图菜单设置。*/
$lang->qa = new stdclass();
module/company/view/edit.html.php
+2 -1
View File
@@ -23,7 +23,8 @@
<form class='main-form' method='post' target='hiddenwin'>
<table class='table table-form'>
<tr>
<th><?php echo $lang->company->name;?></th>
<?php $colWidth = $app->getClientLang() == 'en' ? 'w-120px' : 'w-80px';?>
<th class='<?php echo $colWidth;?>'><?php echo $lang->company->name;?></th>
<td><?php echo html::input('name', $company->name, "class='form-control'");?></td>
</tr>
<tr>
module/custom/view/set.html.php
+2 -1
View File
@@ -54,7 +54,8 @@ EOT;
<?php if(($module == 'story' or $module == 'testcase') and $field == 'review'):?>
<table class='table table-form mw-800px'>
<tr>
<th class='w-80px'><?php echo $lang->custom->storyReview;?></th>
<?php $colWidth = $app->getClientLang() == 'en' ? 'w-140px' : 'w-80px';?>
<th class='<?php echo $colWidth;?>'><?php echo $lang->custom->storyReview;?></th>
<td><?php echo html::radio('needReview', $lang->custom->reviewList, $needReview);?></td>
<td></td>
</tr>
module/dept/view/browse.html.php
+3 -3
View File
@@ -110,19 +110,19 @@ $(function()
sort:
{
title: '<?php echo $lang->dept->dragAndSort ?>',
template: '<a class="sort-handler" href="javascript:;"><?php echo $lang->sort;?></a>'
template: '<a class="sort-handler"><i class="icon-move"></i></a>'
},
edit:
{
linkTemplate: '<?php echo helper::createLink('dept', 'edit', "deptid={0}"); ?>',
title: '<?php echo $lang->dept->edit ?>',
template: '<a href="javascript:;" data-width="600"><?php echo $lang->edit?></a>'
template: '<a><i class="icon-edit"></i></a>'
},
"delete":
{
linkTemplate: '<?php echo helper::createLink('dept', 'delete', "deptid={0}"); ?>',
title: '<?php echo $lang->dept->delete ?>',
template: '<a href="javascript:;"><?php echo $lang->delete?></a>'
template: '<a><i class="icon-trash"></i></a>'
}
},
action: function(event)
module/doc/control.php
-1
View File
@@ -809,7 +809,6 @@ class doc extends control
}
elseif($from == 'project')
{
$this->lang->modulePageActions = common::hasPriv('doc', 'createLib') ? html::a(helper::createLink('doc', 'createLib'), "<i class='icon icon-folder-plus'></i> " . $this->lang->doc->createLib, '', "class='btn btn-secondary iframe' data-width='70%'") : '';
$this->lang->doc->menu = $this->lang->project->menu;
$this->lang->doc->menuOrder = $this->lang->project->menuOrder;
$this->project->setMenu($this->project->getPairs('nocode'), $objectID);
module/doc/view/createlib.html.php
+1 -2
View File
@@ -45,8 +45,7 @@
<td>
<span><?php echo html::radio('acl', $lang->doc->aclList, 'open', "onchange='toggleAcl(this.value, \"lib\")'")?></span>
<span class='text-warning' id='noticeAcl'><?php echo $lang->doc->noticeAcl['lib']['product']['default'];?></span>
</td>
</tr>
</td>
</tr>
<tr id='whiteListBox' class='hidden'>
<th><?php echo $lang->doc->whiteList;?></th>
module/group/css/managepriv.css
+1
View File
@@ -5,3 +5,4 @@
@-moz-document url-prefix(){.table.table-form tbody > tr:last-child td, .table.table-form tbody > tr:last-child th {border-bottom: 1px solid #ddd}}
#mainMenu #groupName{line-height:33px; float: left}
.checkbox-right{padding-left:0px !important;}
module/message/view/setting.html.php
+6 -1
View File
@@ -47,7 +47,12 @@
?>
<td>
<?php
echo html::checkbox("messageSetting[$type][setting][$objectType]", $availableActions, isset($messageSetting[$type]['setting'][$objectType]) ? join(',', $messageSetting[$type]['setting'][$objectType]) : '');
$selected = isset($messageSetting[$type]['setting'][$objectType]) ? join(',', $messageSetting[$type]['setting'][$objectType]) : '';
foreach($availableActions as $key => $value)
{
$checked = strpos(",$selected,", ",{$key},") !== false ? "checked='checked'" : '';
echo "<div class='checkbox-primary' title='$value'><input type='checkbox' name='messageSetting[$type][setting][$objectType][]' value='$key' $checked id='messageSetting[$type][setting][$objectType]$key'> <label for='messageSetting[$type][setting][$objectType]$key'>$value</label></div>";
}
if(isset($config->message->condition[$type][$objectType]))
{
$moduleName = $objectType == 'case' ? 'testcase' : $objectType;
module/my/control.php
+1 -1
View File
@@ -393,7 +393,7 @@ class my extends control
{
$this->user->updatePassword($this->app->user->id);
if(dao::isError()) die(js::error(dao::getError()));
die(js::locate($this->createLink('my', 'profile'), 'parent'));
die(js::locate($this->createLink('my', 'profile'), 'parent.parent'));
}
$this->view->title = $this->lang->my->common . $this->lang->colon . $this->lang->my->changePassword;
module/my/view/profile.html.php
+1 -1
View File
@@ -94,7 +94,7 @@
<?php endforeach;?>
<?php endif;?>
<dt><?php echo $lang->user->address;?></dt>
<dd><?php echo $user->address;?></dd>
<dd title='<?php echo $user->address;?>'><?php echo $user->address;?></dd>
<dt><?php echo $lang->user->zipcode;?></dt>
<dd><?php echo $user->zipcode;?></dd>
</dl>
module/product/lang/en.php
+2 -2
View File
@@ -57,7 +57,7 @@ $lang->product->errorNoProduct = "No {$lang->productCommon} is created yet!";
$lang->product->accessDenied = "You have no access to the {$lang->productCommon}.";
$lang->product->id = 'ID';
$lang->product->name = 'Product Name';
$lang->product->name = "{$lang->productCommon} Name";
$lang->product->code = 'Code';
$lang->product->line = "{$lang->productCommon} Line";
$lang->product->order = 'Rank';
@@ -66,7 +66,7 @@ $lang->product->typeAB = 'Type';
$lang->product->status = 'Status';
$lang->product->desc = 'Description';
$lang->product->manager = 'Managers';
$lang->product->PO = 'Product Owner';
$lang->product->PO = "{$lang->productCommon} Owner";
$lang->product->QD = 'QA Manager';
$lang->product->RD = 'Release Manager';
$lang->product->acl = 'ACL';
module/project/js/kanban.js
+2 -1
View File
@@ -194,6 +194,7 @@ $(function()
shown: function(){$('.modal-iframe').addClass('with-titlebar').data('cancel-reload', true)},
hidden: refresh
});
return false;
return false;
});
setTimeout(function(){$('#kanban .c-side.has-btn').removeAttr('title');}, 500);
});
module/project/lang/en.php
+1
View File
@@ -36,6 +36,7 @@ $lang->project->release = 'Release';
$lang->project->acl = 'ACL';
$lang->project->teamname = 'Team Name';
$lang->project->order = "Rank {$lang->projectCommon}";
$lang->project->orderAB = "Rank";
$lang->project->products = "Link {$lang->productCommon}";
$lang->project->whitelist = 'Whitelist';
$lang->project->totalEstimate = 'Estimates';
module/project/lang/zh-cn.php
+1
View File
@@ -36,6 +36,7 @@ $lang->project->release = '发布';
$lang->project->acl = '访问控制';
$lang->project->teamname = '团队名称';
$lang->project->order = $lang->projectCommon . '排序';
$lang->project->orderAB = '排序';
$lang->project->products = '相关' . $lang->productCommon;
$lang->project->whitelist = '分组白名单';
$lang->project->totalEstimate = '预计';
module/project/view/all.html.php
+3 -2
View File
@@ -43,7 +43,8 @@
</th>
<th><?php common::printOrderLink('name', $orderBy, $vars, $lang->project->name);?></th>
<th class='w-100px'><?php common::printOrderLink('code', $orderBy, $vars, $lang->project->code);?></th>
<th class='w-100px'><?php common::printOrderLink('PM', $orderBy, $vars, $lang->project->PM);?></th>
<?php $colWidth = $app->getClientLang() == 'en' ? 'w-130px' : '1-100px';?>
<th class='<?php echo $colWidth;?>'><?php common::printOrderLink('PM', $orderBy, $vars, $lang->project->PM);?></th>
<th class='w-90px'><?php common::printOrderLink('end', $orderBy, $vars, $lang->project->end);?></th>
<th class='w-90px'><?php common::printOrderLink('status', $orderBy, $vars, $lang->project->status);?></th>
<th class='w-70px'><?php echo $lang->project->totalEstimate;?></th>
@@ -52,7 +53,7 @@
<th class='w-150px'><?php echo $lang->project->progress;?></th>
<th class='w-100px'><?php echo $lang->project->burn;?></th>
<?php if($canOrder):?>
<th class='w-60px sort-default'><?php common::printOrderLink('order', $orderBy, $vars, $lang->project->updateOrder);?></th>
<th class='w-60px sort-default'><?php common::printOrderLink('order', $orderBy, $vars, $lang->project->orderAB);?></th>
<?php endif;?>
</tr>
</thead>
module/project/view/bug.html.php
+3 -3
View File
@@ -54,9 +54,9 @@
<th class='w-80px'> <?php common::printOrderLink('severity', $orderBy, $vars, $lang->bug->severityAB);?></th>
<th class='c-pri'> <?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
<th> <?php common::printOrderLink('title', $orderBy, $vars, $lang->bug->title);?></th>
<th class='w-user'> <?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
<th class='w-110px c-assignedTo'><?php common::printOrderLink('assignedTo', $orderBy, $vars, $lang->assignedToAB);?></th>
<th class='w-user'> <?php common::printOrderLink('resolvedBy', $orderBy, $vars, $lang->bug->resolvedBy);?></th>
<th class='c-user'> <?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
<th class='w-110px c-user'><?php common::printOrderLink('assignedTo', $orderBy, $vars, $lang->assignedToAB);?></th>
<th class='c-user'> <?php common::printOrderLink('resolvedBy', $orderBy, $vars, $lang->bug->resolvedBy);?></th>
<th class='w-resolution'><?php common::printOrderLink('resolution', $orderBy, $vars, $lang->bug->resolutionAB);?></th>
<th class='c-actions-5'><?php echo $lang->actions;?></th>
</tr>
module/project/view/linkstory.html.php
+1 -1
View File
@@ -48,7 +48,7 @@
<?php if($productType != 'normal'):?>
<th class='w-80px'><?php echo $lang->product->branchName[$productType];?></th>
<?php endif;?>
<th class='w-user'><?php echo $lang->openedByAB;?></th>
<th class='c-user'><?php echo $lang->openedByAB;?></th>
<th class='w-80px text-center'><?php echo $lang->story->estimateAB;?></th>
</tr>
</thead>
module/project/view/manageproducts.html.php
+6 -16
View File
@@ -27,16 +27,11 @@
<?php $checked = 'checked';?>
<div class='col-sm-4'>
<div class='product <?php echo $checked . (isset($branchGroups[$productID]) ? ' has-branch' : '')?>'>
<div class="checkbox-primary">
<div class="checkbox-primary" title='<?php echo $productName;?>'>
<?php echo "<input type='checkbox' name='products[$productID]' value='$productID' $checked id='products{$productID}'>";?>
<label class='text-ellipsis checkbox-inline' for='<?php echo 'products'. $productID?>';><?php echo $productName;?></label>
<label class='text-ellipsis checkbox-inline' for='<?php echo 'products' . $productID;?>' title='<?php echo $productName;?>'><?php echo $productName;?></label>
</div>
<?php
if(isset($branchGroups[$productID]))
{
echo html::select("branch[$productID]", $branchGroups[$productID], $linkedProducts[$productID]->branch, "class='form-control chosen'");
}
?>
<?php if(isset($branchGroups[$productID])) echo html::select("branch[$productID]", $branchGroups[$productID], $linkedProducts[$productID]->branch, "class='form-control chosen'");?>
</div>
</div>
<?php unset($allProducts[$productID]);?>
@@ -50,16 +45,11 @@
<?php foreach($allProducts as $productID => $productName):?>
<div class='col-sm-4'>
<div class='product<?php echo isset($branchGroups[$productID]) ? ' has-branch' : ''?>'>
<div class="checkbox-primary">
<div class="checkbox-primary" title='<?php echo $productName;?>'>
<?php echo "<input type='checkbox' name='products[$productID]' value='$productID' id='products{$productID}'>";?>
<label class='text-ellipsis checkbox-inline' for='<?php echo 'products'. $productID?>';><?php echo $productName;?></label>
<label class='text-ellipsis checkbox-inline' for='<?php echo 'products' . $productID;?>'><?php echo $productName;?></label>
</div>
<?php
if(isset($branchGroups[$productID]))
{
echo html::select("branch[$productID]", $branchGroups[$productID], '', "class='form-control chosen'");
}
?>
<?php if(isset($branchGroups[$productID])) echo html::select("branch[$productID]", $branchGroups[$productID], '', "class='form-control chosen'");?>
</div>
</div>
<?php endforeach;?>
module/project/view/story.html.php
+1 -1
View File
@@ -104,7 +104,7 @@
<?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
</th>
<?php if($canOrder):?>
<th class='w-80px c-sort {sorter:false}'> <?php common::printOrderLink('order', $orderBy, $vars, $lang->project->updateOrder);?></th>
<th class='w-60px c-sort {sorter:false}'> <?php common::printOrderLink('order', $orderBy, $vars, $lang->project->orderAB);?></th>
<?php endif;?>
<th class='c-pri {sorter:false}'> <?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
<th class='c-name {sorter:false}'> <?php common::printOrderLink('title', $orderBy, $vars, $lang->story->title);?></th>
module/project/view/view.html.php
+1 -1
View File
@@ -133,7 +133,7 @@
<?php $i++;?>
<?php endforeach;?>
<div class="col-xs-6">
<?php common::printLink('doc', 'createLib', "type=project&objectID=$project->id", "<i class='icon icon-plus hl-primary text-primary'></i> &nbsp;" . $lang->doc->createLib, '', "class='text-muted iframe'");?>
<?php common::printLink('doc', 'createLib', "type=project&objectID=$project->id", "<i class='icon icon-plus hl-primary text-primary'></i> &nbsp;" . $lang->doc->createLib, '', "class='text-muted iframe' data-width='1000px'");?>
</div>
<?php endif;?>
</div>
module/report/view/blockreportlist.html.php
+1 -1
View File
@@ -11,7 +11,7 @@
$list .= '|';
list($label, $module, $method, $params) = explode('|', $list);
$class = $label == $title ? 'selected' : '';
if(common::hasPriv($module, $method)) echo html::a($this->createLink($module, $method, $params), '<i class="icon icon-file-text"></i> ' . $label, '', "class='$class'");
if(common::hasPriv($module, $method)) echo html::a($this->createLink($module, $method, $params), '<i class="icon icon-file-text"></i> ' . $label, '', "class='$class' title='$label'");
}
?>
</div>
module/task/control.php
+1 -1
View File
@@ -1200,7 +1200,7 @@ class task extends control
* @access public
* @return void
*/
public function report($projectID, $browseType = 'all', $chartType = '')
public function report($projectID, $browseType = 'all', $chartType = 'default')
{
$this->loadModel('report');
$this->view->charts = array();
module/task/lang/en.php
+1 -1
View File
@@ -98,7 +98,7 @@ $lang->task->closedReason = 'CloseReason';
$lang->task->lastEditedBy = 'ModifiedBy';
$lang->task->lastEditedDate = 'ModifiedDate';
$lang->task->lastEdited = 'Last Edited';
$lang->task->recordEstimate = '%';
$lang->task->recordEstimate = 'Effort';
$lang->task->editEstimate = 'Edit Estimates';
$lang->task->deleteEstimate = 'Delete Estimates';
$lang->task->colorTag = 'Color';
module/task/model.php
+1 -1
View File
@@ -406,7 +406,7 @@ class taskModel extends model
{
$childTask = $this->dao->select('*')->from(TABLE_TASK)->where('id')->eq($taskID)->fetch();
if(empty($parentID)) $parentID = $childTask->parent;
if(empty($parentID)) return true;
if($parentID <= 0) return true;
$this->computeWorkingHours($parentID);
module/task/view/recordestimate.html.php
+3 -2
View File
@@ -41,8 +41,9 @@
<tr class='text-center'>
<th class="w-id"><?php echo $lang->idAB;?></th>
<th class="w-120px"><?php echo $lang->task->date;?></th>
<th class="w-60px"><?php echo $lang->task->consumedThisTime;?></th>
<th class="w-60px"><?php echo $lang->task->leftThisTime;?></th>
<?php $colWidth = $app->getClientLang() == 'en' ? 'w-90px' : 'w-70px';?>
<th class="<?php echo $colWidth;?>"><?php echo $lang->task->consumed;?></th>
<th class="<?php echo $colWidth;?>"><?php echo $lang->task->left;?></th>
<th><?php echo $lang->comment;?></th>
<th class='c-actions-2'><?php if(empty($task->team) or $task->assignedTo == $this->app->user->account) echo $lang->actions;?></th>
</tr>
module/testcase/config.php
+1 -1
View File
@@ -118,7 +118,7 @@ $config->testcase->datatable->fieldList['keywords']['required'] = 'no';
$config->testcase->datatable->fieldList['assignedTo']['title'] = 'assignedTo';
$config->testcase->datatable->fieldList['assignedTo']['fixed'] = 'no';
$config->testcase->datatable->fieldList['assignedTo']['width'] = '80';
$config->testcase->datatable->fieldList['assignedTo']['width'] = '120';
$config->testcase->datatable->fieldList['assignedTo']['required'] = 'no';
$config->testcase->datatable->fieldList['openedBy']['title'] = 'openedByAB';
module/testcase/css/browse.css
+1 -1
View File
@@ -20,4 +20,4 @@
tbody > tr > td > .btn-icon {margin-right: 3px;}
tbody > tr > td .icon-bug {margin-left: -8px;}
.table td.c-title > a:first-child{max-width: 70%; max-width: calc(100% - 100px); display: inline-block; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
.table td.c-title > a:first-child{display: inline-block; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
module/testtask/js/groupcase.js
+1
View File
@@ -1,4 +1,5 @@
$(document).ready(function()
{
$('#' + browseType + 'Tab').addClass('active');
$('.c-side.has-btn').removeAttr('title');
});
module/user/view/batchcreate.html.php
+1 -1
View File
@@ -25,7 +25,7 @@
$visibleFields = array();
foreach(explode(',', $showFields) as $field)
{
if(strpos(",{$config->user->customBatchCreateFields},", $field) === false) continue;
if(strpos(",{$config->user->customBatchCreateFields},", ",{$field},") === false) continue;
if($field) $visibleFields[$field] = '';
}
$minWidth = (count($visibleFields) > 5) ? 'w-150px' : '';
module/user/view/batchedit.html.php
+1 -1
View File
@@ -24,7 +24,7 @@
$visibleFields = array();
foreach(explode(',', $showFields) as $field)
{
if(strpos(",{$config->user->customBatchEditFields},", $field) === false) continue;
if(strpos(",{$config->user->customBatchEditFields},", ",{$field},") === false) continue;
if($field)$visibleFields[$field] = '';
}
$minWidth = (count($visibleFields) > 7) ? 'w-120px' : '';
module/user/view/profile.html.php
+1 -1
View File
@@ -96,7 +96,7 @@
<?php endforeach;?>
<?php endif;?>
<dt><?php echo $lang->user->address;?></dt>
<dd><?php echo $user->address;?></dd>
<dd title='<?php echo $user->address;?>'><?php echo $user->address;?></dd>
<dt><?php echo $lang->user->zipcode;?></dt>
<dd><?php echo $user->zipcode;?></dd>
</dl>
module/user/view/testcase.html.php
+2 -2
View File
@@ -39,11 +39,11 @@
<th class='w-pri'> <?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
<th> <?php common::printOrderLink('title', $orderBy, $vars, $lang->testcase->title);?></th>
<th class='w-type'> <?php common::printOrderLink('type', $orderBy, $vars, $lang->typeAB);?></th>
<th class='w-user'> <?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
<th class='c-user'> <?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
<th class='w-80px'> <?php common::printOrderLink('lastRunner', $orderBy, $vars, $lang->testtask->lastRunAccount);?></th>
<th class='w-120px'> <?php common::printOrderLink('lastRunDate', $orderBy, $vars, $lang->testtask->lastRunTime);?></th>
<th class='w-80px'> <?php common::printOrderLink('lastRunResult', $orderBy, $vars, $lang->testtask->lastRunResult);?></th>
<th class='w-status'><?php common::printOrderLink('status', $orderBy, $vars, $lang->statusAB);?></th>
<th class='c-status'><?php common::printOrderLink('status', $orderBy, $vars, $lang->statusAB);?></th>
</tr>
</thead>
<tbody>
module/webhook/view/log.html.php
+1 -1
View File
@@ -21,7 +21,7 @@
<div class='btn-toolbar pull-right'>
<div class='btn-group'>
<div class='btn-group' id='createActionMenu'>
<?php common::printLink('admin', 'log', '', "<i class='icon icon-cog'> </i>" . $lang->webhook->setting, '', "class='btn btn-primary'");?>
<?php common::printLink('admin', 'log', '', "<i class='icon icon-cog'> </i>" . $lang->webhook->setting, '', "class='btn btn-primary iframe'", '', true);?>
</div>
</div>
</div>
xuanxuan/module/chat/ext/lang/en/xuanxuan.php
+1 -1
View File
@@ -1,5 +1,5 @@
<?php
$lang->chat->common = 'Xuanxuan';
$lang->chat->common = 'Desktop';
$lang->chat->turnon = 'On';
$lang->chat->help = 'Help';
$lang->chat->settings = 'Settings';