Skip to content

Commit

Permalink
fixed date-but in replymessage. and some other messages related stuff…
Browse files Browse the repository at this point in the history
…...btw, the interface really needs to be redesigned... [#11 state:resolved]
  • Loading branch information
bakkdoor committed Sep 7, 2008
1 parent 42c5443 commit 8cbcd23
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 6 deletions.
10 changes: 6 additions & 4 deletions src/app/controllers/messages_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ def new

# GET /messages/1/edit
def edit
@message = Message.find(params[:id])
#@message = Message.find(params[:id])
end

# POST /messages
Expand All @@ -59,7 +59,7 @@ def create
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" }
Expand All @@ -71,6 +71,7 @@ def create
# PUT /messages/1
# PUT /messages/1.xml
def update
=begin
@message = Message.find(params[:id])
if @message.readable_by?(current_user)
Expand All @@ -88,6 +89,7 @@ def update
flash[:error] = "You're not allowed to change/update this message!"
redirect_to :action => :index
end
=end
end

# DELETE /messages/1
Expand All @@ -106,7 +108,7 @@ def destroy
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
Expand Down Expand Up @@ -134,7 +136,7 @@ def sent
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
Expand Down
2 changes: 1 addition & 1 deletion src/app/views/messages/reply.rhtml
Original file line number Diff line number Diff line change
Expand Up @@ -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 />
Expand Down
2 changes: 1 addition & 1 deletion src/lib/time_enhancement.rb
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ def english(format = :short)
end

def format(options = {})
lang = options[:lang] || Language.default
lang = options[:lang] || options[:language] || Language.default
format = options[:format]

output = case lang
Expand Down

0 comments on commit 8cbcd23

Please sign in to comment.