diff --git a/app/controllers/admin/users_new_interface_controller.rb b/app/controllers/admin/users_new_interface_controller.rb
index 8c5ec93a7..69c22ed60 100644
--- a/app/controllers/admin/users_new_interface_controller.rb
+++ b/app/controllers/admin/users_new_interface_controller.rb
@@ -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
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 07d6b5775..ba0180997 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -260,12 +260,12 @@ module ApplicationHelper
end
def share_links(object, key)
- js = ''
- js << "\n" rescue ''
- js << "\n" rescue ''
- js << "\n" rescue ''
+ # js = ''
+ # js << "\n" rescue ''
+ # js << "\n" rescue ''
+ # js << "\n" rescue ''
content_tag :div, :class => 'fb' do
- concat social_share_button_tag(object.title, :fb_url => generate_fb_url(object,key), :image => "http://#{request.env['HTTP_HOST']}#{object.image.url}")
+ concat social_share_button_tag(object.title, :fb_url => generate_fb_url(object,key), :image => "http://#{request.env['HTTP_HOST']}#{object.image.url if !object.image.blank?}")
# concat javascript_tag "$('head').append('#{j js}');"
end
end
diff --git a/app/views/admin/users_new_interface/_filter.html.erb b/app/views/admin/users_new_interface/_filter.html.erb
index 3262ea5d8..4033ff5e9 100644
--- a/app/views/admin/users_new_interface/_filter.html.erb
+++ b/app/views/admin/users_new_interface/_filter.html.erb
@@ -61,8 +61,10 @@
-
-
+ <% if is_admin? %>
+
+
+ <%end%>
<%= t("admin.new_admin.attributes.roles")%>
<%= t("admin.new_admin.attributes.name")%>
diff --git a/app/views/admin/users_new_interface/_index_paginator.html.erb b/app/views/admin/users_new_interface/_index_paginator.html.erb
index 04fff093e..3d8864d00 100644
--- a/app/views/admin/users_new_interface/_index_paginator.html.erb
+++ b/app/views/admin/users_new_interface/_index_paginator.html.erb
@@ -1,7 +1,9 @@
-
+ <% if is_admin? %><% end%>