dbms_init...1
This commit is contained in:
parent
626dcd5ccd
commit
284d29ebb3
@ -722,7 +722,6 @@ abstract class CommonController extends BaseController
|
|||||||
$loaded_data = $reader->loadFromString($html);
|
$loaded_data = $reader->loadFromString($html);
|
||||||
list($full_path, $file_name) = $this->download_document($output_type, $loaded_data);
|
list($full_path, $file_name) = $this->download_document($output_type, $loaded_data);
|
||||||
$full_path .= DIRECTORY_SEPARATOR . $file_name;
|
$full_path .= DIRECTORY_SEPARATOR . $file_name;
|
||||||
return $this->response->download($full_path, null)->setFileName($file_name);
|
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
if (!$uid) {
|
if (!$uid) {
|
||||||
@ -735,9 +734,9 @@ abstract class CommonController extends BaseController
|
|||||||
$this->entity = $entity;
|
$this->entity = $entity;
|
||||||
list($file_name, $uploaded_filename) = $this->entity->getDownlaodFile();
|
list($file_name, $uploaded_filename) = $this->entity->getDownlaodFile();
|
||||||
$full_path = WRITEPATH . DIRECTORY_SEPARATOR . "uploads" . DIRECTORY_SEPARATOR . $uploaded_filename;
|
$full_path = WRITEPATH . DIRECTORY_SEPARATOR . "uploads" . DIRECTORY_SEPARATOR . $uploaded_filename;
|
||||||
return $this->response->download($full_path, null)->setFileName($file_name);
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
return $this->response->download($full_path, null)->setFileName($file_name);
|
||||||
} catch (\Exception $e) {
|
} catch (\Exception $e) {
|
||||||
return $this->getResultFail($e->getMessage());
|
return $this->getResultFail($e->getMessage());
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user