Changeset 4484

Timestamp:

01/20/12 10:41:35 (4 months ago)

Author:

tboutell

Message:

* BaseaSlideshowSlotActions?: Factored out the slideshow slot code that relinks the related media items into a separate method so it can be easily called from overrides
* BaseaActions?: New 'quiet' option to editSave saves a new version of the slot but doesn't try to render anything
* BaseaActions?: New 'refresh' option to editSave (which defaults to true) can be explicitly shut off to avoid refreshing the whole page object if you don't need the overhead right now

Location:

plugins/apostrophePlugin/branches/1.5/lib/action

Files:

• BaseaSlideshowSlotActions.class.php (modified) (2 diffs)
• BaseaSlotActions.class.php (modified) (2 diffs)

plugins/apostrophePlugin/branches/1.5/lib/action/BaseaSlideshowSlotActions.class.php

@@ -26 +26 @@
     {
       $ids = preg_split('/,/', $request->getParameter('aMediaIds'));
-      $q = Doctrine::getTable('aMediaItem')->createQuery('m')->select('m.*')->whereIn('m.id', $ids)->andWhere('m.type = "image"');
-      // Let the query preserve order for us
-      $items = aDoctrine::orderByList($q, $ids)->execute();
-      $this->slot->unlink('MediaItems');
-      $links = aArray::getIds($items);
-      $this->slot->link('MediaItems', $links);
+      $this->relinkMediaItems($ids);
 
       // This isn't a normal form submission, but the act of selecting items for a
@@ -47 +42 @@
     }
   }
+
+  /**
+   * Drop any existing links to media items and re-link to any valid media item ids
+   * mentioned in $ids. Doctrine is not very good at this, but this solution is
+   * battle-tested
+   */
+  protected function relinkMediaItems($ids)
+  {
+    $q = Doctrine::getTable('aMediaItem')->createQuery('m')->select('m.*')->whereIn('m.id', $ids)->andWhere('m.type = "image"');
+    // Let the query preserve order for us
+    $items = aDoctrine::orderByList($q, $ids)->execute();
+    $this->slot->unlink('MediaItems');
+    $links = aArray::getIds($items);
+    $this->slot->link('MediaItems', $links);
+  }
   
   protected function afterSetMediaIds()

plugins/apostrophePlugin/branches/1.5/lib/action/BaseaSlotActions.class.php

@@ -107 +107 @@
 
   /**
-   * DOCUMENT ME
-   * @return mixed
-   */
-  protected function editSave()
-  {
+   * Save a new version of the area with the updated or created slot in question, refreshing the page
+   * so that it will render properly. If the request parameter 'noajax' is present, redirect to the
+   * page, otherwise call editAjax to trigger an ajax refresh of the slot. 
+   *
+   * If $options['quiet'] is specified and true, don't try to redirect or refresh the slot, just do the 
+   * backend storage of the new version of the slot. If $options['refresh'] is specified and false,
+   * don't refresh the page and its slots
+   *
+   * @return mixed
+   */
+  protected function editSave($options)
+  {
+    $quiet = isset($options['quiet']) && $options['quiet'];
+    $refresh = (!isset($options['refresh'])) || $options['refresh'];
+    
     // A simple hook to let other code know when slot editing has taken place and 
     // a new slot is about to be saved. Since objects are passed by reference it's
@@ -125 +135 @@
     // Refetch the page to reflect these changes before we
     // rerender the slot
-    aTools::setCurrentPage(
-      aPageTable::retrieveByIdWithSlots($this->page->id));
-    if ($this->getRequestParameter('noajax'))
-    {
-      return $this->redirectToPage();
-    }
-    else
-    {
-      return $this->editAjax(false);
+    if ($refresh)
+    {
+      aTools::setCurrentPage(
+        aPageTable::retrieveByIdWithSlots($this->page->id));
+    }
+    if (!$quiet)
+    {
+      if ($this->getRequestParameter('noajax'))
+      {
+        return $this->redirectToPage();
+      }
+      else
+      {
+        return $this->editAjax(false);
+      }
     }
   }