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:
Catouse
2018-09-13 12:03:29 +08:00
parent a22350a027 4a8dc230ab
commit 69091fc300
10 changed files with 40 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
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-cog'></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-circle'></i>" : "<i class='icon icon-chart-{$type}'></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/common/lang/en.php
+1
View File
@@ -372,6 +372,7 @@ $lang->admin->menu->safe = array('link' => 'Security|admin|safe', 'alias' =
$lang->admin->menu->cron = array('link' => 'Cron|cron|index', 'subModule' => 'cron');
$lang->admin->menu->trashes = array('link' => 'Recycle|action|trash', 'subModule' => 'action');
$lang->admin->menu->dev = array('link' => 'Develop|dev|api', 'alias' => 'db', 'subModule' => 'dev,editor');
$lang->admin->menu->entry = 'Entry|entry|browse';
$lang->admin->menu->sso = 'Zdoo|admin|sso';
$lang->convert = new stdclass();
module/common/lang/menuOrder.php
+1
View File
@@ -115,6 +115,7 @@ $lang->admin->menuOrder[45] = 'dev';
$lang->admin->menuOrder[50] = 'safe';
$lang->admin->menuOrder[53] = 'api';
$lang->admin->menuOrder[55] = 'sso';
$lang->admin->menuOrder[57] = 'entry';
$lang->admin->menuOrder[60] = 'trashes';
$lang->convert->menuOrder = $lang->admin->menuOrder;
$lang->upgrade->menuOrder = $lang->admin->menuOrder;
module/common/lang/zh-cn.php
+1
View File
@@ -372,6 +372,7 @@ $lang->admin->menu->safe = array('link' => '安全|admin|safe', 'alias' =>
$lang->admin->menu->cron = array('link' => '计划任务|cron|index', 'subModule' => 'cron');
$lang->admin->menu->trashes = array('link' => '回收站|action|trash', 'subModule' => 'action');
$lang->admin->menu->dev = array('link' => '二次开发|dev|api', 'alias' => 'db', 'subModule' => 'dev,editor');
$lang->admin->menu->entry = '应用|entry|browse';
$lang->admin->menu->sso = '然之集成|admin|sso';
$lang->convert = new stdclass();
module/doc/model.php
+1 -1
View File
@@ -517,7 +517,7 @@ class docModel extends model
$stmt = $this->dao->select('*')->from(TABLE_DOC)
->where('deleted')->eq(0)
->beginIF($libID)->andWhere('lib')->in($libID)->fi()
->andWhere('module')->in($module)
->beginIF(!empty($module))->andWhere('module')->in($module)->fi()
->query();
module/entry/view/create.html.php
+1 -1
View File
@@ -55,7 +55,7 @@
<tr>
<th></th>
<td>
<?php echo html::submitButton();?>
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
<?php echo html::a($config->entry->help, $lang->entry->help, '_blank', "class='help'");?>
</td>
<td></td>
module/task/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-cog'></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-circle'></i>" : "<i class='icon icon-chart-{$type}'></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/testtask/view/groupcase.html.php
+1 -1
View File
@@ -25,7 +25,7 @@
</div>
</th>
<th class='c-id-sm'><?php echo $lang->idAB;?></th>
<th class='w-pri'> <?php echo $lang->priAB;?></th>
<th class='w-80px'> <?php echo $lang->priAB;?></th>
<th><?php echo $lang->testcase->title;?></th>
<th class='w-80px'> <?php echo $lang->typeAB;?></th>
<th class='w-user'> <?php echo $lang->testtask->assignedTo;?></th>
module/testtask/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-cog'></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-circle'></i>" : "<i class='icon icon-chart-{$type}'></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/upgrade/model.php
+31
View File
@@ -233,6 +233,9 @@ class upgradeModel extends model
$this->execSQL($xuanxuanSql);
case '10_2':
case '10_3':
case '10_3_1':
$this->execSQL($this->getUpgradeFile('10.3.1'));
$this->removeCustomMenu();
}
$this->deletePatch();
@@ -347,6 +350,7 @@ class upgradeModel extends model
case '10_1': $confirmContent .= file_get_contents($this->app->getAppRoot() . 'db' . DS . 'xuanxuan.sql');
case '10_2':
case '10_3':
case '10_3_1': $confirmContent .= file_get_contents($this->getUpgradeFile('10.3.1'));
}
return str_replace('zt_', $this->config->db->prefix, $confirmContent);
}
@@ -2398,4 +2402,31 @@ class upgradeModel extends model
return !dao::isError();
}
/**
* Remove custom menu.
*
* @access public
* @return bool
*/
public function removeCustomMenu()
{
$customMenuMain = $this->dao->select('*')->from(TABLE_CONFIG)->where('module')->eq('common')->andWhere('section')->eq('customMenu')->andWhere('`key`')->eq('full_main')->fetchAll('id');
foreach($customMenuMain as $mainMenu)
{
$mainMenuValue = json_decode($mainMenu->value);
foreach($mainMenuValue as $menu)
{
/* If has admin in custom value, then delete old custom menu config. */
if($menu->name == 'admin')
{
$this->dao->delete()->from(TABLE_CONFIG)->where('module')->eq('common')
->andWhere('section')->eq('customMenu')
->andWhere('owner')->eq($mainMenu->owner)
->exec();
}
}
}
return !dao::isError();
}
}