jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixes #1844

Browse Source 
closes #1653
This commit is contained in:
Toks
2013-10-26 00:08:37 -04:00
parent 06995dd11b
commit 11871d88b6
8 changed files with 44 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/artists/_form.html.erb
View File

@@ -1,7 +1,7 @@
<%= simple_form_for(@artist) do |f| %>
<div class="input">
<label for="artist_name">Name</label>
<% if @artist.new_record? %>
<% if @artist.new_record? || CurrentUser.user.is_builder? %>
<%= text_field "artist", "name" %>
[<%= link_to "check", "#", :id => "check-name-link" %>]
<span id="check-name-result"></span>

3
app/views/artists/_secondary_links.html.erb
View File

@@ -12,9 +12,6 @@
<% if CurrentUser.is_member? %>
<li><%= link_to "Edit", edit_artist_path(@artist) %></li>
<% end %>
<% if CurrentUser.is_builder? %>
<li><%= link_to "Rename", edit_name_artist_path(@artist) %></li>
<% end %>
<li><%= link_to "History", artist_versions_path(:search => {:artist_id => @artist.id}) %></li>
<% if @artist.deletable_by?(CurrentUser.user) %>
<% if @artist.is_active? %>

20
app/views/artists/edit_name.html.erb
View File

@@ -1,20 +0,0 @@
<div id="c-artists">
<div id="a-edit">
<h1>Rename Artist</h1>
<%= form_tag(update_name_artist_path(@artist), :class => "simple_form", :method => :put) do %>
<div class="input">
<label for="artist_name">Name</label>
<%= text_field :artist, :name %>
[<%= link_to "check", "#", :id => "check-name-link" %>]
<span id="check-name-result"></span>
</div>
<div><%= submit_tag "Submit" %></div>
<% end %>
</div>
</div>
<%= render "secondary_links" %>
<% content_for(:page_title) do %>
Rename Artist - <%= Danbooru.config.app_name %>
<% end %>