diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/FileController.php b/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/FileController.php index 55cf9d84..225aa24c 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/FileController.php +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/FileController.php @@ -300,7 +300,9 @@ class FileController extends Controller $urlsource= $fulldirectory."/".$oldname; $urldestination = $fulldirectory."/".$data["subdirectory"]; + if($urlsource!=$urldestination) { + if($fs->exists($urldestination)) { $form->addError(new FormError('Ce nom existe déjà')); $this->get('session')->getFlashBag()->clear(); @@ -325,7 +327,7 @@ class FileController extends Controller if($fs->exists($urlsource)) $fs->rename($urlsource,$urldestination,true); } - + $toclose=true; } } diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/File/subdirectory.html.twig b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/File/subdirectory.html.twig index 76b2420c..b965eb46 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/File/subdirectory.html.twig +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/File/subdirectory.html.twig @@ -46,7 +46,8 @@ $('document').ready(function(){ {% if toclose %} - parent.location.reload(); + href=parent.location.href; + parent.location.href=href; {% endif %} $("#form_subdirectory").focus();