Merge branch 'make_jsFunc_for_journalP' of https://github.com/Rulingcom/orbit into make_jsFunc_for_journalP
* 'make_jsFunc_for_journalP' of https://github.com/Rulingcom/orbit: calendar js minor update Fix: - Widgets for announcement - Facebook link - AdBanner nav visitor now can browse gallery routes fixed small fix for journal_pages desktop new file created for journal pages tmp add co-author db and curd page, but it can't destory it... add co-author page and new it, but can't destory it... visitor now can browse gallery done add journals function fix and hide for visitors,except for album album and gallery is now opened fixed sutpid bug for calendar back button fix for frontend fix and hide for visitors,except for album calendar js minor update minor update for gallery and calendar backend
This commit is contained in:
commit
c0ac69fc84
34 files changed
+169
-87
No files matched your search
@@ -1,9 +1,13 @@
|
||||
class Admin::UsersNewInterfaceController < ApplicationController
|
||||
class Admin::UsersNewInterfaceController < OrbitBackendController
|
||||
|
||||
layout "new_admin"
|
||||
before_filter :authenticate_user!
|
||||
before_filter :set_attribute, :only => [:index, :show, :new, :edit]
|
||||
# before_filter :authenticate_user!
|
||||
# before_filter :set_attribute, :only => [:index, :show, :new, :edit]
|
||||
|
||||
before_filter :force_order_for_visitor,:only=>[:index,:show]
|
||||
before_filter :force_order_for_user,:except => [:index,:show]
|
||||
before_filter :for_app_sub_manager,:except => [:index,:show]
|
||||
|
||||
def index
|
||||
get_tags
|
||||
get_sub_roles
|
||||
|
||||
Reference in new issue
Block a user