gallery_album to album
This commit is contained in:
1 parent
441e4ef63a
commit
abb818c154
17 files changed
+102
-94
No files matched your search
@@ -345,7 +345,6 @@ class ApplicationController < ActionController::Base
|
||||
if (!user_signed_in? && object_class == "bulletin")
|
||||
objects = get_bulletins_for_open_backend(objects)
|
||||
end
|
||||
|
||||
Kaminari.paginate_array(filter_authorized_objects(objects)).page(params[:page]).per(10)
|
||||
end
|
||||
|
||||
|
||||
@@ -188,9 +188,11 @@ class PagesController < ApplicationController
|
||||
else
|
||||
if params[:action] && params[:action] == "show_from_link"
|
||||
default_widget = module_app.get_default_widget
|
||||
model = eval(default_widget["query"])
|
||||
item = model.find(params[:id])
|
||||
@item = Item.where(:category => [item.category_id.to_s]).first
|
||||
if !default_widget.blank?
|
||||
model = eval(params[:app_action].classify.constantize)
|
||||
item = model.find(params[:id])
|
||||
@item = Item.where(:category => [item.category_id.to_s]).first
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
Reference in new issue
Block a user