From 78839a64d022422af233c415678b357e346fe218 Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Thu, 16 Oct 2014 19:55:32 +0800 Subject: [PATCH] removed rulingcom user from user list --- app/views/admin/members/_member_for_listing.html.erb | 4 ++-- app/views/admin/members/_member_for_summary.html.erb | 3 ++- app/views/admin/members/_member_for_thumbnail.html.erb | 2 ++ app/views/admin/members/_user_basic_passwd.html.erb | 2 +- app/views/shared/_side_bar.html.erb | 5 +++-- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/app/views/admin/members/_member_for_listing.html.erb b/app/views/admin/members/_member_for_listing.html.erb index 3c67867..9c1d21c 100644 --- a/app/views/admin/members/_member_for_listing.html.erb +++ b/app/views/admin/members/_member_for_listing.html.erb @@ -1,5 +1,4 @@ <% if member_for_listing.present? && (!member_for_listing.user.present? || member_for_listing.user.approved) %> - <% if member_for_listing.sex == 'male' @member_gender = 'gender-man' @@ -9,7 +8,7 @@ @member_gender = 'gender-none' end %> - + <% if (member_for_listing.user.user_name != "rulingcom" rescue true) %> @@ -32,4 +31,5 @@ <%= member_for_listing.email %> + <% end %> <% end %> \ No newline at end of file diff --git a/app/views/admin/members/_member_for_summary.html.erb b/app/views/admin/members/_member_for_summary.html.erb index f39a439..cd04ff4 100644 --- a/app/views/admin/members/_member_for_summary.html.erb +++ b/app/views/admin/members/_member_for_summary.html.erb @@ -1,4 +1,5 @@ <% if member_for_summary.present? && (!member_for_summary.user.present? || member_for_summary.user.approved) %> + <% if (member_for_summary.user.user_name != "rulingcom" rescue true) %>
  • <% @@ -36,5 +37,5 @@
  • <% end %> - +<% end %> diff --git a/app/views/admin/members/_member_for_thumbnail.html.erb b/app/views/admin/members/_member_for_thumbnail.html.erb index 2581b4f..56a4cdc 100644 --- a/app/views/admin/members/_member_for_thumbnail.html.erb +++ b/app/views/admin/members/_member_for_thumbnail.html.erb @@ -8,6 +8,7 @@ @user_sex = 'gender-none' end %> + <% if (member_for_thumbnail.user.user_name != "rulingcom" rescue true) %>
  • @@ -20,4 +21,5 @@

    <%= link_to (member_for_thumbnail.name != (member_for_thumbnail.email) ? member_for_thumbnail.name : member_for_thumbnail.id),admin_member_path(member_for_thumbnail) %>

  • +<% end %> <% end %> \ No newline at end of file diff --git a/app/views/admin/members/_user_basic_passwd.html.erb b/app/views/admin/members/_user_basic_passwd.html.erb index 035746d..429e73d 100644 --- a/app/views/admin/members/_user_basic_passwd.html.erb +++ b/app/views/admin/members/_user_basic_passwd.html.erb @@ -12,7 +12,7 @@
    - <% if current_user.is_admin? %> + <% if current_user.is_admin? && (@user.user_name != "rulingcom" rescue false) %> <%= f.text_field :user_name, :class=>"input-medium", :id=>"account", :placeholder=>"#{t('users.user_id')}" %> <%= t("users.user_id_note")%> <% else %> diff --git a/app/views/shared/_side_bar.html.erb b/app/views/shared/_side_bar.html.erb index 9108dff..b80fe3d 100644 --- a/app/views/shared/_side_bar.html.erb +++ b/app/views/shared/_side_bar.html.erb @@ -20,8 +20,9 @@
  • <%= link_to admin_site_update_manager_path(current_site), :class => active_for_action('sites', 'update_manager') do %><%end%>
  • "><%= link_to admin_site_system_info_path(current_site), :class => active_for_action('sites', 'system_info') do %><%end%>
  • - -
  • "><%= link_to admin_import_path, :class => active_for_action('import','') do %><%end%>
  • + <% if (current_user.user_name == "rulingcom" rescue false) %> +
  • "><%= link_to admin_import_path, :class => active_for_action('import','') do %><%end%>
  • + <% end %>