Changeset 1062

Timestamp:

04/26/10 16:26:04 (22 months ago)

Author:

dordille

Message:

Editing a blog slug now works as designed, this fixes #206.

Location:

plugins/apostropheBlogPlugin/trunk

Files:

• config/doctrine/schema.yml (modified) (2 diffs)
• config/routing.yml (modified) (4 diffs)
• lib/form/doctrine/PluginaBlogItemForm.class.php (modified) (2 diffs)
• lib/model/doctrine/PluginaBlogItem.class.php (modified) (2 diffs)
• modules/aBlogAdmin/lib/BaseaBlogAdminActions.class.php (modified) (1 diff)
• web/js/aBlog.js (modified) (1 diff)

plugins/apostropheBlogPlugin/trunk/config/doctrine/schema.yml

@@ -6 +6 @@
     Timestampable: ~
     Taggable: ~
-    Sluggable:
-      canUpdate: true
   columns:
     id:
@@ -20 +18 @@
       type: string(255)
       notnull: true
+    slug:
+      type: string(255)
+      notnull: true
+      unique: true
+    slug_saved:
+      type: boolean
+      default: false
     excerpt:
       type: string

plugins/apostropheBlogPlugin/trunk/config/routing.yml

@@ -269 +269 @@
   url:   
   param: { module: aEvent, action: today }
-  class: aRoute 
+  class: aRoute
   
   
@@ -275 +275 @@
 # blog admin routes #
 ################
-
-
 
 a_blog_admin:
@@ -286 +284 @@
     column:              slug
     with_wildcard_routes: true
-    with_show:           false
+    with_show:            false
 
 a_blog_admin_autocomplete:
@@ -292 +290 @@
   param: { module: aBlogAdmin, action: autocomplete }
   class: sfRoute
-
 
 a_blog_admin_edit:

plugins/apostropheBlogPlugin/trunk/lib/form/doctrine/PluginaBlogItemForm.class.php

@@ -17 +17 @@
     
     unset(
-      $this['type'], $this['page_id'], $this['created_at'], $this['updated_at']
+      $this['type'], $this['page_id'], $this['created_at'], $this['updated_at'], $this['slug_saved']
     );
     
@@ -52 +52 @@
     $this->widgetSchema['tags']       = new sfWidgetFormInput(array('default' => implode(', ', $this->getObject()->getTags())), array('class' => 'tag-input', 'autocomplete' => 'off'));
     $this->validatorSchema['tags']    = new sfValidatorString(array('required' => false));
-  }
-
-  public function updateSlugColumn($value)
-  {
-    return $value;
   }
   

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

@@ -12 +12 @@
  */
 abstract class PluginaBlogItem extends BaseaBlogItem
-{  
+{
+  protected $update = true;
+
   /**
    * These date methods are use in the routing of the permalink
@@ -51 +53 @@
     $this->slug = 'untitled-'.$this['id'];
     $this->title = 'untitled';
+    $this['slug_saved'] = false;
+    $this->update = false;
     $this->save();
+  }
+
+  public function preUpdate($event)
+  {
+    if($this->update)
+    {
+      if(array_key_exists('slug', $this->getModified()))
+      {
+        $this['slug_saved'] = true;
+      }
+      if($this['slug_saved'] == false)
+      {
+        $this['slug'] = aTools::slugify($this['title']);
+      }
+    }
   }
   

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

@@ -17 +17 @@
     $this->a_blog_post->Author = $this->getUser()->getGuardUser();
     $this->a_blog_post->save();
-    $this->redirect('aBlogAdmin/edit?slug='.$this->a_blog_post->getSlug());
+    $this->redirect('a_blog_admin_edit', $this->a_blog_post);
   }
     

plugins/apostropheBlogPlugin/trunk/web/js/aBlog.js

@@ -98 +98 @@
 {
                 var permalinkInput = $('#a_blog_post_permalink_interface');
-                
+    var slugInput = $('#a_blog_post_slug');
                 if (slug != null)
                 {
-                        permalinkInput.val(slug);                       
+                        permalinkInput.val(slug);
+      slugInput.val(slug);
                 };