typo 5.4 → 5.4.1

data/app/helpers/admin/content_helper.rb

@@ -6,51 +6,32 @@ module Admin::ContentHelper
   end
 
   def params_qsa
-    { 'search[category]' => @search[:category], 
-      'search[user_id]' => @search[:user_id], 
-      'search[published_at]' => @search[:published_at], 
+    { 'search[category]' => @search[:category],
+      'search[user_id]' => @search[:user_id],
+      'search[published_at]' => @search[:published_at],
       'searched[published]' => @search[:published] }
   end
 
   def link_to_destroy_draft(record, controller = @controller.controller_name)
     if record.state.to_s == "Draft"
-      link_to(_("Destroy this draft"), 
+      link_to(_("Destroy this draft"),
         { :controller => controller, :action => 'destroy', :id => record.id },
           :confirm => _("Are you sure?"), :method => :post )
     end
   end
 
-  def checkbox_for_collection(container, selected = nil)
-    container = container.to_a if Hash === container
-
-    options_for_select = container.inject([]) do |options, element|
-      text, value = option_text_and_value(element)
-      selected_attribute = ' checked' if option_value_selected?(value, selected)
-      options << %(<input type="checkbox" name="categories[]" id="category_#{html_escape(value.to_s)}" value="#{html_escape(value.to_s)}"#{selected_attribute} /><label for="category_#{html_escape(value.to_s)}">#{html_escape(text.to_s)}</label>)
-    end
-
-    options_for_select.join("<br />")
-  end
-
-  def checkboxes_from_collection(collection, value_method, text_method, selected = nil)
-    options = collection.map do |element|
-      [element.send(text_method), element.send(value_method)]
-    end
-    checkbox_for_collection(options, selected)
-  end
-  
   def auto_complete_result(entries, field, phrase = nil)
     return unless entries
     items = entries.map { |entry| content_tag("li", phrase ? highlight(entry[field], phrase) : h(entry[field])) }
     content_tag("ul", items.uniq)
   end
-  
+
   def auto_complete_field(field_id, options = {})
     function =  "var #{field_id}_auto_completer = new Ajax.Autocompleter("
     function << "'#{field_id}', "
     function << "'" + (options[:update] || "#{field_id}_auto_complete") + "', "
     function << "'#{url_for(options[:url])}'"
-    
+
     js_options = {}
     js_options[:tokens] = array_or_string_for_javascript(options[:tokens]) if options[:tokens]
     js_options[:callback]   = "function(element, value) { return #{options[:with]} }" if options[:with]
@@ -60,7 +41,7 @@ module Admin::ContentHelper
     js_options[:frequency]  = "#{options[:frequency]}" if options[:frequency]
     js_options[:method]     = "'#{options[:method].to_s}'" if options[:method]
 
-    { :after_update_element => :afterUpdateElement, 
+    { :after_update_element => :afterUpdateElement,
       :on_show => :onShow, :on_hide => :onHide, :min_chars => :minChars }.each do |k,v|
       js_options[v] = options[k] if options[k]
     end
@@ -69,7 +50,7 @@ module Admin::ContentHelper
 
     javascript_tag(function)
   end
-  
+
   def text_field_with_auto_complete(object, method, tag_options = {}, completion_options = {})
     (completion_options[:skip_style] ? "" : auto_complete_stylesheet) +
     text_field(object, method, tag_options) +
@@ -98,7 +79,7 @@ module Admin::ContentHelper
         background-color: #ffb;
       }
       div.auto_complete ul strong.highlight {
-        color: #800; 
+        color: #800;
         margin:0;
         padding:0;
       }

data/app/helpers/admin/themes_helper.rb

@@ -1,24 +1,22 @@
 module Admin::ThemesHelper
   require('find')
   def fetch_stylesheets
-    list = '<ul>'
+    list = ''
     Find.find(this_blog.current_theme.path + "/stylesheets") do |path|
       if path =~ /css$/ 
-        list << content_tag(:li, link_to(File.basename(path), {:controller => 'themes', :action => 'editor', :type => 'stylesheet', :file => File.basename(path)}))
+        list << content_tag(:p, link_to(File.basename(path), {:controller => 'themes', :action => 'editor', :type => 'stylesheet', :file => File.basename(path)}))
       end
     end
-    list << '</ul>'
     list
   end
 
   def fetch_layouts
-    list = '<ul>'
+    list = ''
     Find.find(this_blog.current_theme.path + "/layouts") do |path|
       if path =~ /rhtml$|erb$/ 
-        list << content_tag(:li, link_to(File.basename(path), {:controller => 'themes', :action => 'editor', :type => 'layout', :file => File.basename(path)}))
+        list << content_tag(:p, link_to(File.basename(path), {:controller => 'themes', :action => 'editor', :type => 'layout', :file => File.basename(path)}))
       end
     end
-    list << '</ul>'
     list
   end
   

data/app/helpers/articles_helper.rb

@@ -2,6 +2,8 @@ module ArticlesHelper
   def feed_atom
     if params[:action] == 'search'
       url_for(:only_path => false,:format => :atom, :q => params[:q])
+    elsif not @article.nil?
+      @article.feed_url(:atom)
     else
       @auto_discovery_url_atom
     end
@@ -10,6 +12,8 @@ module ArticlesHelper
   def feed_rss
     if params[:action] == 'search'
       url_for(:only_path => false,:format => :rss, :q => params[:q])
+    elsif not @article.nil?
+      @article.feed_url(:rss20)
     else
       @auto_discovery_url_rss
     end

data/app/models/article.rb

@@ -49,7 +49,12 @@ class Article < Content
 
   named_scope :category, lambda {|category_id| {:conditions => ['categorizations.category_id = ?', category_id], :include => 'categorizations'}}
   named_scope :drafts, :conditions => ['state = ?', 'draft']
+  named_scope :without_parent, {:conditions => {:parent_id => nil}}
+  named_scope :child_of, lambda { |article_id| {:conditions => {:parent_id => article_id}} }
 
+  def has_child?
+    Article.exists?({:parent_id => self.id})
+  end
 
   belongs_to :user
 
@@ -72,6 +77,14 @@ class Article < Content
   include Article::States
 
   class << self
+    def last_draft(article_id)
+      article = Article.find(article_id)
+      while article.has_child?
+        article = Article.child_of(article.id).first
+      end
+      article
+    end
+
     def published_articles
       find(:conditions => { :published => true }, :order => 'published_at DESC')
     end
@@ -481,14 +494,10 @@ class Article < Content
     else
       rss_desc = ""
     end
-    
-    entry.summary html(:body), "type" => "html"
-    if blog.show_extended_on_rss
-      post = html(:all)
-      content = blog.rss_description ? post + rss_desc : post
 
-      entry.content(content, :type => "html")
-    end
+    post = blog.show_extended_on_rss ? post = html(:all) : post = html(:body)
+    content = blog.rss_description ? post + rss_desc : post
+    entry.content(content, :type => "html")
   end
 
   def add_comment(params)
@@ -499,8 +508,8 @@ class Article < Content
     self.categorizations.build(:category => category, :is_primary => is_primary)
   end
 
-  def access_by?(user) 
-    user.admin? || user_id == user.id 
+  def access_by?(user)
+    user.admin? || user_id == user.id
   end
 
   protected
@@ -517,9 +526,9 @@ class Article < Content
   end
 
   def set_defaults
-    if self.attributes.include?("permalink") and 
-          (self.permalink.blank? or 
-          self.permalink.to_s =~ /article-draft/ or 
+    if self.attributes.include?("permalink") and
+          (self.permalink.blank? or
+          self.permalink.to_s =~ /article-draft/ or
           self.state == "draft"
     )
       self.permalink = self.stripped_title

data/app/models/blog.rb

@@ -38,7 +38,6 @@ class Blog < ActiveRecord::Base
   # Spam
   setting :sp_global,                  :boolean, false
   setting :sp_article_auto_close,      :integer, 0
-  setting :sp_allow_non_ajax_comments, :boolean, true
   setting :sp_url_limit,               :integer, 0
   setting :sp_akismet_key,             :string, ''
 

data/app/models/category.rb

@@ -7,11 +7,6 @@ class Category < ActiveRecord::Base
     :through => :categorizations,
     :order   => "published_at DESC, created_at DESC"
 
-  has_many :published_articles,
-    :through    => :categorizations,
-    :class_name => 'Article',
-    :conditions => { :published => true },
-    :order      => "published_at DESC"
 
   default_scope :order => 'position ASC'
 
@@ -60,7 +55,7 @@ class Category < ActiveRecord::Base
   end
 
   def published_articles
-    self.articles.find_already_published
+    articles.already_published
   end
 
   def display_name

data/app/models/content.rb

@@ -8,6 +8,7 @@ class Content < ActiveRecord::Base
     :source => 'notify_user',
     :uniq => true
 
+
   def notify_users=(collection)
     return notify_users.clear if collection.empty?
     self.class.transaction do
@@ -46,6 +47,9 @@ class Content < ActiveRecord::Base
     {:conditions => ['state = ? AND ' + (['(LOWER(body) LIKE ? OR LOWER(extended) LIKE ? OR LOWER(title) LIKE ?)']*tokens.size).join(' AND '),
                         "published", *tokens.collect{ |token| [token] * 3 }.flatten]}
   }
+  named_scope :already_published, lambda { {:conditions => ['published = ? AND published_at < ?', true, Time.now],
+    :order => default_order,
+    }}
 
   serialize :whiteboard
 
@@ -122,27 +126,27 @@ class Content < ActiveRecord::Base
         find_published(what, options)
       end
     end
-    
+
     def find_by_published_at(column_name = :published_at)
       from_where = "FROM #{self.table_name} WHERE #{column_name} is not NULL AND type='#{self.name}'"
 
       # Implement adapter-specific groupings below, or allow us to fall through to the generic ruby-side grouping
-      
+
       if defined?(ActiveRecord::ConnectionAdapters::MysqlAdapter) && self.connection.is_a?(ActiveRecord::ConnectionAdapters::MysqlAdapter)
         # MySQL uses date_format
         find_by_sql("SELECT date_format(#{column_name}, '%Y-%m') AS publication #{from_where} GROUP BY publication ORDER BY publication DESC")
-        
+
       elsif defined?(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter) && self.connection.is_a?(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter)
         # PostgreSQL uses to_char
         find_by_sql("SELECT to_char(#{column_name}, 'YYYY-MM') AS publication #{from_where} GROUP BY publication ORDER BY publication DESC")
-        
+
       else
         # If we don't have an adapter-safe conversion from date -> YYYY-MM,
         # we'll do the GROUP BY server-side. There won't be very many objects
         # in this array anyway.
         date_map = {}
         dates = find_by_sql("SELECT #{column_name} AS publication #{from_where}")
-    
+
         dates.map! do |d|
           d.publication = Time.parse(d.publication).strftime('%Y-%m')
           d.freeze
@@ -153,7 +157,7 @@ class Content < ActiveRecord::Base
         end
         dates.reject!{|d| d.blank? || d.publication.blank?}
         dates.sort!{|a,b| b.publication <=> a.publication}
-        
+
         dates
       end
     end

data/app/models/feedback/states.rb

@@ -59,7 +59,7 @@ module Feedback::States
     def before_save
       classify_content
     end
-    
+
     def to_s
       _("Unclassified")
     end
@@ -73,7 +73,7 @@ module Feedback::States
     end
     def to_s
       _("Just Presumed Ham")
-    end    
+    end
   end
 
   class PresumedHam < Base
@@ -119,7 +119,7 @@ module Feedback::States
     end
     def to_s
       _("Just Marked As Ham")
-    end    
+    end
   end
 
   class Ham < Base
@@ -153,7 +153,7 @@ module Feedback::States
     end
     def to_s
       _("Ham")
-    end   
+    end
   end
 
   class PresumedSpam < Base
@@ -194,7 +194,7 @@ module Feedback::States
     end
     def to_s
       _("Just Marked As Spam")
-    end    
+    end
   end
 
   class Spam < Base
@@ -215,6 +215,6 @@ module Feedback::States
     end
     def to_s
       _("Spam")
-    end     
+    end
   end
 end

data/app/models/tag.rb

@@ -3,7 +3,7 @@ class Tag < ActiveRecord::Base
   validates_uniqueness_of :name
   attr_reader :description
   attr_reader :keywords
-  
+
   def self.get(name)
     tagname = name.tr(' ', '').downcase
     tag = find_by_name_or_display_name(tagname, name)
@@ -43,8 +43,8 @@ class Tag < ActiveRecord::Base
         ON articles_tags.article_id = articles.id
       WHERE articles.published = ?
       GROUP BY tags.id, tags.name, tags.display_name
-      ORDER BY #{orderby} 
-      LIMIT ? OFFSET ? 
+      ORDER BY #{orderby}
+      LIMIT ? OFFSET ?
       },true, limit, start]).each{|item| item.article_counter = item.article_counter.to_i }
   end
 
@@ -59,15 +59,15 @@ class Tag < ActiveRecord::Base
   def self.to_prefix
     'tag'
   end
-   
-  # Return all tags with the char or string 
+
+  # Return all tags with the char or string
   # send by parameter
   def self.find_with_char(char)
     find :all, :conditions => ['name LIKE ? ', "%#{char}%"], :order => 'name ASC'
   end
-  
+
   def published_articles
-    articles.find_already_published
+    articles.already_published
   end
 
   def permalink
@@ -95,5 +95,5 @@ class Tag < ActiveRecord::Base
   def to_param
     permalink
   end
-  
+
 end

data/app/views/admin/content/_drafts.html.erb

@@ -1,6 +1,6 @@
 <div class='bordered'>
   <h3><label class="block content"><%= _("Drafts:") %></label></h3>
-  <% for draft in @drafts %>
+  <% Article.drafts.all.each do |draft| %>
     <%= link_to("#{draft.title}<br />", :action => 'edit', :id => draft.id) %>
   <% end %>
 </div>

data/app/views/admin/content/_form.html.erb

@@ -11,22 +11,25 @@
     <label for="article_allow_comments"><%= _("Allow comments") %></label><br />
     <%= check_box 'article', 'allow_pings' %>
     <label for="article_allow_pings"><%= _("Allow trackbacks")%></label><br />
-    <%= check_box 'article', 'published'  %>  
+    <%= check_box 'article', 'published'  %>
     <label for="article_published"><%= _("Published")%></label><br />
     <p class='right'>
       <input id='save_draft' type="submit" value="<%= _('Save as draft') %> &raquo;" name="article[draft]"/>&nbsp;
       <%= save( _("Publish") + " &raquo;") %><br />
       <%= link_to_destroy_with_profiles(@article) unless @article.id.nil? %>
-      <%= link_to_destroy_draft @article %>      
+      <%= link_to_destroy_draft @article %>
     </p>
-    <span id='preview_link'><%= link_to(_("Preview"), {:controller => '/previews', :id => @article.id}, {:target => 'new'}) if @article.id %></span>
+    <span id='preview_link'><%= link_to(_("Preview"), {:controller => '/articles', :action => 'preview', :id => @article.id}, {:target => 'new'}) if @article.id %></span>
   </div>
   <div class='editor_bottom'>
     <div class='editor_bottom_right'></div>
   </div>
   <div id="categories">
     <h3><%= _("Categories") %></h3>
-    <%= checkboxes_from_collection(@categories, "id", "name", @selected) %>        
+    <%- Category.all.each do |cat| %>
+      <%= check_box_tag('categories[]', cat.id, (@article.categories.map(&:id).include? cat.id), :id => "category_#{h(cat.id)}") %>
+      <%= label_tag "category_#{h(cat.id)}", h(cat.name) %><br />
+    <% end -%>
   </div>
   <%= render :partial => 'drafts'%>
 </div>

data/app/views/admin/content/index.html.erb

@@ -1,7 +1,7 @@
 <% @page_heading = _('Manage articles') %>
 <% subtabs_for(:content) %>
 
-<div class="list" id="articles">	
+<div class="list" id="articles">
   <% form_remote_tag  :url      => {:action => 'index'},
   :method   => :get,
   :name     => 'article',
@@ -26,7 +26,7 @@
     </tr>
     <tr class="menubar">
       <td>&nbsp;</td>
-      <td><%= collection_select_with_current('search', 'category', @categories, "id", "name", @search[:category].to_i, true)
+      <td><%= collection_select_with_current('search', 'category', Category.all, "id", "name", @search[:category].to_i, true)
       %></td>
       <td>
         <%= collection_select_with_current(:search, :published_at, Article.find_by_published_at, "publication", "publication", @search[:published_at], true) %>
@@ -47,4 +47,4 @@
     </table>
 
     <%end%>
-  </div>                      
+  </div>