fixes #1672

2013-06-05 13:09:14 -04:00
parent a9708b9efa
commit 6f2d57882e
5 changed files with 35 additions and 6 deletions
--- a/app/models/artist.rb
+++ b/app/models/artist.rb
@@ -317,8 +317,10 @@ class Artist < ActiveRecord::Base
  extend SearchMethods

  def status
-    if is_banned?
+    if is_banned? && is_active?
      "Banned"
+    elsif is_banned?
+      "Banned Deleted"
    elsif is_active?
      "Active"
    else
@@ -341,4 +343,8 @@ class Artist < ActiveRecord::Base
  def initialize_creator
    self.creator_id = CurrentUser.user.id
  end
+
+  def deletable_by?(user)
+    user.is_builder?
+  end
 end