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

Merge branch 'sprint/224_hufangzhou_doc'

Browse Source
This commit is contained in:
wangyidong
2022-08-12 16:42:20 +08:00
parent 38f8f8c0ba c7f587ef5a
commit a7da22c833
8 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/admin/view/tableengine.html.php
-2
View File
@@ -54,12 +54,10 @@ function changeAllEngines()
$('.btn.changeEngine').hide();
$engineBox.empty();
for(i in tables);
$.each(tables, function(_, table)
{
changeEngine(table);
});
$engineBox.append("<div><a href='javascript:location.reload();' class='btn'>{$lang->refresh}</a>"?></div>");
}
/**
module/doc/lang/de.php
+1
View File
@@ -154,6 +154,7 @@ $lang->doc->allCollections = 'All Collections';
$lang->doc->keywordsTips = 'Please use commas to separate multiple keywords.';
$lang->doc->sortLibs = 'Sort Libs';
$lang->doc->titlePlaceholder = 'Please enter the title';
$lang->doc->confirm = 'Confirm';
global $config;
/* Query condition list. */
module/doc/lang/en.php
+1
View File
@@ -154,6 +154,7 @@ $lang->doc->allCollections = 'All Collections';
$lang->doc->keywordsTips = 'Please use commas to separate keywords.';
$lang->doc->sortLibs = 'Sort Libs';
$lang->doc->titlePlaceholder = 'Please enter the title';
$lang->doc->confirm = 'Confirm';
global $config;
/* Query condition list. */
module/doc/lang/fr.php
+1
View File
@@ -154,6 +154,7 @@ $lang->doc->allCollections = 'All Collections';
$lang->doc->keywordsTips = 'Please use commas to separate multiple keywords.';
$lang->doc->sortLibs = 'Sort Libs';
$lang->doc->titlePlaceholder = 'Veuillez saisir le titre';
$lang->doc->confirm = 'Confirm';
global $config;
/* Query condition list. */
module/doc/lang/zh-cn.php
+1
View File
@@ -154,6 +154,7 @@ $lang->doc->allCollections = '查看全部收藏文档';
$lang->doc->keywordsTips = '多个关键字请用逗号分隔。';
$lang->doc->sortLibs = '文档库排序';
$lang->doc->titlePlaceholder = '请输入标题';
$lang->doc->confirm = '确认';
global $config;
/* 查询条件列表 */
module/doc/view/createtexttype.html.php
+4 -14
View File
@@ -46,12 +46,7 @@
#noticeAcl {margin-left: 10px; vertical-align: middle;}
#moreList {display: inline-block; padding: 7px;}
#moreList .icon-more-circle {font-size: 20px;}
#moreList ul.dropdown-menu {left: -77px;}
#backBtn {border: unset;}
#backBtn i {font-size: 20px;}
#basicInfoLink {border: unset;}
.modal-title {font-size: 14px !important; font-weight: 700 !important;}
</style>
@@ -64,16 +59,11 @@
<table class='table table-form'>
<tbody>
<tr id='headerBox'>
<td width='50px'><?php echo html::linkButton("<i class='icon icon-back-circle'></i>", $backLink, 'self', "id='backBtn'");?></td>
<td width='90px'><?php echo html::a($backLink, '<i class="icon icon-back icon-sm"></i> ' . $lang->goback, '', "class='btn btn-secondary' id='backBtn'");?></td>
<td class="doc-title" colspan='3'><?php echo html::input('title', '', "placeholder='{$lang->doc->titlePlaceholder}' class='form-control' required");?></td>
<td class="text-right">
<?php echo html::submitButton('', "data-placement='bottom'", 'btn btn-primary');?>
<div id="moreList" class="dropdown dropdown-hover">
<?php echo html::a('#', "<i class='icon icon-more-circle'></i>");?>
<ul class="dropdown-menu">
<li><?php echo html::a('#modalBasicInfo', $lang->doc->basicInfo, '', "data-toggle='modal' id='basicInfoLink'");?><li>
</ul>
</div>
<?php echo html::a('#modalBasicInfo', "<i class='icon icon-cog-outline'></i> " . $lang->settings, '', "data-toggle='modal' id='basicInfoLink' class='btn'");?>
</td>
</tr>
<tr>
@@ -154,7 +144,7 @@
</tbody>
<tfoot>
<tr>
<td colspan='3' class='text-center'><?php echo html::a('javascript:void(0)', $lang->close, '', "class='btn btn-primary btn-wide'");?></td>
<td colspan='3' class='text-center'><?php echo html::a('javascript:void(0)', $lang->doc->confirm, '', "class='btn btn-primary btn-wide'");?></td>
</tr>
</tfoot>
</table>
module/doc/view/edittexttype.html.php
+4 -18
View File
@@ -49,12 +49,7 @@
#noticeAcl {margin-left: 10px; vertical-align: middle;}
#moreList {display: inline-block; padding: 7px;}
#moreList .icon-more-circle {font-size: 20px;}
#moreList ul.dropdown-menu {left: -77px;}
#backBtn {border: unset;}
#backBtn i {font-size: 20px;}
#basicInfoLink {border: unset;}
.modal-title {font-size: 14px !important; font-weight: 700 !important;}
</style>
@@ -64,20 +59,11 @@
<table class='table table-form'>
<tbody>
<tr id='headerBox'>
<?php if($from == 'create'):?>
<td width='50px'><?php echo html::linkButton("<i class='icon icon-back-circle'></i>", $backLink, 'self', "id='backBtn'");?></td>
<?php else:?>
<td width='50px'><?php echo html::backButton("<i class='icon icon-back-circle'></i>", "id='backBtn'", '');?></td>
<?php endif;?>
<td width='90px'><?php echo html::backButton("<i class='icon icon-back icon-sm'></i> " . $lang->goback, "id='backBtn'", 'btn btn-secondary');?></td>
<td class="doc-title" colspan='3'><?php echo html::input('title', $doc->title, "placeholder='{$lang->doc->titlePlaceholder}' class='form-control' required");?></td>
<td class="text-right">
<?php echo html::submitButton('', "data-placement='bottom'", 'btn btn-primary');?>
<div id="moreList" class="dropdown dropdown-hover">
<?php echo html::a('#', "<i class='icon icon-more-circle'></i>");?>
<ul class="dropdown-menu">
<li><?php echo html::a('#modalBasicInfo', $lang->doc->basicInfo, '', "data-toggle='modal' id='basicInfoLink'");?><li>
</ul>
</div>
<?php echo html::a('#modalBasicInfo', "<i class='icon icon-cog-outline'></i> " . $lang->settings, '', "data-toggle='modal' id='basicInfoLink' class='btn'");?>
</td>
</tr>
<tr>
@@ -155,7 +141,7 @@
</tr>
<tfoot>
<tr>
<td colspan='3' class='text-center'><?php echo html::a('javascript:void(0)', $lang->close, '', "class='btn btn-primary btn-wide'");?></td>
<td colspan='3' class='text-center'><?php echo html::a('javascript:void(0)', $lang->doc->confirm, '', "class='btn btn-primary btn-wide'");?></td>
</tr>
</tfoot>
</table>
module/upgrade/model.php
+22
View File
@@ -533,6 +533,15 @@ class upgradeModel extends model
case '17_4':
$this->rebuildFULLTEXT();
$this->updateSearchIndex();
if(!$executedXuanxuan)
{
$table = $this->config->db->prefix . 'im_chat';
$result = $this->checkFieldsExists($table, 'adminInvite');
if($result->rowCount() == 0)
{
$this->dbh->query("ALTER TABLE $table ADD `adminInvite` enum('0','1') NOT NULL DEFAULT '0' AFTER `mergedChats`");
}
}
break;
}
@@ -7065,4 +7074,17 @@ class upgradeModel extends model
return true;
}
/**
* Check whether the field exists.
*
* @param string $table
* @param string $field
* @access public
* @return object
*/
public function checkFieldsExists($table, $field)
{
return $this->dbh->query("show columns from `$table` like '$field'");
}
}