diff options
author | Heiko Bernloehr <Heiko.Bernloehr@FreeIT.de> | 2015-04-30 02:25:00 +0200 |
---|---|---|
committer | Heiko Bernloehr <Heiko.Bernloehr@FreeIT.de> | 2016-01-27 01:50:46 +0100 |
commit | 772b394e44c095b8f1c426c418de6a505cc11f1c (patch) | |
tree | 5f572706e84e17b03a5960fa984f537e04bc04ab | |
parent | a9bcc93279551b1e01ade6593894530fecedbacf (diff) | |
download | ecs2-772b394e44c095b8f1c426c418de6a505cc11f1c.tar.gz ecs2-772b394e44c095b8f1c426c418de6a505cc11f1c.zip |
Code rework.
Changed filter class method to an instance method.
-rw-r--r-- | app/controllers/messages_controller.rb | 2 | ||||
-rw-r--r-- | app/models/message.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb index eb385c8..d43d0ec 100644 --- a/app/controllers/messages_controller.rb +++ b/app/controllers/messages_controller.rb @@ -43,7 +43,7 @@ class MessagesController < ApplicationController when @record.outtimed_auths_resource_by_non_owner?(@app_namespace, @resource_name, @participant) raise Ecs::OuttimedAuthsException, 'Authorization token outtimed' when (!@memberships.empty? or @participant.sender?(@record)) - Message.filter(__method__, @app_namespace, @ressource_name, @record, params) + @record.filter(__method__, @app_namespace, @ressource_name, params) @body = @record.body show_render eval(@render_cmd) unless @render_cmd.blank? diff --git a/app/models/message.rb b/app/models/message.rb index 0ba8365..f7f3d24 100644 --- a/app/models/message.rb +++ b/app/models/message.rb @@ -163,12 +163,12 @@ class Message < ActiveRecord::Base end end - def self.filter(action_name, app_namespace, ressource_name, record, params) + def filter(action_name, app_namespace, ressource_name, params) d="filter/#{app_namespace}/#{ressource_name}/#{action_name}/*" filters=Dir[d].collect{|f| File.directory?(f) ? f : nil}.compact return if filters.empty? FILTER_API.params= params - FILTER_API.record= record + FILTER_API.record= self filters.sort! filters.each do |f| files= Dir[f+'/*.rb'] |