hide more pages for banned artists #2132

app/controllers/artists_controller.rb

@@ -3,6 +3,7 @@ class ArtistsController < ApplicationController
   before_filter :member_only, :except => [:index, :show, :banned]
   before_filter :builder_only, :only => [:destroy]
   before_filter :admin_only, :only => [:ban, :unban]
+  before_filter :load_artist, :only => [:ban, :unban, :show, :edit, :update, :destroy, :undelete, :revert]
 
   def new
     @artist = Artist.new_with_defaults(params)
@@ -10,7 +11,6 @@ class ArtistsController < ApplicationController
   end
 
   def edit
-    @artist = Artist.find(params[:id])
     respond_with(@artist)
   end
 
@@ -27,13 +27,11 @@ class ArtistsController < ApplicationController
   end
 
   def ban
-    @artist = Artist.find(params[:id])
     @artist.ban!
     redirect_to(artist_path(@artist), :notice => "Artist was banned")
   end
 
   def unban
-    @artist = Artist.find(params[:id])
     @artist.unban!
     redirect_to(artist_path(@artist), :notice => "Artist was unbanned")
   end
@@ -73,7 +71,6 @@ class ArtistsController < ApplicationController
   end
 
   def update
-    @artist = Artist.find(params[:id])
     body = params[:artist].delete("notes")
     @artist.assign_attributes(params[:artist], :as => CurrentUser.role)
     if body
@@ -84,7 +81,6 @@ class ArtistsController < ApplicationController
   end
 
   def destroy
-    @artist = Artist.find(params[:id])
     if !@artist.deletable_by?(CurrentUser.user)
       raise User::PrivilegeError
     end
@@ -93,7 +89,6 @@ class ArtistsController < ApplicationController
   end
 
   def undelete
-    @artist = Artist.find(params[:id])
     if !@artist.deletable_by?(CurrentUser.user)
       raise User::PrivilegeError
     end
@@ -102,7 +97,6 @@ class ArtistsController < ApplicationController
   end
 
   def revert
-    @artist = Artist.find(params[:id])
     @version = ArtistVersion.find(params[:version_id])
     @artist.revert_to!(@version)
     respond_with(@artist)
@@ -131,4 +125,11 @@ class ArtistsController < ApplicationController
       end
     end
   end
+
+private
+
+  def load_artist
+    @artist = Artist.find(params[:id])
+  end
+
 end

app/models/artist_version.rb

@@ -2,6 +2,7 @@ class ArtistVersion < ActiveRecord::Base
   belongs_to :updater, :class_name => "User"
   belongs_to :artist
   attr_accessible :artist_id, :name, :is_active, :other_names, :group_name, :url_string, :is_banned, :updater_id, :updater_ip_addr
+  delegate :visible?, :to => :artist
 
   module SearchMethods
     def for_user(user_id)

app/models/wiki_page_version.rb

@@ -3,6 +3,7 @@ class WikiPageVersion < ActiveRecord::Base
   belongs_to :updater, :class_name => "User"
   belongs_to :artist
   attr_accessible :wiki_page_id, :title, :body, :is_locked, :updater_id, :updater_ip_addr, :version, :other_names
+  delegate :visible?, :to => :wiki_page
 
   module SearchMethods
     def for_user(user_id)

app/views/artist_versions/index.html.erb

@@ -24,11 +24,15 @@
         <tbody>
           <% @artist_versions.each do |artist_version| %>
             <tr class="<%= cycle 'even', 'odd' %>">
-              <td>
+              <% if artist_version.visible? %>
-                <%= link_to artist_version.name, artist_path(artist_version.artist_id) %>
+                <td><%= link_to artist_version.name, artist_path(artist_version.artist_id) %></td>
-              </td>
                 <td><%= artist_version_other_names_diff(artist_version) %></td>
                 <td><%= artist_version.group_name %></td>
+              <% else %>
+                <td></td>
+                <td></td>
+                <td></td>
+              <% end %>
               <td><%= compact_time artist_version.created_at %></td>
               <td><%= link_to_user artist_version.updater %></td>
               <% if CurrentUser.is_moderator? %>
@@ -37,11 +41,11 @@
                 </td>
               <% end %>
               <td><%= artist_version.is_active? %></td>
-              <td>
+              <% if artist_version.visible? %>
-                <ul>
+                <td><ul><%= artist_version_urls_diff(artist_version) %></ul></td>
-                  <%= artist_version_urls_diff(artist_version) %>
+              <% else %>
-                </ul>
+                <td></td>
-              </td>
+              <% end %>
               <% if CurrentUser.is_member? %>
                 <td>
                   <%= link_to "Revert to", revert_artist_path(artist_version.artist_id, :version_id => artist_version.id), :method => :put, :data => {:confirm => "Are you sure you want to revert to this version?"} %>

app/views/artists/edit.html.erb

@@ -1,7 +1,12 @@
 <div id="c-artists">
   <div id="a-edit">
     <h1>Edit Artist</h1>
+
+    <% if @artist.visible? %>
       <%= render "form" %>
+    <% else %>
+      <p>The artist requested removal of this page.</p>
+    <% end %>
   </div>
 </div>
 

app/views/artists/show.html.erb

@@ -2,7 +2,7 @@
   <div id="a-show">
     <h1>Artist: <%= link_to @artist.pretty_name, posts_path(:tags => @artist.name), :class => "tag-type-#{@artist.category_name}" %></h1>
 
-    <% if @artist.notes.present? && (!@artist.is_banned? || CurrentUser.user.is_member?) %>
+    <% if @artist.notes.present? && @artist.visible? %>
       <div class="prose">
         <%= format_text(@artist.notes) %>
       </div>
@@ -10,6 +10,7 @@
       <p><%= link_to "View wiki page", @artist.wiki_page %></p>
     <% end %>
 
+    <% if @artist.visible? %>
       <div>
         <ul>
           <li><strong>Status</strong> <%= @artist.status %></li>
@@ -39,6 +40,10 @@
         </ul>
       </div>
 
+    <% else %>
+      <p>The artist requested removal of this page.</p>
+    <% end %>
+
     <%= render "secondary_links" %>
   </div>
 </div>

app/views/posts/partials/index/_excerpt.html.erb

@@ -4,6 +4,7 @@
 
 <div id="excerpt" style="display: none;">
   <% if post_set.has_artist? %>
+    <% if post_set.artist.visible? %>
       <% unless post_set.artist.notes.blank? %>
         <div class="prose">
           <%= format_text(post_set.artist.notes) %>
@@ -41,6 +42,7 @@
 
         <p><%= link_to "View artist", artist_path(post_set.artist.id) %></p>
       </div>
+    <% end %>
   <% elsif post_set.has_wiki? %>
     <div class="prose">
       <% if post_set.wiki_page.other_names.present? %>

app/views/posts/partials/show/_notices.html.erb

@@ -8,7 +8,7 @@
 
 <% if post.is_banned? %>
   <div class="ui-corner-all ui-state-highlight notice notice-deleted">
-    This post was removed because it was requested by the artist
+    The artist requested removal of this page
   </div>
 <% end %>
 

app/views/static/access_denied.html.erb

@@ -1,5 +1,7 @@
 <h1>Access Denied</h1>
 
+<p>You do not have permission to visit this page.</p>
+
 <%= link_to "Go back", :back, :rel => "prev" %>
 
 <% content_for(:page_title) do %>

app/views/wiki_page_versions/diff.html.erb

@@ -2,11 +2,15 @@
   <div id="a-diff">
     <h1>Wiki Page: <%= @thispage.title %></h1>
 
+    <% if @thispage.visible? %>
       <p>Showing differences between <%= compact_time @thispage.updated_at %> (<%= link_to_user @thispage.updater %>) and <%= compact_time @otherpage.updated_at %> (<%= link_to_user @otherpage.updater %>)</p>
 
       <div>
         <%= wiki_page_diff(@thispage, @otherpage) %>
       </div>
+    <% else %>
+      <p>The artist requested removal of this page.</p>
+    <% end %>
   </div>
 </div>
 

app/views/wiki_page_versions/show.html.erb

@@ -13,7 +13,7 @@
 
           <%= format_text(@wiki_page_version.body) %>
         <% else %>
-          <p>This artist has requested removal of their information.</p>
+          <p>The artist has requested removal of this page.</p>
         <% end %>
       </div>
     </section>

app/views/wiki_pages/edit.html.erb

@@ -4,7 +4,12 @@
 
     <section id="content">
       <h1>Edit Wiki</h1>
+
+      <% if @wiki_page.visible? %>
         <%= render "form" %>
+      <% else %>
+        <p>The artist requested removal of this page.</p>
+      <% end %>
     </section>
   </div>
 </div>