Merge branch '18.x' into ipd1.1

This commit is contained in:
tanghucheng
2023-09-13 03:23:50 -04:00
1091 changed files with 130798 additions and 4093 deletions
+12 -2
View File
@@ -3,6 +3,14 @@
<?php $datatableId = $this->moduleName . ucfirst($this->methodName);?>
<?php js::set('currentMethod', $this->app->rawMethod)?>
<?php js::set('currentModule', $this->app->rawModule)?>
<?php
$showSwitchLink = true;
if($currentModule == 'product' && $currentMethod == 'browse') $showSwitchLink = false;
if($currentModule == 'projectstory' && $currentMethod == 'story') $showSwitchLink = false;
if($currentModule == 'project' && $currentMethod == 'bug') $showSwitchLink = false;
if($currentModule == 'execution' && strpos(',all,task,bug,', ",{$currentMethod},") !== false) $showSwitchLink = false;
if($currentModule == 'bug' && $currentMethod == 'browse') $showSwitchLink = false;
?>
<style>
#setShowModule {margin-left: 30px;}
@@ -40,11 +48,13 @@ $(function()
{
$dropmenu.append("<li><a href='<?php echo $this->createLink('datatable', 'ajaxCustom', 'id=' . $this->moduleName . '&method=' . $this->methodName)?>' data-toggle='modal' data-type='ajax'><?php echo $lang->datatable->custom?></a></li>");
}
if(!(currentModule == 'execution' && currentMethod == 'all')) $dropmenu.append("<li><a href='javascript:saveDatatableConfig(\"mode\", \"<?php echo $mode == 'table' ? 'datatable' : 'table';?>\", true);' id='switchToDatatable'><?php echo $mode == 'table' ? $lang->datatable->switchToDatatable : $lang->datatable->switchToTable;?></a></li>");
<?php if($showSwitchLink):?>
$dropmenu.append("<li><a href='javascript:saveDatatableConfig(\"mode\", \"<?php echo $mode == 'table' ? 'datatable' : 'table';?>\", true);' id='switchToDatatable'><?php echo $mode == 'table' ? $lang->datatable->switchToDatatable : $lang->datatable->switchToTable;?></a></li>");
<?php endif;?>
$dropdown.append($dropmenu)
.appendTo($btnToolbar)
.on('shown.zui.dropdown', function(){$btnToolbar.closest('.table-header').css('z-index', 11);})
.on('hidden.zui.dropdown', function(){$btnToolbar.closest('.table-header').css('z-index', 5);});
.on('hidden.zui.dropdown', function(){$btnToolbar.closest('.table-header').css('z-index', 11);});
}
};
$('#main .main-table').on('tableReload', addSettingButton);