@@ -46,7 +46,7 @@ class MessagesController < ApplicationController # GET /messages/1/edit def edit - @message = Message.find(params[:id]) + #@message = Message.find(params[:id]) end # POST /messages @@ -59,7 +59,7 @@ class MessagesController < ApplicationController respond_to do |format| if @message.save flash[:notice] = 'Message was successfully sent.' - format.html { redirect_to(@message) } + format.html { redirect_to(messages_url) } format.xml { render :xml => @message, :status => :created, :location => @message } else format.html { render :action => "new" } @@ -71,6 +71,7 @@ class MessagesController < ApplicationController # PUT /messages/1 # PUT /messages/1.xml def update +=begin @message = Message.find(params[:id]) if @message.readable_by?(current_user) @@ -88,6 +89,7 @@ class MessagesController < ApplicationController flash[:error] = "You're not allowed to change/update this message!" redirect_to :action => :index end +=end end # DELETE /messages/1 @@ -106,7 +108,7 @@ class MessagesController < ApplicationController end respond_to do |format| - format.html { redirect_to(messages_url) } + format.html { redirect_back_or_default(messages_url) } format.xml { head :ok } end end @@ -134,7 +136,7 @@ class MessagesController < ApplicationController def auto_complete_for_receiver_login @receivers = User.find(:all, :conditions => [ 'LOWER(login) LIKE ? AND login <> ?', - '%' + params[:receiver][:login].downcase + '%', current_user.login ], + params[:receiver][:login].downcase + '%', current_user.login ], :order => 'login ASC') render :inline => "<%= auto_complete_result(@receivers, 'login') %>" end src/app/controllers/messages_controller.rb @@ -9,7 +9,7 @@ </p> <p> <%= f.label :title, (l :title) %><br /> - <%= f.text_field :title, :value => @old_message.title %> + <%= f.text_field :title, :value => "Re: #{@old_message.title}" %> </p> <p> <%= f.label :body, (l :message) %><br /> src/app/views/messages/reply.rhtml @@ -20,7 +20,7 @@ module TimeEnhancement end def format(options = {}) - lang = options[:lang] || Language.default + lang = options[:lang] || options[:language] || Language.default format = options[:format] output = case lang src/lib/time_enhancement.rb 42c5443d8788854e33dd6bb10e0ffeaf1b5914b9 Christopher Bertels bakkdoor@flasht.de http://github.com/bakkdoor/yarps/commit/8cbcd235e13a929006090dfaac159a19c2a5e99c 8cbcd235e13a929006090dfaac159a19c2a5e99c 2008-09-07T08:49:35-07:00 2008-09-07T08:49:35-07:00 fixed date-but in replymessage. and some other messages related stuff...btw, the interface really needs to be redesigned... [#11 state:resolved] b5c0568c6936768ae242342317bab79eb61d8117 Christopher Bertels bakkdoor@flasht.de