Merge pull request #477 from elcodi/feature/admin-bug-fixing

Feature/admin bug fixing

app/Resources/StoreFallbackBundle/views/Exception/error404.html.twig

@@ -3,6 +3,8 @@
 
 {% block title_container 'store.error.page_not_found_title'|trans %}
 
+{% block center_width "600" %}
+{% block center_height "600" %}
 
 {% block content %}
 

app/Resources/StoreOverrideBundle/views/Exception/error.html.twig

@@ -1,17 +1,15 @@
 {% extends '@AdminCore/layouts/center_box.html.twig' %}
 
+{% block center_width "600" %}
+{% block center_height "600" %}
 
 {% block title_container 'Unknown error' %}
 
-
 {% block content %}
-
     <h1>Oops! A wild error appeared!</h1>
     <img src="{{ asset('bundles/admincore/images/uh-si.png') }}" width="250" class="fl-r ml-m" />
-
     <p>
         Something is broken. Please let us know what you were doing when this error occurred.
         We will fix it as soon as possible. Sorry for any inconvenience caused.
     </p>
-
 {% endblock content %}

app/Resources/StoreOverrideBundle/views/Exception/error503.html.twig

@@ -3,6 +3,8 @@
 
 {% block title_container 'store.error.store_unavailable_title'|trans %}
 
+{% block center_width "600" %}
+{% block center_height "600" %}
 
 {% block content %}
 

cache

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+sudo rm -rf app/cache/*
+sudo rm -rf app/logs/*
+
+HTTPDUSER=`ps aux | grep -E '[a]pache|[h]ttpd|[_]www|[w]ww-data|[n]ginx' | grep -v root | head -1 | cut -d\  -f1`
+sudo chmod +a "$HTTPDUSER allow delete,write,append,file_inherit,directory_inherit" app/cache app/logs
+sudo chmod +a "`whoami` allow delete,write,append,file_inherit,directory_inherit" app/cache app/logs

src/Elcodi/Admin/ConfigurationBundle/Resources/views/Configuration/list.html.twig

@@ -118,17 +118,6 @@
                                 )
                             }}
                         </li>
-                        <li>
-                            {{
-                                macro.config_select(
-                                    'currency.default_currency',
-                                    'admin.settings.field.currency',
-                                    currencies,
-                                    'iso',
-                                    'name'
-                                )
-                            }}
-                        </li>
                     </ol>
                 </div>
             </div>

src/Elcodi/Admin/CoreBundle/Controller/Abstracts/AbstractAdminController.php

@@ -49,12 +49,22 @@ protected function enableAction(
             /**
              * @var EnabledInterface $entity
              */
-            $entity->setEnabled(true);
-            $entityManager = $this->getManagerForClass($entity);
-            $entityManager->flush($entity);
+            $$this->enableEntity($entity);
         });
     }
 
+    /**
+     * Enables the given entity
+     *
+     * @param EnabledInterface $entity The entity to disable
+     */
+    protected function enableEntity(EnabledInterface $entity)
+    {
+        $entity->setEnabled(true);
+        $entityManager = $this->getManagerForClass($entity);
+        $entityManager->flush($entity);
+    }
+
     /**
      * Disable entity
      *
@@ -69,15 +79,22 @@ protected function disableAction(
     ) {
         return $this->getResponse($request, function () use ($entity) {
 
-            /**
-             * @var EnabledInterface $entity
-             */
-            $entity->setEnabled(false);
-            $entityManager = $this->getManagerForClass($entity);
-            $entityManager->flush($entity);
+           $this->disableEntity($entity);
         });
     }
 
+    /**
+     * Disables the given entity
+     *
+     * @param EnabledInterface $entity The entity to disable
+     */
+    protected function disableEntity(EnabledInterface $entity)
+    {
+        $entity->setEnabled(false);
+        $entityManager = $this->getManagerForClass($entity);
+        $entityManager->flush($entity);
+    }
+
     /**
      * Updated edited element action
      *

src/Elcodi/Admin/CoreBundle/Resources/public/components/frontendcore-js/.bower.json

@@ -1,6 +1,6 @@
 {
   "name": "frontendcore-js",
-  "version": "1.6.5",
+  "version": "1.6.9",
   "authors": [
     "Toni Pinel <tonipinel@gmail.com>"
   ],
@@ -15,11 +15,11 @@
     "bower_components",
     "tests"
   ],
-  "_release": "1.6.5",
+  "_release": "1.6.9",
   "_resolution": {
     "type": "version",
-    "tag": "1.6.5",
-    "commit": "e7e5e427b564842dddc763b8b553d48b433d471d"
+    "tag": "1.6.9",
+    "commit": "77c72977c75d65a35aa4d3412242eafd9651affd"
   },
   "_source": "https://github.com/Frontendcore/js.git",
   "_target": "*",

src/Elcodi/Admin/CoreBundle/Resources/public/components/frontendcore-js/bower.json

@@ -1,6 +1,6 @@
 {
   "name": "frontendcore-js",
-  "version": "1.6.5",
+  "version": "1.6.9",
   "authors": [
     "Toni Pinel <tonipinel@gmail.com>"
   ],