Closes GH-44. Authors are now associated with blog posts by current_user Merge branch 'addingusers'

Conflicts:
	app/models/blog_post.rb

5 files changed, 52 insertions, 4 deletions

diff --git a/app/controllers/admin/blog/posts_controller.rb b/app/controllers/admin/blog/posts_controller.rb
index 1b6efc3..e8ffed2 100644
--- a/app/controllers/admin/blog/posts_controller.rb
+++ b/app/controllers/admin/blog/posts_controller.rb
@@ -10,6 +10,52 @@ class Admin::Blog::PostsController < Admin::BaseController
       :per_page => BlogPost.per_page
     })
   end
+  
+  def create
+    # if the position field exists, set this object as last object, given the conditions of this class.
+    if BlogPost.column_names.include?("position")
+      params[:blog_post].merge!({
+        :position => ((BlogPost.maximum(:position, :conditions => "")||-1) + 1)
+      })
+    end
+    
+    if BlogPost.column_names.include?("user_id")
+      params[:blog_post].merge!({
+        :user_id => current_user.id
+      })
+    end
+
+    if (@blog_post = BlogPost.create(params[:blog_post])).valid?
+      (request.xhr? ? flash.now : flash).notice = t(
+        'refinery.crudify.created',
+        :what => "'#{@blog_post.title}'"
+      )
+
+      unless from_dialog?
+        unless params[:continue_editing] =~ /true|on|1/
+          redirect_back_or_default(admin_blog_posts_url)
+        else
+          unless request.xhr?
+            redirect_to :back
+          else
+            render :partial => "/shared/message"
+          end
+        end
+      else
+        render :text => "<script>parent.window.location = '#{admin_blog_posts_url}';</script>"
+      end
+    else
+      unless request.xhr?
+        render :action => 'new'
+      else
+        render :partial => "/shared/admin/error_messages",
+               :locals => {
+                 :object => @blog_post,
+                 :include_object_name => true
+               }
+      end
+    end
+  end
 
   before_filter :find_all_categories,
                 :only => [:new, :edit, :create, :update]
diff --git a/app/models/blog_post.rb b/app/models/blog_post.rb
index 3a51530..1132c8f 100644
--- a/app/models/blog_post.rb
+++ b/app/models/blog_post.rb
@@ -2,7 +2,9 @@ class BlogPost < ActiveRecord::Base
   
   default_scope :order => 'published_at DESC'
   #.first & .last will be reversed -- consider a with_exclusive_scope on these?
-    
+      
+  belongs_to :author, :class_name => 'User', :foreign_key => :user_id
+  
   has_many :comments, :class_name => 'BlogComment', :dependent => :destroy
   
   has_many :categorizations
diff --git a/app/views/admin/blog/posts/_post.html.erb b/app/views/admin/blog/posts/_post.html.erb
index fa64292..1226082 100644
--- a/app/views/admin/blog/posts/_post.html.erb
+++ b/app/views/admin/blog/posts/_post.html.erb
@@ -1,7 +1,7 @@
 <li class='clearfix record <%= cycle("on", "on-hover") %>' id="<%= dom_id(post) -%>">
   <span class='title'>
     <%= post.title %>
-    <span class="preview"><%= post.published_at.try(:strftime, '%b %d, %Y') || 'draft' %></span>
+    <span class="preview"><%= post.published_at.try(:strftime, '%b %d, %Y') || 'draft' %><%= " by #{post.author.username}" if post.author.present? %></span>
   </span>
   <span class='actions'>
     <%= link_to refinery_icon_tag("application_go.png"), blog_post_url(post),
diff --git a/app/views/blog/posts/_post.html.erb b/app/views/blog/posts/_post.html.erb
index 6a16631..d1c204e 100644
--- a/app/views/blog/posts/_post.html.erb
+++ b/app/views/blog/posts/_post.html.erb
@@ -9,7 +9,7 @@
     <details>
       <time datetime="<%=l @blog_post.published_at.to_date, :format => :default %>" class='posted_at'>
         <%= t('blog.shared.posts.created_at', :when => l(@blog_post.published_at.to_date, :format => :short)) %>.
-      </time>
+      </time><%= " by #{@blog_post.author.username}" if @blog_post.author.present? %>
       <% if (categories = @blog_post.categories).any? %>
         <aside class='filed_in'>
           <%= t('blog.posts.show.filed_in') %>
diff --git a/app/views/blog/shared/_post.html.erb b/app/views/blog/shared/_post.html.erb
index 2bc71e0..345081a 100644
--- a/app/views/blog/shared/_post.html.erb
+++ b/app/views/blog/shared/_post.html.erb
@@ -5,7 +5,7 @@
       <details>
         <time datetime="<%=l post.published_at.to_date, :format => :default %>" class='posted_at'>
           <%= t('blog.shared.posts.created_at', :when => l(post.published_at.to_date, :format => :short)) %>.
-        </time>
+        </time><%= " by #{@blog_post.author.username}" if @blog_post.author.present? %>
         <% if (categories = post.categories).any? %>
           <aside class='filed_in'>
             <%= t('filed_in', :scope => 'blog.posts.show') %>