* Code for port.

module/port/control.php

@@ -73,6 +73,7 @@ class port extends control
      */
     public function import($model, $locate = '')
     {
+        $locate = $locate ? $locate : $this->session->showImportURL;
         if($_FILES)
         {
             $file      = $this->loadModel('file')->getUpload('file');
@@ -135,7 +136,7 @@ class port extends control
      */
     public function ajaxGetOptions($model = '', $field = '', $value = '', $index = '')
     {
-        $this->app->loadConfig($model);
+        $this->loadModel($model);
         $fields    = $this->config->$model->templateFields;
         $fieldList = $this->port->initFieldList($model, $fields, false);
 

module/port/lang/zh-cn.php

@@ -12,9 +12,12 @@ $lang->port->reservedWord['title']     = '标题';
 $lang->port->reservedWord['asdawdadw'] = '测试字段';
 
 
-$lang->port->importCase   = '导入EXCEL';
-$lang->port->importNotice = '请先导出模板，按照模板格式填写数据后再导入。';
-$lang->port->noRequire    = '%s行的“ %s” 是必填字段，不能为空。';
+$lang->port->importCase     = '导入EXCEL';
+$lang->port->importNotice   = '请先导出模板，按照模板格式填写数据后再导入。';
+$lang->port->noRequire      = '%s行的“ %s” 是必填字段，不能为空。';
+$lang->port->exportTemplate = '导出模板';
+$lang->port->import         = '导入';
+$lang->port->id             = '编号';
 
 $lang->port->new = '新增';
 

module/port/model.php

@@ -856,13 +856,14 @@ class portModel extends model
      * @access public
      * @return void
      */
-    public function getPageDatas($datas, $pagerID = 1, $maxImport = 0)
+    public function getPageDatas($datas, $pagerID = 1)
     {
         $result   = new stdClass();
         $result->allCount = count($datas);
         $result->allPager = 1;
         $result->pagerID  = $pagerID;
 
+        $maxImport = $_COOKIE['maxImport'];
         if($result->allCount > $this->config->file->maxImport)
         {
             if(empty($maxImport))
@@ -918,7 +919,7 @@ class portModel extends model
      * @access public
      * @return void
      */
-    public function getViewDatas($model = '', $datas = '', $title = '', $pagerID = 1, $maxImport = 0, $insert)
+    public function getViewDatas($model = '', $datas = '', $title = '', $pagerID = 1, $insert)
     {
         $suhosinInfo = $this->checkSuhosinInfo($datas->datas);
 
@@ -929,7 +930,7 @@ class portModel extends model
         $datas->allPager       = isset($datas->allPager) ? $datas->allPager : 1;
         $datas->pagerID        = $pagerID;
         $datas->isEndPage      = $pagerID >= $datas->allPager;
-        $datas->maxImport      = $maxImport;
+        $datas->maxImport      = $_COOKIE['maxImport'];
         $datas->dataInsert     = $insert;
         $datas->fields         = $this->initFieldList($model, $fields, false);
         $datas->suhosinInfo    = $suhosinInfo;
@@ -1177,7 +1178,7 @@ class portModel extends model
      * @access public
      * @return void
      */
-    public function readExcel($model = '', $pagerID = 1, $maxImport = 0)
+    public function readExcel($model = '', $pagerID = 1)
     {
         /* Bulid import paris (field => name) .*/
         $fields  = $this->getImportFields('bug');
@@ -1202,7 +1203,7 @@ class portModel extends model
         }
 
         /* Get page by datas.*/
-        return $this->getPageDatas($bugData, $pagerID, $maxImport);
+        return $this->getPageDatas($bugData, $pagerID);
     }
 
 }

module/port/view/exporttemplate.html.php

@@ -21,12 +21,12 @@ function closeWindow()
 </script>
 <div id='mainContent' class='main-content'>
   <div class='main-header'>
-    <h2><?php echo $lang->task->exportTemplet;?></h2>
+    <h2><?php echo $lang->port->exportTemplate;?></h2>
   </div>
   <form method='post' target='hiddenwin' onsubmit='setDownloading();' style='padding: 20px 5%'>
     <table class='table table-form'>
       <tr>
-        <th class='w-120px'><?php echo $lang->task->num;?></th>
+        <th class='w-120px'><?php echo $lang->port->num;?></th>
         <td class='w-80px'><?php echo html::input('num', '10', "class='form-control'");?></td>
         <td class='w-100px'><?php echo html::select('fileType', array('xlsx' => 'xlsx', 'xls' => 'xls'), 'xlsx', "class='form-control'");?>
         <td><?php echo html::submitButton('', '', 'btn btn-primary');?></td>

module/port/view/import.html.php

@@ -19,4 +19,7 @@
     </div>
   </div>
 </main>
+<script>
+$.cookie('maxImport', 0);
+</script>
 <?php include $app->getModuleRoot() . 'common/view/footer.lite.html.php';?>

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 = "<?php echo $this->app->getURI()?>";
     })
 });
 </script>
@@ -86,13 +87,12 @@ $(function()
 
           <?php foreach($fields as $field => $value):?>
 
-          <?php if(!isset($value['values'][''])) $value['values'][''] = '';?>
           <?php if($value['control'] != 'hidden') $colspan ++?>
 
           <?php if($value['control'] == 'select'):?>
           <?php $selected = !empty($object->$field) ? $object->$field : '';$list = array();?>
-          <?php if($value['values'][$selected])  $list  = array($selected => $value['values'][$selected]);?>
-          <?php if(!$value['values'][$selected] and $value['values'][0]) $list = array_slice($value['values'], 0, 1);?>
+          <?php if(!empty($value['values'][$selected])) $list = array($selected => $value['values'][$selected]);?>
+          <?php if(!empty($value['values'][$selected]) and isset($value['values'][0])) $list = array_slice($value['values'], 0, 1);?>
           <td><?php echo html::select("{$field}[$key]", $list, $selected, "class='form-control picker-select' data-field='{$field}' data-key='$key'")?></td>
 
           <?php elseif($value['control'] == 'multiple'):?>
@@ -126,6 +126,7 @@ $(function()
           <td colspan='<?php echo $colspan;?>' class='text-center form-actions'>
             <?php
             $submitText = $isEndPage ? $this->lang->save : $this->lang->file->saveAndNext;
+            $backLink   = isset($backLink) ? $backLink : "javascript:history.back(-1)";
             if(!$insert and $dataInsert === '')
             {
                 echo "<button type='button' data-toggle='modal' data-target='#importNoticeModal' class='btn btn-primary btn-wide'>{$submitText}</button>";
@@ -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 ' &nbsp; ' . sprintf($lang->file->importPager, $allCount, $pagerID, $allPager);
             ?>
           </td>