Skip to content
Snippets Groups Projects

Hotline

Merged Patrick Barroca requested to merge hotline into master
Compare and
12 files
+ 71
41
Preferences
Compare changes
Files
12
@@ -192,7 +192,7 @@ class Admin_FileManagerController extends ZendAfi_Controller_Action {
return $this->_ajaxUploadImage($resized_file, $into);
if (!$form->isValid($this->_request->getPost()))
return;
return;
if(!$form->file->receive())
return;
@@ -268,7 +268,7 @@ class Admin_FileManagerController extends ZendAfi_Controller_Action {
$item = $this->_findItemFromParams();
$this->view->titre = $this->_('Renommer "%s"', $item->getBasename());
$this->view->form = $form = ZendAfi_Form_Admin_FileManager_Rename::newWith(['into' => $item->getRealpath(),
'name' => $item->getBasename()]);
'name' => $item->getBasename()]);
$form->setAction($this->view->url());
@@ -372,14 +372,15 @@ class Admin_FileManagerController extends ZendAfi_Controller_Action {
protected function _getUrlWithNewPath($path) {
return $this->view->url(['module' => 'admin',
'controller' => 'file-manager',
'action' => 'index',
'browser' => $this->_getParam('browser'),
'splitted_browser' => $this->_getParam('splitted_browser'),
'focused_browser' => $this->_getParam('focused_browser'),
'display_mode_browser' => $this->_getParam('display_mode_browser'),
'display_mode_splitted_browser' => $this->_getParam('display_mode_splitted_browser'),
$this->_getParam('focused_browser', 'browser') => $path,
], null, true);
'controller' => 'file-manager',
'action' => 'index',
$this->_getParam('focused_browser', 'browser') => $path,
'ajax_resized_image' => null,
'render' => null,
'into' => null,
'file' => null,
'item' => null,
'filename' => null,
]);
}
}