btns and referer

nicklog · Jun 14, 2018 · 361c5bd · 361c5bd
1 parent 8d61c1e
commit 361c5bd
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 3 deletions.
diff --git a/src/Controller/PackageController.php b/src/Controller/PackageController.php
@@ -102,6 +102,12 @@ public function unabandonAction(Request $request, Package $package)
 
         $this->get('session')->getFlashBag()->add('success', 'Package unabandoned');
 
+        if ($request->headers->get('referer')) {
+            $referer = $request->headers->get('referer');
+
+            return $this->redirect($referer);
+        }
+
         return $this->redirectToRoute('devliver_package_index');
     }
 
@@ -120,6 +126,12 @@ public function enableAction(Request $request, Package $package)
         $em->persist($package);
         $em->flush();
 
+        if ($request->headers->get('referer')) {
+            $referer = $request->headers->get('referer');
+
+            return $this->redirect($referer);
+        }
+
         return $this->redirectToRoute('devliver_package_index');
     }
 
@@ -138,6 +150,12 @@ public function disableAction(Request $request, Package $package)
         $em->persist($package);
         $em->flush();
 
+        if ($request->headers->get('referer')) {
+            $referer = $request->headers->get('referer');
+
+            return $this->redirect($referer);
+        }
+
         return $this->redirectToRoute('devliver_package_index');
     }
 
@@ -298,7 +316,7 @@ public function updateAction(Request $request, Package $package)
 
         $this->get('session')->getFlashBag()->add('success', 'Package updated');
 
-        if ($request->get('referer')) {
+        if ($request->headers->get('referer')) {
             $referer = $request->headers->get('referer');
 
             return $this->redirect($referer);

diff --git a/src/Resources/views/Package/view.html.twig b/src/Resources/views/Package/view.html.twig
@@ -4,8 +4,27 @@
     <i class="fas fa-cube fa-fw"></i> {{ package.name }}
 {% endblock %}
 
-{% block pageActions %}
-    <a href="{{ path('devliver_package_update', { package: package.id }) }}" title="{{ 'action.update'|trans }}" class="btn btn-info bs-tooltip"><i class="fas fa-sync fa-fw"></i></a>
+{% block pageActionsGroup %}
+    <div class="btn-group mr-2">
+        <a href="{{ path('devliver_package_delete', { package: package.id }) }}" data-title="Remove?" title="{{ 'action.remove'|trans }}" class="btn bs-confirmation bs-tooltip btn-danger"><span class="fas fa-trash fa-fw"></span></a>
+
+        {% if package.abandoned != true %}
+            <a href="{{ path('devliver_package_abandon', { package: package.id }) }}" title="{{ 'action.abandon'|trans }}" class="bs-tooltip btn btn-warning"><span class="fas fa-archive fa-fw"></span></a>
+        {% else %}
+            <a href="{{ path('devliver_package_unabandon', { package: package.id }) }}" title="{{ 'action.unabandon'|trans }}" class="bs-tooltip btn btn-dark"><span class="fas fa-archive fa-fw"></span></a>
+        {% endif %}
+    </div>
+    <div class="btn-group mr-2">
+        {% if package.enable != true %}
+            <a href="{{ path('devliver_package_enable', { package: package.id }) }}" title="{{ 'action.enable'|trans }}" class="bs-tooltip btn btn-danger"><span class="fas fa-circle fa-fw"></span></a>
+        {% else %}
+            <a href="{{ path('devliver_package_disable', { package: package.id }) }}" title="{{ 'action.disable'|trans }}" class="bs-tooltip btn btn-success"><span class="fas fa-circle fa-fw"></span></a>
+        {% endif %}
+        <a href="{{ path('devliver_package_edit', { package: package.id }) }}" title="{{ 'action.edit'|trans }}" class="bs-tooltip btn btn-primary"><span class="fas fa-edit fa-fw"></span></a>
+    </div>
+    <div class="btn-group">
+        <a href="{{ path('devliver_package_update', { package: package.id }) }}" title="{{ 'action.update'|trans }}" class="btn btn-info bs-tooltip"><i class="fas fa-sync fa-fw"></i></a>
+    </div>
 {% endblock %}
 
 {% block content %}