app/views/messages/_form.html.haml @@ -25,7 +25,7 @@ class TagsController < BaseController def show tag_names = URI::decode(params[:id]) - + @tags = Tag.find(:all, :conditions => [ 'name IN (?)', TagList.from(tag_names) ] ) if @tags.nil? || @tags.empty? flash[:notice] = :tag_does_not_exists.l_with_args(:tag => tag_names) app/controllers/tags_controller.rb @@ -2,6 +2,7 @@ class Message < ActiveRecord::Base is_private_message attr_accessor :to + attr_accessor :reply_to validates_presence_of :body, :subject validates_presence_of :recipient, :message => "is invalid" @@ -17,4 +18,19 @@ class Message < ActiveRecord::Base UserNotifier.deliver_message_notification(self) end + def self.new_reply(sender, in_reply_to = nil, params = {}) + message = new(params[:message]) + + if in_reply_to + return nil if in_reply_to.recipient != sender #can only reply to messages you received + message.reply_to = in_reply_to + message.to = in_reply_to.sender.login + message.subject = "Re: #{in_reply_to.subject}" + message.body = "\n\n*Original message*\n\n #{in_reply_to.body}" + message.sender = sender + end + + message + end + end \ No newline at end of file app/models/message.rb @@ -3,7 +3,10 @@ require_dependency File.dirname(__FILE__) + '/../../plugins/acts_as_taggable_on_ class Tag < ActiveRecord::Base def to_param - URI.escape(self.name, /[\/.?#]/) + param = URI.escape(self.name, /[\/.?#]/) + #quote if needed + param = "\"#{param}\"" if param.match(TagList.delimiter) + param end def related_tags app/models/tag.rb @@ -6,22 +6,5 @@ %h3= :compose_message.l = error_messages_for :message - - form_for @message, :url => user_messages_path(@user), :html => {:class => "MainForm"} do |f| - - -if @reply_to - =f.hidden_field :to - -else - %label{:for => 'message_to'} - =:to.l - %em= "(" + :type_a_username.l + ")" - = f.text_field :to - - - %label{:for => 'message_subject'}= :subject.l + ":" - = f.text_field :subject - - %label{:for => "message_body"}= :message.l + ":" - = f.text_area :body - - %p - = submit_tag :send.l + + =render :partial => 'form', :locals => {:message => @message, :user => @user} app/views/messages/new.html.haml @@ -21,7 +21,13 @@ = @message.created_at.to_s(:long) %pre.message_body= auto_link(h (@message.body)) - - %ul.message_nav - - if @message.recipient.eql? @user - %li.sent= link_to :reply.l, new_user_message_path(@user, :reply_to => @message) \ No newline at end of file + + -if @reply + %ul.message_nav + - if @message.recipient.eql? @user + %li.sent= link_to :reply.l, new_user_message_path(@user, :reply_to => @message), :onclick => "$('reply').toggle(); $('message_body').activate().scrollTo();return false;" + + %form.MainForm#dummy_reply + %textarea{:onclick => "$('reply').toggle(); $('message_body').activate(); $('dummy_reply').hide(); $(this).blur(); return false;", :style => "height: 75px;"} + + #reply{:style => "display:none;"}=render :partial => 'form', :locals => {:message => @reply, :user => @user} \ No newline at end of file app/views/messages/show.html.haml @@ -25,4 +25,4 @@ .yui-b.box %h3= :browse_content_by_tags.l - tag_cloud @tags, %w(nube1 nube2 nube3 nube4 nube5) do |name, css_class| - = link_to name, tag_url(name), :class => css_class + =link_to name, tag_url(URI.escape(name.to_s, /[\/.?#]/)), :class => css_class app/views/tags/index.html.haml @@ -121,7 +121,7 @@ resources :users, :member_path => '/:id', :nested_member_path => '/:user_id', :m user.resources :invitations user.resources :offerings, :collection => {:replace => :put} user.resources :favorites, :name_prefix => 'user_' - user.resources :messages, :collection => { :delete_selected => :post } + user.resources :messages, :collection => { :delete_selected => :post, :auto_complete_for_username => :any } user.resources :comments end resources :votes config/desert_routes.rb @@ -1,6 +1,7 @@ class TagList < Array cattr_accessor :delimiter - self.delimiter = ',' + # self.delimiter = / |\+|,/ + self.delimiter = /\+|,| / def initialize(*args) add(*args) @@ -79,10 +80,13 @@ class TagList < Array def from(string) returning new do |tag_list| string = string.to_s.gsub('.', '').dup - - # Parse the quoted tags - string.gsub!(/"(.*?)"\s*#{delimiter}?\s*/) { tag_list << $1; "" } - string.gsub!(/'(.*?)'\s*#{delimiter}?\s*/) { tag_list << $1; "" } + + [ + /\s*#{delimiter}\s*(['"])(.*?)\1\s*/, + /^\s*(['"])(.*?)\1\s*#{delimiter}?/ + ].each do |re| + string.gsub!(re) { tag_list << $2; "" } + end tag_list.add(string.split(delimiter)) end plugins/acts_as_taggable_on_steroids/lib/tag_list.rb config/initializers/tag_list_delimiter.rb 3fb91698d8359c204d3a964239f3920e2003dc98 060141c61d63143d56e8ab66d9f89ffc4f0a1a28 bborn bruno.bornsztein@gmail.com http://github.com/bborn/communityengine/commit/1563f3e8fd735d54208d42d24dc06542ccf0e0bd 1563f3e8fd735d54208d42d24dc06542ccf0e0bd 2009-05-08T13:20:14-07:00 2009-05-08T13:20:14-07:00 Merge branch 'edge' of git@github.com:bborn/communityengine into edge 463229a069037306569fdb41b96f7be06d9c3ef9 bborn bruno.bornsztein@gmail.com