diff --git a/app/controllers/admin/members_controller.rb b/app/controllers/admin/members_controller.rb index 13eac42..ebf1aa2 100644 --- a/app/controllers/admin/members_controller.rb +++ b/app/controllers/admin/members_controller.rb @@ -153,7 +153,7 @@ class Admin::MembersController < OrbitMemberController end if @member.update_attributes(member_profile_params) and @user.save - if params[:edit_type]!="edit_privilege" and params[:member_profile][:role_status_ids].nil? + if params[:edit_type]!="edit_privilege" and (params[:member_profile].nil? or params[:member_profile][:role_status_ids].nil?) @member.update_attributes(role_status_ids: []) end if !params[:member_profile_field_values].nil? diff --git a/app/views/admin/dashboards/index.html.erb b/app/views/admin/dashboards/index.html.erb index c848da7..f111e36 100644 --- a/app/views/admin/dashboards/index.html.erb +++ b/app/views/admin/dashboards/index.html.erb @@ -5,7 +5,7 @@
- <% unless current_user.blank? %> + <% if current_user.is_admin? %>
<%= render 'server_loading' %> diff --git a/app/views/admin/members/edit_passwd.html.erb b/app/views/admin/members/edit_passwd.html.erb index d5631ec..69936c1 100644 --- a/app/views/admin/members/edit_passwd.html.erb +++ b/app/views/admin/members/edit_passwd.html.erb @@ -13,7 +13,7 @@ <% end -%> -<%= form_for @member, :url => admin_member_path(@member), :html => { :multipart => true , :class=>"form-horizontal main-forms", :id=>"user-forms"} do |f| %> +<%= form_for @member, :url => admin_member_path(@member), :html => { :multipart => true , :class=>"form-horizontal main-forms", :id=>"user-forms", :style=>"width: 540px; margin: 0 auto;"} do |f| %>
@@ -24,7 +24,7 @@
<%= link_back('btn') %> <%= hidden_field_tag 'edit_type', 'edit_passwd' %> - <%= link_to t(:update_), "#", :class=>"btn btn-primary returnDecide", :onclick=>"$('#edit_user_#{@user.id}').submit()" %> + <%= link_to t(:update_), "#", :class=>"btn btn-primary returnDecide", :onclick=>"$('#user-forms').submit()" %>
diff --git a/config/initializers/orbit_category.rb b/config/initializers/orbit_category.rb index 22988c7..087e713 100644 --- a/config/initializers/orbit_category.rb +++ b/config/initializers/orbit_category.rb @@ -8,14 +8,6 @@ head_label_i18n 'module_name.category', icon_class: "icons-flow-cascade" head_link_path "admin_categories_path" active_for_controllers (['admin/categories']) - - # available_for [:admin, :manager] - - # context_link 'all', - # link_path: "admin_categorys_path", - # priority: 1, - # active_for_action: {categorys: :index}, - # available_for: [:admin, :manager] - + available_for "admin" end end diff --git a/config/initializers/orbit_tag.rb b/config/initializers/orbit_tag.rb index 8a0e2fd..2d19f32 100644 --- a/config/initializers/orbit_tag.rb +++ b/config/initializers/orbit_tag.rb @@ -8,14 +8,6 @@ head_label_i18n 'tags', icon_class: "icons-tag" head_link_path "admin_tags_path" active_for_controllers (['admin/tags']) - - # available_for [:admin, :manager] - - # context_link 'all', - # link_path: "admin_tags_path", - # priority: 1, - # active_for_action: {tags: :index}, - # available_for: [:admin, :manager] - + available_for "admin" end end