feature #251 add/delete folder mediachooser pop-up

Kunstmaan · Apr 9, 2015 · 4732e60 · 4732e60
1 parent 620d8e2
commit 4732e60
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 18 deletions.
diff --git a/src/Kunstmaan/MediaBundle/Controller/ChooserController.php b/src/Kunstmaan/MediaBundle/Controller/ChooserController.php
@@ -8,6 +8,7 @@
 use Kunstmaan\MediaBundle\Entity\Media;
 use Kunstmaan\MediaBundle\Helper\Media\AbstractMediaHandler;
 use Kunstmaan\MediaBundle\Helper\MediaManager;
+use Kunstmaan\MediaBundle\Form\FolderType;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
@@ -112,6 +113,10 @@ public function chooserShowFolderAction(Request $request, $folderId)
         $adminList             = $this->get('kunstmaan_adminlist.factory')->createList($adminListConfigurator);
         $adminList->bindRequest($request);
 
+        $sub = new Folder();
+        $sub->setParent($folder);
+        $subForm  = $this->createForm(new FolderType($sub), $sub);
+
         $linkChooserLink = null;
         if (!empty($linkChooser)) {
             $params = array();
@@ -124,7 +129,7 @@ public function chooserShowFolderAction(Request $request, $folderId)
             $linkChooserLink = $this->generateUrl($routeName, $params);
         }
 
-       $viewVariabels = array(
+        $viewVariabels = array(
             'cKEditorFuncNum' => $cKEditorFuncNum,
             'linkChooser'     => $linkChooser,
             'linkChooserLink' => $linkChooserLink,
@@ -134,7 +139,7 @@ public function chooserShowFolderAction(Request $request, $folderId)
             'type'            => $type,
             'folder'          => $folder,
             'adminlist'       => $adminList,
-
+            'subform'         => $subForm->createView()
         );
 
         /* generate all forms */

diff --git a/src/Kunstmaan/MediaBundle/Controller/FolderController.php b/src/Kunstmaan/MediaBundle/Controller/FolderController.php
@@ -113,10 +113,12 @@ public function deleteAction($folderId)
             $this->get('session')->getFlashBag()->add('success', 'Folder \'' . $folderName . '\' has been deleted!');
             $folderId = $parentFolder->getId();
         }
+        if (strpos($_SERVER['HTTP_REFERER'],'chooser')) {
+            $redirect = 'KunstmaanMediaBundle_chooser_show_folder';
+        } else $redirect = 'KunstmaanMediaBundle_folder_show';
 
         return new RedirectResponse(
-            $this->generateUrl(
-                'KunstmaanMediaBundle_folder_show',
+            $this->generateUrl($redirect,
                 array(
                     'folderId' => $folderId
                 )
@@ -153,16 +155,16 @@ public function subCreateAction(Request $request, $folderId)
                     'success',
                     'Folder \'' . $folder->getName() . '\' has been created!'
                 );
+                if (strpos($_SERVER['HTTP_REFERER'],'chooser') !== false) {
+                    $redirect = 'KunstmaanMediaBundle_chooser_show_folder';
+                } else $redirect = 'KunstmaanMediaBundle_folder_show';
 
-                return new Response(
-                    '<script>window.location="' .
-                    $this->generateUrl(
-                        'KunstmaanMediaBundle_folder_show',
+                return new RedirectResponse(
+                    $this->generateUrl( $redirect,
                         array(
                             'folderId' => $folder->getId()
                         )
-                    ) .
-                    '"</script>'
+                    )
                 );
             }
         }

diff --git a/src/Kunstmaan/MediaBundle/Resources/views/Chooser/chooserShowFolder.html.twig b/src/Kunstmaan/MediaBundle/Resources/views/Chooser/chooserShowFolder.html.twig
@@ -129,18 +129,24 @@
                         Add media <i class="fa fa-caret-down"></i>
                     </button>
                     <ul class="dropdown-menu dropdown-menu-right" role="menu">
-                    {% for addaction in mediamanager.getFolderAddActions() %}
-                        <li>
-                            <a href="javascript:void(0)" data-toggle="modal" data-target="#add{{ addaction.type }}-modal">
-                                {{ addaction.name |trans }}
-                            </a>
-                        </li>
-                    {% endfor %}
+                        {% for addaction in mediamanager.getFolderAddActions() %}
+                            <li>
+                                <a href="javascript:void(0)" data-toggle="modal" data-target="#add{{ addaction.type }}-modal">
+                                    {{ addaction.name |trans }}
+                                </a>
+                            </li>
+                        {% endfor %}
                     </ul>
                 </div>
+            <button class="btn btn-default btn--raise-on-hover" data-target="#addsub-modal" data-toggle="modal" type="button">
+                {{ 'media.folder.addsub.action' |trans }}
+            </button>
+            <button class="btn btn-default btn--raise-on-hover" data-target="#delete-modal" data-toggle="modal" type="button">
+                {{ 'media.folder.delete.action' |trans }}
+            </button>
             {% endblock %}
-            </div>
         </div>
+    </div>
 
 
     <!-- Scroll-actions -->
@@ -236,6 +242,8 @@
     <!-- Modals -->
     {% set urlParams = urlParams|merge({'folderId': folder.id}) %}
     {% include 'KunstmaanMediaBundle:Media:addType-modal.html.twig' %}
+    {% include 'KunstmaanMediaBundle:Folder:addsub-modal.html.twig' %}
+    {% include 'KunstmaanMediaBundle:Folder:delete-modal.html.twig' %}
 
 {% endblock %}