Changeset 1108

Timestamp:

04/30/10 15:13:53 (22 months ago)

Author:

dordille

Message:

rescoped aBlogAdmin body class to a-blog-admin for compatibility with aEventAdmin

Location:

plugins/apostropheBlogPlugin/trunk

Files:

• data/generator/sfDoctrineModule/aBlogAdmin/parts/batchAction.php (modified) (3 diffs)
• data/generator/sfDoctrineModule/aBlogAdmin/template/templates/_assets.php (modified) (1 diff)
• lib/model/doctrine/PluginaBlogItemTable.class.php (modified) (1 diff)
• modules/aBlogAdmin/config/generator.yml (modified) (1 diff)
• modules/aBlogAdmin/lib/BaseaBlogAdminActions.class.php (modified) (2 diffs)
• modules/aBlogAdmin/templates/editSuccess.php (modified) (1 diff)
• modules/aEventAdmin/config/generator.yml (modified) (2 diffs)
• modules/aEventAdmin/lib/BaseaEventAdminActions.class.php (modified) (2 diffs)
• modules/aEventAdmin/templates/_form.php (modified) (1 diff)
• modules/aEventAdmin/templates/editSuccess.php (modified) (1 diff)
• web/css/aBlog.css (modified) (4 diffs)

plugins/apostropheBlogPlugin/trunk/data/generator/sfDoctrineModule/aBlogAdmin/parts/batchAction.php

@@ -44 +44 @@
   }
 
-  protected function executeBatchDelete(sfWebRequest $request)
+  protected function batchAction($action, sfWebRequest $request)
   {
-    // TBB: use collection delete rather than a delete query. This ensures
-    // that the object's delete() method is called, which provides
-    // for checking userHasPrivileges()
-    
     $ids = $request->getParameter('ids');
 
@@ -60 +56 @@
     try
     {
-      $items->delete();
+      $items->$action();
     } catch (Exception $e)
     {
       $error = true;
     }
+    return $error;
+  }
+
+  protected function executeBatchDelete(sfWebRequest $request)
+  {
+    $error = $this->batchAction('delete', $request);
     
-    if (($count == count($ids)) && (!$error))
+    if (($count == count($request->getParameter('ids'))) && (!$error))
     {
       $this->getUser()->setFlash('notice', 'The selected items have been deleted successfully.');
@@ -77 +79 @@
     $this->redirect('@<?php echo $this->getUrlForAction('list') ?>');
   }
+
+
+  protected function executeBatchPublish(sfWebRequest $request)
+  {
+    $error = $this->batchAction('publish', $request);
+
+    if (($count == count($request->getParameter('ids'))) && (!$error))
+    {
+      $this->getUser()->setFlash('notice', 'The selected items have been published successfully.');
+    }
+    else
+    {
+      $this->getUser()->setFlash('error', 'An error occurred while publishing the selected items.');
+    }
+
+    $this->redirect('@<?php echo $this->getUrlForAction('list') ?>');
+  }
+
+  protected function executeBatchUnpublish(sfWebRequest $request)
+  {
+    $error = $this->batchAction('unpublish', $request);
+
+    if (($count == count($request->getParameter('ids'))) && (!$error))
+    {
+      $this->getUser()->setFlash('notice', 'The selected items have been unpublished successfully.');
+    }
+    else
+    {
+      $this->getUser()->setFlash('error', 'An error occurred while unpublishing the selected items.');
+    }
+
+    $this->redirect('@<?php echo $this->getUrlForAction('list') ?>');
+  }

plugins/apostropheBlogPlugin/trunk/data/generator/sfDoctrineModule/aBlogAdmin/template/templates/_assets.php

@@ -1 @@
-[?php slot('body_class') ?]a-admin [?php echo $sf_params->get('module'); ?] [?php echo $sf_params->get('action');?] [?php end_slot() ?]
+[?php slot('body_class') ?]a-admin a-blog-admin [?php echo $sf_params->get('module'); ?] [?php echo $sf_params->get('action');?] [?php end_slot() ?]
 
   [?php use_stylesheet('/apostrophePlugin/css/a.css', 'first') ?]

plugins/apostropheBlogPlugin/trunk/lib/model/doctrine/PluginaBlogItemTable.class.php

@@ -34 +34 @@
   }
 
-  public function filterByEditable(Doctrine_Query $q, $user_id)
+  public function filterByEditable(Doctrine_Query $q, $user_id = null)
   {
+    if(is_null($user_id))
+      $user_id = sfContext::getInstance()->getUser()->getGuardUser()->getId();
+
     $rootAlias = $q->getRootAlias();
     $q->leftJoin($rootAlias.'.Categories c');

plugins/apostropheBlogPlugin/trunk/modules/aBlogAdmin/config/generator.yml

@@ -20 +20 @@
       
       list:
+        table_method:   filterByEditable
         title:    "Blog Post Admin"
         display:  [ _title, _author_id, _editors_list, _tags_list, _categories_list, status, published_at ]

plugins/apostropheBlogPlugin/trunk/modules/aBlogAdmin/lib/BaseaBlogAdminActions.class.php

@@ -10 +10 @@
  */
 abstract class BaseaBlogAdminActions extends autoABlogAdminActions
-{ 
+{
 
   public function executeNew(sfWebRequest $request)
@@ -59 +59 @@
     $this->setTemplate('edit');
   }
-
-  protected function buildQuery()
-  {
-    $tableMethod = $this->configuration->getTableMethod();
-    if (is_null($this->filters))
-    {
-      $this->filters = $this->configuration->getFilterForm($this->getFilters());
-    }
-
-    $this->filters->setTableMethod($tableMethod);
-
-    $query = $this->filters->buildQuery($this->getFilters());
-
-    $this->addSortQuery($query);
-
-    if(!$this->getUser()->hasCredential('admin'))
-    {
-      Doctrine::getTable('aBlogPost')->filterByEditable($query, $this->getUser()->getGuardUser()->getId());
-    }
-
-    $event = $this->dispatcher->filter(new sfEvent($this, 'admin.build_query'), $query);
-    $query = $event->getReturnValue();
-
-    return $query;
-  }
-
-  protected function executeBatchPublish(sfWebRequest $request)
-  {
-    $ids = $request->getParameter('ids');
-
-    $items = Doctrine_Query::create()
-      ->from('aBlogPost')
-      ->whereIn('id', $ids)
-      ->execute();
-    $count = count($items);
-    $error = false;
-    try
-    {
-      foreach($items as $item)
-      {
-        $item->publish();
-      }
-      $items->save();
-    } catch (Exception $e)
-    {
-      $error = true;
-    }
-
-    if (($count == count($ids)) && (!$error))
-    {
-      $this->getUser()->setFlash('notice', 'The selected items have been published successfully.');
-    }
-    else
-    {
-      $this->getUser()->setFlash('error', 'An error occurred while publishing the selected items.');
-    }
-
-    $this->redirect('@a_blog_admin');
-  }
-
-  protected function executeBatchUnpublish(sfWebRequest $request)
-  {
-    $ids = $request->getParameter('ids');
-
-    $items = Doctrine_Query::create()
-      ->from('aBlogPost')
-      ->whereIn('id', $ids)
-      ->execute();
-    $count = count($items);
-    $error = false;
-    try
-    {
-      foreach($items as $item)
-      {
-        $item->unpublish();
-      }
-      $items->save();
-    } catch (Exception $e)
-    {
-      $error = true;
-    }
-
-    if (($count == count($ids)) && (!$error))
-    {
-      $this->getUser()->setFlash('notice', 'The selected items have been unpublished successfully.');
-    }
-    else
-    {
-      $this->getUser()->setFlash('error', 'An error occurred while unpublishing the selected items.');
-    }
-
-    $this->redirect('@a_blog_admin');
-  }
-  
 }

plugins/apostropheBlogPlugin/trunk/modules/aBlogAdmin/templates/editSuccess.php

@@ -1 +1 @@
 <?php use_helper('I18N', 'Date', 'jQuery', 'a') ?>
 <?php include_partial('aBlogAdmin/assets') ?>
-<?php slot('body_class') ?>a-admin <?php echo $sf_params->get('module'); ?> <?php echo $sf_params->get('action') ?> <?php echo $a_blog_post['template'] ?><?php end_slot() ?>
+<?php slot('body_class') ?>a-admin a-blog-admin <?php echo $sf_params->get('module'); ?> <?php echo $sf_params->get('action') ?> <?php echo $a_blog_post['template'] ?><?php end_slot() ?>
 
 <div class="a-admin-container <?php echo $sf_params->get('module') ?>">

plugins/apostropheBlogPlugin/trunk/modules/aEventAdmin/config/generator.yml

@@ -20 +20 @@
 
       list:
-        title:    "Blog Post Admin"
+        title:    "Event Admin"
         display:  [ _title, _author_id, _editors_list, _tags_list, _categories_list, status, published_at ]
         fields:
@@ -37 +37 @@
         actions:
           new:
-            label: New Post
+            label: New Event
             action: new
             params:

plugins/apostropheBlogPlugin/trunk/modules/aEventAdmin/lib/BaseaEventAdminActions.class.php

@@ -33 +33 @@
     $this->a_event = $this->getRoute()->getObject();
     $this->form = $this->configuration->getForm($this->a_event);
-    
+
     if($request->isXmlHttpRequest())
     {
@@ -40 +40 @@
       {
         $this->a_event = $this->form->save();
+        //We need to recreate the form to handle the fact that it is not possible to change the value of a sfFormField
+        $this->form = $this->configuration->getForm($this->a_event);
         $this->dispatcher->notify(new sfEvent($this, 'admin.save_object', array('object' => $this->a_event)));
       }
       $this->setLayout(false);
-      return $this->renderPartial('aEventAdmin/form', array('a_event' => $this->a_event, 'form' => $this->form, 'dog' => '1'));
+      $response = array();
+      $response['aBlogPost'] = $this->a_event->toArray();
+      $response['modified'] = $this->a_event->getLastModified();
+      //Any additional messages can go here
+      $output = json_encode($response);
+      $this->getResponse()->setHttpHeader("X-JSON", '('.$output.')');
+      return sfView::HEADER_ONLY;
     }
     else

plugins/apostropheBlogPlugin/trunk/modules/aEventAdmin/templates/_form.php

@@ -12 +12 @@
 <div class="post-title post-slug option">
   <?php echo $form['title']->renderRow() ?>
-  <?php echo $form['slug']->getWidget()->render('a_blog_post[slug]', $a_blog_post['slug']) ?>
+  <?php echo $form['slug']->renderRow() ?>
   <?php echo $form['slug']->renderError() ?>
 </div>
-
-
 
 <?php // Huge Publish Button and Publish Date ?>

plugins/apostropheBlogPlugin/trunk/modules/aEventAdmin/templates/editSuccess.php

@@ -11 +11 @@
                         <div class="a-subnav-inner">
                                 <ul class="a-admin-action-controls">
-                                        <li><a href="<?php echo url_for('@a_blog_admin'); ?>" class="all-posts-btn"><?php echo __('All Posts', array(), 'apostrophe-blog') ?></a></li>
+                                        <li><a href="<?php echo url_for('@a_event_admin'); ?>" class="all-posts-btn"><?php echo __('All Events', array(), 'apostrophe-blog') ?></a></li>
                  <?php include_partial('list_actions', array('helper' => $helper)) ?>
                                 </ul>

plugins/apostropheBlogPlugin/trunk/web/css/aBlog.css

@@ -1 @@
-.aBlogAdmin .a-admin-container
-{
-float: left;
-width: 100%;
-}
-
-.aBlogAdmin #a-content,
-.aBlogAdmin .a-admin-content,
-.aBlogAdmin .a-admin-footer,
-.aBlogAdmin .a-admin-actions
-{
-width: 100%;
-}
-
-.aBlogAdmin .a-admin-content
+.a-blog-admin .a-admin-container
+{
+float: left;
+width: 100%;
+}
+
+.a-blog-admin #a-content,
+.a-blog-admin .a-admin-content,
+.a-blog-admin .a-admin-footer,
+.a-blog-admin .a-admin-actions
+{
+width: 100%;
+}
+
+.a-blog-admin .a-admin-content
 {
 float: right;
@@ -19 +19 @@
 }
 
-.aBlogAdmin.edit .a-admin-content
+.a-blog-admin.edit .a-admin-content
 {
 width: 720px;
 }
 
-.a-admin.aBlogAdmin .a-subnav-wrapper
+.a-admin.a-blog-admin .a-subnav-wrapper
 {
 width: 100%;
@@ -34 +34 @@
 }
 
-.a-admin.aBlogAdmin .a-subnav-inner
+.a-admin.a-blog-admin .a-subnav-inner
 {
         padding: 0;
@@ -99 +99 @@
 }
 
-.aBlogAdmin #a-admin-list-batch-actions,
-.aBlogAdmin #a-admin-list-th-actions
+.a-blog-admin #a-admin-list-batch-actions,
+.a-blog-admin #a-admin-list-th-actions
 {
 width: auto;