* Fix bug #36920.
This commit is contained in:
@@ -2,7 +2,7 @@ $(function()
|
||||
{
|
||||
var fileName = dataview != '' ? dataview.name : '';
|
||||
var exportModal = new $.zui.ModalTrigger({url: createLink('dataview', 'export', 'type=query&table=&fileName=' + fileName, '', true), type: 'iframe', width: 900});
|
||||
document.getElementById('export').addEventListener('click', function(e)
|
||||
document.getElementById('exportDataview').addEventListener('click', function(e)
|
||||
{
|
||||
tryQuery(e);
|
||||
showModel(exportModal);
|
||||
|
||||
@@ -40,7 +40,7 @@ function query(callback) {
|
||||
$('#querying').addClass('hidden');
|
||||
if(resp.result !== 'success')
|
||||
{
|
||||
$('#export').addClass('hidden');
|
||||
$('#exportDataview').addClass('hidden');
|
||||
var message = resp.message.errorInfo ? resp.message.errorInfo[2] : resp.message;
|
||||
$('.error').removeClass('hidden');
|
||||
$('.error td').html(message);
|
||||
@@ -48,7 +48,7 @@ function query(callback) {
|
||||
}
|
||||
else
|
||||
{
|
||||
$('#export').removeClass('hidden');
|
||||
$('#exportDataview').removeClass('hidden');
|
||||
DataStorage.fields = resp.fields;
|
||||
DataStorage.columns = resp.columns;
|
||||
DataStorage.rows = resp.rows;
|
||||
|
||||
@@ -32,8 +32,8 @@
|
||||
<div class='btn-active-text'>
|
||||
<span class='text'><?php echo $lang->dataview->result;?></span>
|
||||
<button type="button" class="btn btn-link fieldSettings pull-right"><i class='icon icon-cog-outline'></i> <?php echo $lang->dataview->fieldSettings;?></button>
|
||||
<?php if(common::hasPriv('dataview', 'export')):?>
|
||||
<button type="button" id='export' class="btn btn-link hidden dataview-export pull-right"><i class='icon icon-export'></i> <?php echo $lang->dataview->export;?></button>
|
||||
<?php if($this->app->rawModule == 'dataview' and common::hasPriv('dataview', 'export')):?>
|
||||
<button type="button" id='exportDataview' class="btn btn-link hidden dataview-export pull-right"><i class='icon icon-export'></i> <?php echo $lang->dataview->export;?></button>
|
||||
<?php endif;?>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user