@@ -78,10 +78,11 @@ class PostsController < BaseController @related = Post.find_related_to(@post) @most_commented = Post.find_most_commented - respond_to do |format| - format.html - format.any - end + + # respond_to do |format| + # format.html + # format.any + # end end def update_views app/controllers/posts_controller.rb @@ -9,12 +9,8 @@ module PostsHelper paragraphs = doc.search("p") if paragraphs.length > 4 - paragraphs.each_with_index do |p,i| - if i.eql?(2) - p.before string - p[:id] = "jump" - end - end + graph_html = paragraphs[2].inner_html + paragraphs[2].swap(string + "<p id='jump'>#{graph_html}</p>") end doc.to_html app/helpers/posts_helper.rb @@ -1,4 +1,4 @@ .poll_excerpt - =image_tag 'icons/poll.png', :plugin => 'community_engine' + = image_tag 'icons/poll.png', :plugin => 'community_engine' = poll.question = link_to :vote_now.l, new_vote_path(:post_id => poll.post.id), {:title => 'Log in to vote', :class => 'vote'} app/views/polls/_excerpt.html.haml @@ -2,8 +2,8 @@ class AuthlogicCompatibilityChanges < ActiveRecord::Migration def self.up # Remove varchar(40) so users can specify alternate encryption methods without schema changes - change_column :users, :crypted_password, :string, :limit => 255, :null => false - change_column :users, :salt, :string, :limit => 255, :null => false + change_column :users, :crypted_password, :string, :limit => 255 + change_column :users, :salt, :string, :limit => 255 rename_column :users, :salt, :password_salt rename_column :users, :remember_token, :persistence_token @@ -15,8 +15,8 @@ class AuthlogicCompatibilityChanges < ActiveRecord::Migration t.column :perishable_token, :string # Magic columns, just like ActiveRecord's created_at and updated_at. These are automatically maintained by Authlogic if they are present. - t.column :login_count, :integer, :null => false, :default => 0 # optional, see Authlogic::Session::MagicColumns - t.column :failed_login_count, :integer, :null => false, :default => 0 # optional, see Authlogic::Session::MagicColumns + t.column :login_count, :integer, :default => 0 # optional, see Authlogic::Session::MagicColumns + t.column :failed_login_count, :integer, :default => 0 # optional, see Authlogic::Session::MagicColumns t.column :last_request_at, :datetime # optional, see Authlogic::Session::MagicColumns t.column :current_login_at, :datetime # optional, see Authlogic::Session::MagicColumns t.column :current_login_ip, :string # optional, see Authlogic::Session::MagicColumns @@ -44,8 +44,8 @@ class AuthlogicCompatibilityChanges < ActiveRecord::Migration rename_column :users, :password_salt, :salt # DANGEROUS! if passwords were migrated to a longer than 40 char crypt then this is a bad idea! - change_column :users, :crypted_password, :string, :limit => 40, :null => false - change_column :users, :salt, :string, :limit => 40, :null => false + change_column :users, :crypted_password, :string, :limit => 40 + change_column :users, :salt, :string, :limit => 40 end end db/migrate/071_authlogic_compatibility_changes.rb 9b7e2e3e1ec6543a03dc64faaecf014de639ba09 bborn bruno.bornsztein@gmail.com http://github.com/bborn/communityengine/commit/098e72abd7e731a9aa3102489f72d93e252f3d12 098e72abd7e731a9aa3102489f72d93e252f3d12 2009-11-09T07:40:47-08:00 2009-11-09T07:40:47-08:00 don't force crypted password to be present in database (use Rails validations) 74b7db9f8a9cee0afeed46c1b41f3b33d9ef99cb bborn bruno.bornsztein@gmail.com