-

task->exportTemplet;?>

+

port->exportTemplate;?>

- + diff --git a/module/port/view/import.html.php b/module/port/view/import.html.php index d90b4b4ee9..f9c81f0baa 100644 --- a/module/port/view/import.html.php +++ b/module/port/view/import.html.php @@ -19,4 +19,7 @@ +getModuleRoot() . 'common/view/footer.lite.html.php';?> diff --git a/module/port/view/showimport.html.php b/module/port/view/showimport.html.php index cef9feeda1..302d8889f3 100644 --- a/module/port/view/showimport.html.php +++ b/module/port/view/showimport.html.php @@ -36,10 +36,11 @@ $(function() { if(parseInt($('#maxImport').val())) $('#times').html(Math.ceil(parseInt($('#allCount').html()) / parseInt($('#maxImport').val()))); }); + $('#import').click(function() { $.cookie('maxImport', $('#maxImport').val()) - window.location.reload(); + location.href = "app->getURI()?>"; }) }); @@ -86,13 +87,12 @@ $(function() $value):?> - $field) ? $object->$field : '';$list = array();?> - $value['values'][$selected]);?> - + $value['values'][$selected]);?> + @@ -126,6 +126,7 @@ $(function()
task->num;?>port->num;?> 'xlsx', 'xls' => 'xls'), 'xlsx', "class='form-control'");?> lang->save : $this->lang->file->saveAndNext; + $backLink = isset($backLink) ? $backLink : "javascript:history.back(-1)"; if(!$insert and $dataInsert === '') { echo ""; @@ -137,7 +138,7 @@ $(function() } echo html::hidden('isEndPage', $isEndPage ? 1 : 0); echo html::hidden('pagerID', $pagerID); - echo html::a("javascript:history.back(-1)", $lang->goback, '', "class='btn btn-back btn-wide'"); + echo html::a("$backLink", $lang->goback, '', "class='btn btn-back btn-wide'"); echo '   ' . sprintf($lang->file->importPager, $allCount, $pagerID, $allPager); ?>