chris tags update
This commit is contained in:
1 parent
2945e14385
commit
d047a3d62a
102 files changed
+3111
-378
No files matched your search
@@ -2,16 +2,10 @@ class Admin::TagsController < OrbitBackendController
|
||||
before_filter :force_order_for_visitor,:only=>[:index]
|
||||
before_filter :force_order_for_user,:except => [:index]
|
||||
before_filter :for_app_sub_manager,:except => [:index]
|
||||
|
||||
|
||||
# layout 'new_admin'
|
||||
# before_filter :authenticate_user!
|
||||
# before_filter :is_admin?
|
||||
# before_filter :set_module_app
|
||||
before_filter :set_module_app
|
||||
|
||||
def index
|
||||
get_tags
|
||||
@module_app_id = @module_app.id rescue nil
|
||||
@tags = get_tags
|
||||
end
|
||||
|
||||
def new
|
||||
@@ -23,12 +17,7 @@ class Admin::TagsController < OrbitBackendController
|
||||
end
|
||||
|
||||
def create
|
||||
if params[:tag][:module_app_id].blank?
|
||||
@tag = Tag.create(params[:tag])
|
||||
else
|
||||
module_app = ModuleApp.find(params[:tag][:module_app_id])
|
||||
@tag = eval("#{module_app.key.camelize}Tag").create(params[:tag])
|
||||
end
|
||||
@tag = @module_app ? @module_app.tags.create(params[:tag]) : Tag.create(params[:tag])
|
||||
end
|
||||
|
||||
def update
|
||||
@@ -47,15 +36,12 @@ class Admin::TagsController < OrbitBackendController
|
||||
protected
|
||||
|
||||
def get_tags
|
||||
@tags = (@module_app ? @module_app.tags : Tag.all)
|
||||
@tags = @module_app.blank? ? Tag.all : @module_app.tags
|
||||
end
|
||||
|
||||
def setup_vars
|
||||
@app_key = request.env['HTTP_REFERER'].split('/')[4]
|
||||
if @app_key
|
||||
@app_key.gsub!(/[?].*/, '')
|
||||
@module_app = ModuleApp.first(conditions: {:key => @app_key})
|
||||
end
|
||||
def set_module_app
|
||||
@module_app = ModuleApp.find(params[:module_app_id]) if params[:module_app_id]
|
||||
@module_app_id = @module_app.id rescue nil
|
||||
end
|
||||
|
||||
end
|
||||
Reference in new issue
Block a user