implementation of the cache module and optimisations

TeoGoddet · Feb 20, 2015 · 6695f45 · 6695f45
1 parent f49a854
commit 6695f45
Show file tree

Hide file tree

Showing 87 changed files with 1,552 additions and 1,066 deletions.
diff --git a/Admin/BaseAdmin.php b/Admin/BaseAdmin.php
@@ -47,6 +47,18 @@ public function setLanguages(array $languages)
         $this->languages = $languages;
     }
 
+    /**
+     * Set up listner to make sure the correct locale is used
+     */
+    public function setUpTranslatableLocale()
+    {
+        /** @var \Gedmo\Translatable\TranslatableListener $translatable */
+        $translatableListener = $this->getContainer()->get('stof_doctrine_extensions.listener.translatable', ContainerInterface::NULL_ON_INVALID_REFERENCE);
+        if ($translatableListener) {
+            $translatableListener->setTranslatableLocale($this->getDefaultLocale());
+        }
+    }
+
     /**
      * Provide an array of locales where the locale is the key and the label is
      * the value for easy display in a dropdown select for example
@@ -122,10 +134,10 @@ public function getDefaultLocale()
                 }
             }
 
-        } else {
-            return $locale;
         }
 
+        return $locale;
+
     }
 
     /**

diff --git a/Admin/Entity/TranslationAdmin.php b/Admin/Entity/TranslationAdmin.php
@@ -24,6 +24,10 @@
  */
 class TranslationAdmin extends ORMTranslationAdmin
 {
+    /**
+     * @var array
+     */
+    protected $managedLocales;
 
     /**
      * Whether or not to persist the filters in the session
@@ -130,8 +134,8 @@ public function getFilterParameters()
     }
 
     /**
-     * @param string $name
-     * @return multitype|NULL
+     * @param \Ibrows\SonataTranslationBundle\Admin\unknown $name
+     * @return \Ibrows\SonataTranslationBundle\Admin\multitype|string
      */
     public function getTemplate($name)
     {

diff --git a/Admin/Model/GalleryAdmin.php b/Admin/Model/GalleryAdmin.php
@@ -54,7 +54,7 @@ public function getTrackedActions()
      */
     public function getIcon()
     {
-        return 'glyph-camera-retro';
+        return 'glyphicon-camera-retro';
     }
 
     /**

diff --git a/Admin/Model/LayoutBlockAdmin.php b/Admin/Model/LayoutBlockAdmin.php
@@ -10,20 +10,17 @@
 
 namespace Networking\InitCmsBundle\Admin\Model;
 
-use Doctrine\Common\Persistence\ObjectManager;
-use Doctrine\ORM\EntityNotFoundException;
 use JMS\Serializer\Serializer;
-use Networking\InitCmsBundle\Form\DataTransformer\ContentTypeTransformer;
 use Networking\InitCmsBundle\Model\LayoutBlock;
 use Networking\InitCmsBundle\Model\PageInterface;
 use Sonata\AdminBundle\Datagrid\ListMapper;
 use Sonata\AdminBundle\Datagrid\DatagridMapper;
-use Sonata\AdminBundle\Form\DataTransformer\ArrayToModelTransformer;
+use Sonata\AdminBundle\Exception\ModelManagerException;
 use Sonata\AdminBundle\Route\RouteCollection;
-use Sonata\AdminBundle\Validator\ErrorElement;
 use Sonata\AdminBundle\Form\FormMapper;
 use Networking\InitCmsBundle\Form\DataTransformer\PageToNumberTransformer;
 use Networking\InitCmsBundle\Admin\BaseAdmin;
+use Networking\InitCmsBundle\Model\ContentInterface;
 
 /**
  * Class LayoutBlockAdmin
@@ -124,29 +121,30 @@ public function getContentTypes()
         return $choices;
     }
 
-
     /**
-     * @param LayoutBlock $object
+     * @param mixed $object
      * @return mixed|void
+     * @throws ModelManagerException
      */
-    public function postPersist($object)
-    {
+    public function prePersist($object){
+        /** @var ContentInterface $contentObject */
         if ($contentObject = $object->getContent()) {
-
-            $this->getModelManager()->create($contentObject);
-            $object->setObjectId($contentObject->getId());
-            $this->getModelManager()->update($object);
+            try{
+                $this->getModelManager()->create($contentObject);
+                $object->setObjectId($contentObject->getId());
+                $this->autoPageDraft($object->getPage());
+            }catch (ModelManagerException $e){
+                throw new ModelManagerException('Cannot create content, object is invalid');
+            }
         }
-
-        $this->autoPageDraft($object->getPage());
     }
 
 
     /**
      * @param LayoutBlock $object
      * @return mixed|void
      */
-    public function postUpdate($object)
+    public function preUpdate($object)
     {
         if ($contentObject = $object->getContent()) {
             $this->getModelManager()->update($contentObject);
@@ -158,7 +156,7 @@ public function postUpdate($object)
      * @param LayoutBlock $object
      * @return mixed|void
      */
-    public function postRemove($object)
+    public function preRemove($object)
     {
         if ($classType = $object->getClassType()) {
 

diff --git a/Admin/Model/MediaAdmin.php b/Admin/Model/MediaAdmin.php
@@ -236,8 +236,8 @@ protected function configureFormFields(FormMapper $formMapper)
     protected function configureListFields(ListMapper $listMapper)
     {
         $listMapper
-            ->add(
-                'custom',
+            ->addIdentifier(
+                'name',
                 'string',
                 array(
                     'template' => 'NetworkingInitCmsBundle:MediaAdmin:list_custom.html.twig',

diff --git a/Admin/Model/MenuItemAdmin.php b/Admin/Model/MenuItemAdmin.php
@@ -358,20 +358,6 @@ public function getTemplate($name)
         }
     }
 
-    public function createQuery($context = 'list')
-    {
-        /** @var QueryBuilder $query */
-        $query = parent::createQuery($context);
-        $aliases = $query->getRootAliases();
-        if($context === 'list'){
-            $query->select(sprintf('%s, p', $aliases[0]));
-            $query->leftJoin(sprintf('%s.page', $aliases[0]), 'p');
-        }
-
-
-        return $query;
-    }
-
     /**
      * returns all translated link targets
      * @return array

diff --git a/Admin/Model/PageAdmin.php b/Admin/Model/PageAdmin.php
@@ -425,12 +425,12 @@ protected function configureDatagridFilters(DatagridMapper $datagridMapper)
     public function matchPath(ProxyQuery $ProxyQuery, $alias, $field, $data)
     {
         if (!$data || !is_array($data) || !array_key_exists('value', $data)) {
-            return;
+            return false;
         }
         $data['value'] = trim($data['value']);
 
         if (strlen($data['value']) == 0) {
-            return;
+            return false;
         }
 
         $fieldName = 'path';
@@ -444,6 +444,23 @@ public function matchPath(ProxyQuery $ProxyQuery, $alias, $field, $data)
         return true;
     }
 
+    /**
+     * @param string $context
+     * @return \Sonata\AdminBundle\Datagrid\ProxyQueryInterface
+     */
+    public function createQuery($context = 'list')
+    {
+        $query = parent::createQuery($context);
+        if($context == 'list'){
+            $query->addSelect('c');
+            $query->leftJoin(sprintf('%s.contentRoute', $query->getRootAlias()), 'c');
+            $query->orderBy('c.path', 'asc');
+        }
+
+
+        return $query;
+    }
+
     /**
      * @param ProxyQuery $ProxyQuery
      * @param $alias
@@ -570,7 +587,7 @@ public function getTranslationLanguages()
         $translationLanguages = new \Doctrine\Common\Collections\ArrayCollection();
 
         if (!$id = $this->getRequest()->get('id')) {
-            return;
+            return false;
         }
 
         /** @var $pageManager PageManagerInterface */
@@ -643,7 +660,7 @@ protected function getDefaultTemplate()
             return $this->getSubject()->getTemplateName();
         }
         $templates = $this->getContainer()->getParameter('networking_init_cms.page.templates');
-        $firstTemplate = reset($templates);
+        reset($templates);
         $defaultTemplate = key($templates);
 
         return $defaultTemplate;

diff --git a/Admin/Model/UserAdmin.php b/Admin/Model/UserAdmin.php
@@ -91,7 +91,7 @@ protected function configureListFields(ListMapper $listMapper)
         $listMapper
             ->addIdentifier('username')
             ->add('email')
-            ->add('groups')
+            ->add('groups', null, array('template' => 'NetworkingInitCmsBundle:CRUD:list_orm_many_to_many.html.twig'))
             ->add(
                 'enabled',
                 null,
@@ -139,66 +139,52 @@ protected function configureFormFields(FormMapper $formMapper)
     {
         $formMapper
             ->with('General')
-            ->add('username')
-            ->add('email')
-            ->add('plainPassword', 'text', array('required' => false))
-            ->end()
+                ->add('username')
+                ->add('email')
+                ->add('plainPassword', 'text', array('required' => (!$this->getSubject() || is_null($this->getSubject()->getId()))))
+                ->end()
             ->with('Groups')
-            ->add('groups', 'sonata_type_model', array('required' => false, 'expanded' => true, 'multiple' => true))
+                ->add('groups', 'sonata_type_model', array('required' => false, 'expanded' => true, 'multiple' => true))
             ->end()
             ->with('Profile')
-//            ->add('dateOfBirth', 'birthday', array('required' => false))
-            ->add('firstname', null, array('required' => false))
-            ->add('lastname', null, array('required' => false))
-//            ->add('website', 'url', array('required' => false))
-//            ->add('biography', 'text', array('required' => false))
-//            ->add(
-//                'gender',
-//                'sonata_user_gender',
-//                array(
-//                    'required' => false,
-//                    'translation_domain' => $this->getTranslationDomain()
-//                )
-//            )
-            ->add('locale', 'locale', array('required' => false))
-//            ->add('timezone', 'timezone', array('required' => false))
-//            ->add('phone', null, array('required' => false))
+                ->add('firstname', null, array('required' => false))
+                ->add('lastname', null, array('required' => false))
+                ->add('locale', 'locale', array('required' => false))
             ->end();
-//            ->with('Social')
-//            ->add('facebookUid', null, array('required' => false))
-//            ->add('facebookName', null, array('required' => false))
-//            ->add('twitterUid', null, array('required' => false))
-//            ->add('twitterName', null, array('required' => false))
-//            ->add('gplusUid', null, array('required' => false))
-//            ->add('gplusName', null, array('required' => false))
-//            ->end();
+
 
         if (!$this->getSubject()->hasRole('ROLE_SUPER_ADMIN')) {
 
         $formMapper
             ->with('Management')
-            ->add(
-                'realRoles',
-                'sonata_security_roles',
-                array(
-                    'expanded' => true,
-                    'multiple' => true,
-                    'required' => false,
-                    'label_render' => false,
-                    'label' => false,
+                ->add(
+                    'realRoles',
+                    'sonata_security_roles',
+                    array(
+                        'expanded' => true,
+                        'multiple' => true,
+                        'required' => false,
+                        'label_render' => false,
+                        'label' => false,
+                    )
                 )
-            )
-            ->add('locked', null, array('required' => false), array('inline_block' => true))
-            ->add('expired', null, array('required' => false), array('inline_block' => true))
-            ->add('enabled', null, array('required' => false), array('inline_block' => true))
-            ->add('credentialsExpired', null, array('required' => false), array('inline_block' => true))
+                ->add('locked', null, array('required' => false), array('inline_block' => true))
+                ->add('expired', null, array('required' => false), array('inline_block' => true))
+                ->add('enabled', null, array('required' => false), array('inline_block' => true))
+                ->add('credentialsExpired', null, array('required' => false), array('inline_block' => true))
             ->end();
         }
 
-//        $formMapper
-//            ->with('Security')
-//            ->add('token', null, array('required' => false))
-//            ->add('twoStepVerificationCode', null, array('required' => false))
-//            ->end();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function postUpdate($object)
+    {
+        $securityContext = $this->getConfigurationPool()->getContainer()->get('security.context');
+        if($object == $securityContext->getToken()->getUser()){
+            $this->getRequest()->getSession()->set( 'admin/_locale', $object->getLocale());
+        }
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -54,7 +54,7 @@ public function getTrackedActions() @@
          */
         public function getIcon()
         {
-            return 'glyph-camera-retro';
+            return 'glyphicon-camera-retro';
         }
         /**
@@ Expand Down @@