From 2113b89f9bf973e1c45034c378b80b8bc8e783a5 Mon Sep 17 00:00:00 2001
From: evazion <noizave@gmail.com>
Date: Fri, 29 May 2020 19:01:42 -0500
Subject: [PATCH] artists: don't show "Status Active" for undeleted artists.

An "active" artist entry is one that isn't deleted. Saying that every
undeleted artist is "active" confuses people.
---
 app/models/artist.rb                | 12 ------------
 app/views/artists/_summary.html.erb | 14 +++++++++++++-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/app/models/artist.rb b/app/models/artist.rb
index 06b0c1af1..6f7675d4d 100644
--- a/app/models/artist.rb
+++ b/app/models/artist.rb
@@ -287,18 +287,6 @@ class Artist < ApplicationRecord
   include BanMethods
   extend SearchMethods
 
-  def status
-    if is_banned? && !is_deleted?
-      "Banned"
-    elsif is_banned?
-      "Banned Deleted"
-    elsif is_deleted?
-      "Deleted"
-    else
-      "Active"
-    end
-  end
-
   def self.available_includes
     [:members, :urls, :wiki_page, :tag_alias, :tag]
   end
diff --git a/app/views/artists/_summary.html.erb b/app/views/artists/_summary.html.erb
index 148dce5bb..ec2b4869f 100644
--- a/app/views/artists/_summary.html.erb
+++ b/app/views/artists/_summary.html.erb
@@ -1,6 +1,18 @@
 <%# artist %>
 <ul>
-  <li><strong>Status</strong> <%= artist.status %></li>
+  <% if artist.is_banned? || artist.is_deleted? %>
+    <li>
+      <strong>Status</strong>
+
+      <% if artist.is_banned? %>
+        Banned
+      <% end %>
+
+      <% if artist.is_deleted? %>
+        Deleted
+      <% end %>
+    </li>
+  <% end %>
 
   <% if artist.other_names.present? %>
     <li>