Correct length of generated permalink on duplication [#78 state:resol…

…ved]
cykod · Aug 19, 2010 · 81a238c · 81a238c
1 parent 22c5051
commit 81a238c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/vendor/modules/blog/app/controllers/blog/page_renderer.rb b/vendor/modules/blog/app/controllers/blog/page_renderer.rb
@@ -102,7 +102,7 @@ def entry_detail
     @options = paragraph_options(:entry_detail)
 
     blog = get_blog
-    return render_paragraph :text => (@options.blog_id > 0 ? '[Configure paragraph]' : '') unless blog
+    return render_paragraph :text => (@options.blog_id.to_i > 0 ? '[Configure paragraph]' : '') unless blog
 
     conn_type, conn_id = page_connection()
     display_string = "#{conn_type}_#{conn_id}_#{myself.user_class_id}"

diff --git a/vendor/modules/blog/app/models/blog/blog_post.rb b/vendor/modules/blog/app/models/blog/blog_post.rb
@@ -110,8 +110,9 @@ def generate_permalink!
       if permalink.blank? && self.active_revision
         date = self.published_at || Time.now
         permalink_try_partial = date.strftime("%Y-%m-") + self.active_revision.title.downcase.gsub(/[ _]+/,"-").gsub(/[^a-z+0-9\-]/,"")
+        permalink_try_partial = permalink_try_partial[0..59].gsub(/\-$/,"")
         idx = 2
-        permalink_try = permalink_try_partial[0..60]
+        permalink_try = permalink_try_partial
 
         while(Blog::BlogPost.find_by_permalink(permalink_try,:conditions => ['id != ?',self.id || 0] ))
           permalink_try = permalink_try_partial + '-' + idx.to_s
@@ -120,7 +121,7 @@ def generate_permalink!
 
         self.permalink = permalink_try
       elsif 
-        self.permalink = self.permalink.to_s.gsub(/[^a-z+0-9\-]/,"")
+        self.permalink = self.permalink.to_s.gsub(/[^a-z+0-9\-]/,"")[0..63]
       end
   end