aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeiko Bernloehr <Heiko.Bernloehr@FreeIT.de>2014-06-24 22:11:16 +0200
committerHeiko Bernloehr <Heiko.Bernloehr@FreeIT.de>2014-06-24 22:15:55 +0200
commit96e0b97370c09a804abeda00205c4647e93ee3f2 (patch)
treea724f5aadc1315c839b5c4074935b6e98364ffa0
parent224bf0408fe901c6197df3e8739065bdfab4b551 (diff)
downloadecs2-96e0b97370c09a804abeda00205c4647e93ee3f2.tar.gz
ecs2-96e0b97370c09a804abeda00205c4647e93ee3f2.zip
Check for blank @render_cmd.
If the requested resource is unmodified then render "head :not_modified" and don't eval (blank) @render_cmd.
-rw-r--r--app/controllers/messages_controller.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
index c087362..eb385c8 100644
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -46,7 +46,7 @@ class MessagesController < ApplicationController
Message.filter(__method__, @app_namespace, @ressource_name, @record, params)
@body = @record.body
show_render
- eval(@render_cmd)
+ eval(@render_cmd) unless @render_cmd.blank?
else
raise Ecs::AuthorizationException,
"You are not allowed to access this resource, " +
@@ -81,7 +81,7 @@ class MessagesController < ApplicationController
else
@record.destroy_as_receiver(@participant)
end
- eval(@render_cmd)
+ eval(@render_cmd) unless @render_cmd.blank?
end
def fifo
@@ -183,13 +183,13 @@ protected
if @record
show_render
@record.destroy_as_receiver(@participant)
- eval(@render_cmd)
+ eval(@render_cmd) unless @render_cmd.blank?
else
raise ActiveRecord::RecordNotFound
end
else
show_render
- eval(@render_cmd)
+ eval(@render_cmd) unless @render_cmd.blank?
end
else
empty_render