From 1e6d1bb165e9d65827fbc6c2af94afa311f8ae37 Mon Sep 17 00:00:00 2001
From: r888888888 <r888888888@gmail.com>
Date: Wed, 11 Sep 2013 13:35:26 -0700
Subject: [PATCH] fixes #1976

---
 app/views/artists/show.html.erb | 43 ++++++++++++++++++---------------
 1 file changed, 23 insertions(+), 20 deletions(-)

diff --git a/app/views/artists/show.html.erb b/app/views/artists/show.html.erb
index e71e063ec..1b0c8ed17 100644
--- a/app/views/artists/show.html.erb
+++ b/app/views/artists/show.html.erb
@@ -2,7 +2,7 @@
   <div id="a-show">
     <h1>Artist: <%= @artist.name.tr("_", " ") %></h1>
 
-    <% unless @artist.notes.blank? %>
+    <% if @artist.notes.present? && (!@artist.is_banned? || CurrentUser.user.is_member?) %>
       <div class="prose">
         <%= format_text(@artist.notes) %>
       </div>
@@ -13,25 +13,28 @@
     <div>
       <ul>
         <li><strong>Status</strong> <%= @artist.status %></li>
-        <% if @artist.has_tag_alias? %>
-          <li><strong>Tag Alias</strong> <%= @artist.tag_alias_name %></li>
-        <% end %>
-        <% if @artist.other_names.present? %>
-          <li><strong>Other Names</strong> <%= link_to_artists(@artist.other_names.split(/ /)) %></li>
-        <% end %>
-        <% if @artist.group_name.present? %>
-          <li><strong>Group</strong> <%= link_to_artist(@artist.group_name) %></li>
-        <% end %>
-        <% if @artist.members.any? %>
-          <li><strong>Members</strong> <%= link_to_artists(@artist.members.map(&:name)) %></li>
-        <% end %>
-        <% @artist.urls.each do |url| %>
-          <li>
-            URL: <%= link_to h(url.to_s), h(url.to_s) %>
-            <% if CurrentUser.user.is_moderator? %>
-              (<%= link_to("mass edit", edit_moderator_tag_path(:antecedent => "-#{@artist.name} source:#{ArtistUrl.normalize_for_search(url.to_s)}", :consequent => @artist.name)) %>)
-            <% end %>
-          </li>
+
+        <% if !@artist.is_banned? || CurrentUser.user.is_member? %>
+          <% if @artist.has_tag_alias? %>
+            <li><strong>Tag Alias</strong> <%= @artist.tag_alias_name %></li>
+          <% end %>
+          <% if @artist.other_names.present? %>
+            <li><strong>Other Names</strong> <%= link_to_artists(@artist.other_names.split(/ /)) %></li>
+          <% end %>
+          <% if @artist.group_name.present? %>
+            <li><strong>Group</strong> <%= link_to_artist(@artist.group_name) %></li>
+          <% end %>
+          <% if @artist.members.any? %>
+            <li><strong>Members</strong> <%= link_to_artists(@artist.members.map(&:name)) %></li>
+          <% end %>
+          <% @artist.urls.each do |url| %>
+            <li>
+              URL: <%= link_to h(url.to_s), h(url.to_s) %>
+              <% if CurrentUser.user.is_moderator? %>
+                (<%= link_to("mass edit", edit_moderator_tag_path(:antecedent => "-#{@artist.name} source:#{ArtistUrl.normalize_for_search(url.to_s)}", :consequent => @artist.name)) %>)
+              <% end %>
+            </li>
+          <% end %>
         <% end %>
       </ul>
     </div>