@@ -13,13 +13,16 @@ class PostsController < ApplicationController end def admin - @posts = Post.find :all, :conditions => ['published = ?', false], :order => 'id DESC' + @posts = Post.find_all_by_published(false, :order => 'id DESC') @posts += Post.published.paginate(:per_page => 20, :page => params[:page]) end def show - @post = Post.published.find(:first, params[:id], :include => [:comments, :user]) - redirect_to posts_url and return if @post.blank? + begin + @post = Post.published.find(params[:id], :include => [:comments, :user]) + rescue ActiveRecord::RecordNotFound => ex + redirect_to posts_url and return if @post.blank? + end respond_to do |format| format.html # show.html.erb @@ -40,8 +43,12 @@ class PostsController < ApplicationController end def create - create_guest(params[:user]) unless logged_in? - @post = current_user.posts.new(params[:post]) + @post = Post.new(params[:post]) + unless logged_in? + @user = create_guest(params[:user]) + render :action => :new and return if @user.new_record? + end + @post.user = current_user @post.published = params[:post][:published] if current_user.moderator? respond_to do |format| app/controllers/posts_controller.rb @@ -17,12 +17,15 @@ class SitesController < ApplicationController def admin @sites = Site.find_all_by_published(false, :limit => 10) - @sites += Site.published(:per_page => 10, :page => params[:page]) + @sites += Site.published.paginate(:per_page => 10, :page => params[:page]) end def show - @site = Site.find_by_id_and_published(params[:id], true, :include => [:comments, :assets]) - redirect_to sites_url and return unless @site + begin + @site = Site.published(params[:id], :include => [:comments, :user, :assets]) + rescue ActiveRecord::RecordNotFound => ex + redirect_to sites_url and return unless @site + end respond_to do |format| format.html # show.html.erb @@ -43,8 +46,12 @@ class SitesController < ApplicationController end def create - create_guest(params[:user]) unless logged_in? - @site = current_user.sites.new(params[:site]) + @site = Site.new(params[:site]) + unless logged_in? + @user = create_guest(params[:user]) + render :action => :new and return if @user.new_record? + end + @site.user = current_user @site.published = params[:site][:published] if current_user.moderator? respond_to do |format| if @site.save app/controllers/sites_controller.rb @@ -24,8 +24,8 @@ class Post < ActiveRecord::Base end def excerpt + return self[:excerpt] unless self[:excerpt].blank? return self[:body] if self[:body].length < 150 return self[:body][/.{0,150}\w*/] + "..." if self[:excerpt].blank? - self[:excerpt] end end app/models/post.rb @@ -19,7 +19,7 @@ class Site < ActiveRecord::Base # validates_length_of :description, :minimum => 40 def before_validation - self.permalink = PermalinkFu.escape(self.url_short) if self.permalink.blank? + self.permalink = PermalinkFu.escape(self.url_short.gsub('www.', '')) if self.permalink.blank? self.thumbnail_filename = self.screenshot.nil? ? nil : self.screenshot.public_filename(:thumb) end @@ -36,6 +36,7 @@ class Site < ActiveRecord::Base end def thumbnail_url(request) + return false if self.thumbnail_filename.blank? request.protocol + request.host_with_port + self.thumbnail_filename end app/models/site.rb @@ -1,4 +1,4 @@ -<h1>New post</h1> +<% @page_title = 'Add a new post' %> <%= error_messages_for :post %> @@ -10,15 +10,7 @@ <legend>Your data</data> <p>You are not logged in but if you already have an account, you may <%= link_to 'login', login_url %> first. If you don't have an account yet, you can type in your email address and <em>we will create an account for you</em>.</p> <% fields_for :user do |fu| %> - <p><%= fu.label :name, 'Name' %><br /> - <%= fu.text_field :name %> - </p> - <p><%= fu.label :email, 'E-Mail' %><br /> - <%= fu.text_field :email %> - </p> - <p><%= fu.label :website, 'Website' %><br /> - <%= fu.text_field :website %> - </p> + <%= render :partial => '/users/form', :locals => {:f => fu} %> <% end %> </fieldset> <% end %> app/views/posts/new.html.erb @@ -2,9 +2,10 @@ <div class="post"> <div class="meta"> posted by <%= link_to h(@post.user.name), user_url(@post.user) %> on <%= @post.published_at.to_formatted_s(:long) %><br /> - tags: <span class="tags"><%= link_to_tags(@post.cached_tag_list, :posts) %></span> -</div> -<%= textilize(@post.body) %> + tags: <span class="tags"><%= @post.cached_tag_list %></span> + </div> + <%= textilize(@post.excerpt) %> + <%= textilize(@post.body) %> <div id="comments"> <h3>Comments</h3> app/views/posts/show.html.erb @@ -1,4 +1,4 @@ <p> -<%= image_tag(site.thumbnail_url(request), :style => "float:left;") %> +<%= image_tag(site.thumbnail_url(request), :style => "float:left;") if site.thumbnail_url %> <%= textilize site.description %> </p> app/views/sites/_feed_content.html.erb @@ -6,7 +6,8 @@ <% if latest_sites(14).blank? %> <p>No sites so far</p> <% else %> - <% latest_sites(14).each do |site| %> + <% latest_sites(14).each do |site| + next if site.screenshot.nil? %> <%= link_to image_tag(site.screenshot.public_filename(:tiny), :alt => site.title), site_url(site), :title => [site.title, site.description].join(" - ") %> <% end %> <% end %> app/views/sites/_sidebar_right.html.erb @@ -5,5 +5,7 @@ <h3><%= link_to h(site.title), site %></h3> <%= textilize(site.description) %> + + <%= link_to site.url_short, site.url %> // <%= link_to pluralize(site.comments_count, 'comment'), site_path(site) + '#comments' %> </div> app/views/sites/_site.html.erb @@ -1,7 +1,7 @@ <% @page_title = 'sites administration' %> <% @sites.each do |site| %> - <div id="site-<%= site.id%>" class="<%= 'featured ' if site.featured? %><%= 'published' if site.published? %>"><%= link_to h(site.title), site %> by <%= link_to site.user.name, user_url(site.user_id) %> on <%= site.created_at.to_s(:long) %> is <%= 'not' unless site.published? %> published and has <%= pluralize(site.comments_count, 'comment') %><br /> + <div id="site-<%= site.id%>" class="<%= 'featured ' if site.featured? %><%= 'published' if site.published? %>"><%= link_to h(site.title), site %> <%= link_to h(site.url_short), site.url %> by <%= link_to site.user.name, user_url(site.user_id) %> on <%= site.created_at.to_s(:long) %> is <%= 'not' unless site.published? %> published and has <%= pluralize(site.comments_count, 'comment') %><br /> <% unless site.published %> <%= link_to 'publish', publish_site_url(site), :method => :put %> | <% end %> app/views/sites/admin.html.erb @@ -1,7 +1,7 @@ <% @page_title = 'featured sites' %> <div id="sites"> - <%= will_paginate @posts %> + <%= render :partial => "site", :collection => @sites %> - <%= will_paginate @posts %> + <%= will_paginate @sites %> </div> \ No newline at end of file app/views/sites/index.html.erb @@ -10,15 +10,7 @@ <legend>Your data</data> <p>You are not logged in but if you already have an account, you may <%= link_to 'login', login_url %> first. If you don't have an account yet, you can type in your email address and <em>we will create an account for you</em>.</p> <% fields_for :user do |fu| %> - <p><%= fu.label :name, 'Name' %><br /> - <%= fu.text_field :name %> - </p> - <p><%= fu.label :email, 'E-Mail' %><br /> - <%= fu.text_field :email %> - </p> - <p><%= fu.label :website, 'Website' %><br /> - <%= fu.text_field :website %> - </p> + <%= render :partial => '/users/form', :locals => {:f => fu } %> <% end %> </fieldset> <% end %> app/views/sites/new.html.erb @@ -1,4 +1,5 @@ <% @page_title = h(@site.title) %> +<%= link_to @site.url_short, @site.url, :class => 'site_url' %> <div class="site"> <div class="body"><%= textilize(@site.description) %></div> app/views/sites/show.html.erb @@ -28,7 +28,7 @@ end module Goldberg class User - validates_uniqueness_of :name, :unless => Proc.new {|record| record.name == 'guest' } + validates_presence_of :email def is_guest? name =~ /^guest/ lib/goldberg_user_extensions.rb 661cb460d4f3834291ff8f74433f33b67a1d3d91 TomK32 tomk32@tomk32.de http://github.com/TomK32/plasticairships/commit/e5f4be827c43c9382f358be42e4989649511f101 e5f4be827c43c9382f358be42e4989649511f101 2008-06-16T00:21:11-07:00 2008-06-16T00:21:11-07:00 a few fixes for finders in the controllers changed create_guest * capture and display errors * send registration mail moved user form to partial fixed post#excerpt rescueing from sites with no assets acff5ad7de2305b309b7e1cb6fc66339cdb57d82 TomK32 tomk32@tomk32.de