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

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

Browse Source
This commit is contained in:
wangyidong
2019-02-25 08:54:56 +08:00
parent 3e7caa0da1 79659b0282
commit 36de63e1fe
11 changed files with 50 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/company/control.php
+2
View File
@@ -71,6 +71,8 @@ class company extends control
/* Get users. */
$users = $this->company->getUsers($type, $queryID, $deptID, $sort, $pager);
/* Remove passwd. */
foreach($users as $user) $user->password = '';
/* Assign. */
$this->view->title = $this->lang->company->index . $this->lang->colon . $this->lang->dept->common;
module/custom/control.php
+10
View File
@@ -79,6 +79,11 @@ class custom extends control
$this->app->loadConfig('user');
$this->view->showDeleted = isset($this->config->user->showDeleted) ? $this->config->user->showDeleted : '0';
}
if($module == 'user' and $field == 'showField')
{
$this->app->loadConfig('user');
$this->view->showFields = isset($this->config->user->showFields) ? $this->config->user->showFields : '';
}
if(strtolower($this->server->request_method) == "post")
{
@@ -117,6 +122,11 @@ class custom extends control
$data = fixer::input('post')->get();
$this->loadModel('setting')->setItem('system.user.showDeleted', $data->showDeleted);
}
elseif($module == 'user' and $field == 'showField')
{
$data = fixer::input('post')->join('showFields', ',')->get();
$this->loadModel('setting')->setItem('system.user.showFields', $data->showFields);
}
else
{
$lang = $_POST['lang'];
module/custom/lang/en.php
+7
View File
@@ -75,6 +75,7 @@ $lang->custom->user = new stdClass();
$lang->custom->user->fields['roleList'] = 'Role';
$lang->custom->user->fields['statusList'] = 'Status';
$lang->custom->user->fields['deleted'] = 'Deleted User';
$lang->custom->user->fields['showField'] = 'Show Field';
$lang->custom->block->fields['closed'] = 'Closed Block';
@@ -84,6 +85,7 @@ $lang->custom->allLang = 'All Language';
$lang->custom->confirmRestore = 'Do you want to reset to Default?';
$lang->custom->notice = new stdclass();
$lang->custom->notice->userFieldNotice = 'Control whether the above fields are displayed on the user-related page, and leave blank to display all';
$lang->custom->notice->canNotAdd = 'It will be calculated, so customization is not enabled.';
$lang->custom->notice->forceReview = '%s Review is required for certain submitters.';
$lang->custom->notice->forceNotReview = "%s Review is NOT required for certain submitters.";
@@ -109,6 +111,11 @@ $lang->custom->reviewList[0] = 'Off';
$lang->custom->deletedList[1] = 'Show';
$lang->custom->deletedList[0] = 'Hide';
$lang->custom->userFieldList['wechat'] = 'Wechat';
$lang->custom->userFieldList['dingding'] = 'Dingding';
$lang->custom->userFieldList['slact'] = 'Slact';
$lang->custom->userFieldList['whatsapp'] = 'WhatsApp';
$lang->custom->workingHours = 'hours/day';
$lang->custom->weekend = 'Weekend';
$lang->custom->weekendList[2] = '2-Day Off';
module/custom/lang/zh-cn.php
+6
View File
@@ -85,6 +85,7 @@ $lang->custom->allLang = '适用所有语言';
$lang->custom->confirmRestore = '是否要恢复默认配置？';
$lang->custom->notice = new stdclass();
$lang->custom->notice->userFieldNotice = '控制以上字段在用户相关页面是否显示，留空则全部显示';
$lang->custom->notice->canNotAdd = '该项参与运算，不提供自定义添加功能';
$lang->custom->notice->forceReview = "指定人提交的%s必须评审。";
$lang->custom->notice->forceNotReview = "指定人提交的%s不需要评审。";
@@ -110,6 +111,11 @@ $lang->custom->reviewList[0] = '关闭';
$lang->custom->deletedList[1] = '列出';
$lang->custom->deletedList[0] = '不列出';
$lang->custom->userFieldList['wechat'] = '微信';
$lang->custom->userFieldList['dingding'] = '钉钉';
$lang->custom->userFieldList['slact'] = 'Slact';
$lang->custom->userFieldList['whatsapp'] = 'WhatsApp';
$lang->custom->workingHours = '每天可用工时';
$lang->custom->weekend = '休息日';
$lang->custom->weekendList[2] = '双休';
module/custom/view/set.html.php
+15
View File
@@ -139,6 +139,21 @@ EOT;
<td><?php echo html::submitButton();?></td>
</tr>
</table>
<?php elseif($module == 'user' and $field == 'showField'):?>
<table class='table table-form mw-600px'>
<tr>
<th class='w-100px'><?php echo $lang->custom->user->fields['showField'];?></th>
<td><?php echo html::select('showFields[]', $lang->custom->userFieldList, $showFields, "class='form-control chosen' multiple");?></td>
</tr>
<tr>
<th></th>
<td><span class='text-warning'><?php echo $lang->custom->notice->userFieldNotice;?></span></td>
</tr>
<tr>
<td></td>
<td><?php echo html::submitButton();?></td>
</tr>
</table>
<?php else:?>
<table class='table table-form active-disabled table-condensed mw-600px'>
<tr class='text-center'>
module/doc/control.php
+4 -4
View File
@@ -44,7 +44,7 @@ class doc extends control
$pager = new pager(0, 5, 1);
$this->lang->modulePageActions = $this->doc->setFastMenu($this->lang->doc->fast);
$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='45%'") : '';
$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='50%'") : '';
$actionURL = $this->createLink('doc', 'browse', "lib=0&browseType=bySearch&queryID=myQueryID");
$this->doc->buildSearchForm(0, array(), 0, $actionURL, 'index');
@@ -328,7 +328,7 @@ class doc extends control
$this->product->setMenu($this->product->getPairs(), $lib->product);
$this->lang->set('menugroup.doc', 'product');
$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='45%'") : '';
$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='50%'") : '';
}
elseif($this->from == 'project')
{
@@ -337,7 +337,7 @@ class doc extends control
$this->project->setMenu($this->project->getPairs('nocode'), $lib->project);
$this->lang->set('menugroup.doc', '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='45%'") : '';
$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='50%'") : '';
}
else
{
@@ -803,7 +803,7 @@ 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='45%'") : '';
$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='50%'") : '';
$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 -1
View File
@@ -23,7 +23,7 @@
<table class='table table-form'>
<tr>
<th class='w-80px'><?php echo $lang->doc->libType?></th>
<td colspan='2'><?php echo html::radio('type', $libTypeList, "product")?></td>
<td colspan='2'><?php echo html::radio('type', $libTypeList, $type ? $type : 'product')?></td>
</tr>
<tr class='product'>
<th><?php echo $lang->doc->product?></th>
module/doc/view/side.html.php
+1 -1
View File
@@ -125,7 +125,7 @@ if(empty($type)) $type = 'product';
<li>
<?php
$text = zget($lang->doclib->create, $tabValue, '');
if($text) echo html::a($this->createLink('doc', 'createLib', "type={$tabValue}"), $text, '', "class='iframe'");
if($text) echo html::a($this->createLink('doc', 'createLib', "type={$tabValue}"), $text, '', "class='iframe' data-width='50%'");
?>
</li>
<?php else:?>
module/user/lang/en.php
+4 -2
View File
@@ -30,9 +30,11 @@ $lang->user->verify = 'Verification';
$lang->user->contactInfo = 'Contact';
$lang->user->skype = 'Skype';
$lang->user->qq = 'QQ';
$lang->user->yahoo = 'Yahoo!';
$lang->user->wechat = 'Wechat';
$lang->user->dingding = 'Dingding';
$lang->user->slack = 'Slack';
$lang->user->whatsapp = 'WhatsApp';
$lang->user->gtalk = 'GTalk';
$lang->user->wangwang = 'Wangwang';
$lang->user->mobile = 'Mobile';
$lang->user->phone = 'Phone';
$lang->user->address = 'Address';
module/user/lang/zh-cn.php
-1
View File
@@ -31,7 +31,6 @@ $lang->user->contactInfo = '联系信息';
$lang->user->skype = 'Skype';
$lang->user->qq = 'QQ';
$lang->user->gtalk = 'GTalk';
$lang->user->wangwang = '旺旺';
$lang->user->mobile = '手机';
$lang->user->phone = '电话';
$lang->user->weixin = '微信';
module/user/lang/zh-tw.php
-2
View File
@@ -30,9 +30,7 @@ $lang->user->verify = '安全驗證';
$lang->user->contactInfo = '聯繫信息';
$lang->user->skype = 'Skype';
$lang->user->qq = 'QQ';
$lang->user->yahoo = '雅虎通';
$lang->user->gtalk = 'GTalk';
$lang->user->wangwang = '旺旺';
$lang->user->mobile = '手機';
$lang->user->phone = '電話';
$lang->user->address = '通訊地址';