Announcement with UI to be modify and missing app_auth/module_auth UI
This commit is contained in:
1 parent
41dadfb4e9
commit
ae04f67924
79 files changed
+2376
-1191
No files matched your search
@@ -40,7 +40,7 @@ class Admin::TagsController < OrbitBackendController
|
||||
if @tag.update_attributes(params[:module_tag])
|
||||
redirect_to action: :index
|
||||
else
|
||||
flash.now[:error] = t('update.error.link')
|
||||
flash.now[:error] = t('update.error.tag')
|
||||
render :action => "edit"
|
||||
end
|
||||
end
|
||||
|
||||
@@ -142,6 +142,8 @@ class ApplicationController < ActionController::Base
|
||||
end
|
||||
session[:locale] = condition ? (browser_locale || session[:locale]) : I18n.default_locale.to_s
|
||||
I18n.locale = session[:locale].to_sym
|
||||
@site_in_use_locales = site_locales_default_head(@site.in_use_locales)
|
||||
@site_valid_locales = site_locales_default_head(@site.valid_locales)
|
||||
end
|
||||
|
||||
# Set the site variables
|
||||
@@ -149,8 +151,6 @@ class ApplicationController < ActionController::Base
|
||||
# set site if exist or create site
|
||||
@site = Site.first || Site.create({:valid_locales => [], :in_use_locales => []})
|
||||
session[:site] = @site.id
|
||||
@site_in_use_locales = site_locales_default_head(@site.in_use_locales)
|
||||
@site_valid_locales = site_locales_default_head(@site.valid_locales)
|
||||
end
|
||||
|
||||
def set_current_item
|
||||
|
||||
@@ -4,6 +4,8 @@ class OrbitBackendController < ApplicationController
|
||||
include OrbitTag::Tagging
|
||||
include AdminHelper
|
||||
include ApplicationHelper
|
||||
|
||||
helper :default_index
|
||||
|
||||
layout "back_end"
|
||||
|
||||
@@ -163,7 +165,7 @@ class OrbitBackendController < ApplicationController
|
||||
|
||||
def get_viewable(object_class, query=nil)
|
||||
objects = get_objects(object_class,query).order_by(:created_at, :desc)
|
||||
Kaminari.paginate_array(objects).page(params[:page]).per(10)
|
||||
Kaminari.paginate_array(objects).page(params[:page]).per(5)
|
||||
end
|
||||
|
||||
def get_objects(object_class, query=nil)
|
||||
|
||||
Reference in new issue
Block a user