mirror of
https://github.com/neocities/neocities.git
synced 2025-04-25 01:32:36 +02:00
admin nsfw flag
This commit is contained in:
parent
08ce614451
commit
b85903c4f6
3 changed files with 24 additions and 8 deletions
|
@ -211,6 +211,8 @@ post '/settings/:username/change_nsfw' do
|
|||
require_login
|
||||
require_ownership_for_settings
|
||||
|
||||
redirect "/settings/#{@site.username}" if @site.admin_nsfw == true
|
||||
|
||||
@site.is_nsfw = params[:is_nsfw]
|
||||
@site.save_changes validate: false
|
||||
flash[:success] = @site.is_nsfw ? 'Marked 18+' : 'Unmarked 18+'
|
||||
|
|
|
@ -320,6 +320,12 @@ describe 'delete' do
|
|||
someone_elses_site.is_deleted.must_equal false
|
||||
end
|
||||
|
||||
it 'should not show NSFW tab for admin NSFW flag' do
|
||||
owned_site = Fabricate :site, parent_site_id: @site.id, admin_nsfw: true
|
||||
visit "/settings/#{owned_site.username}"
|
||||
page.body.wont_match /18\+/
|
||||
end
|
||||
|
||||
it 'should succeed if you own the site' do
|
||||
owned_site = Fabricate :site, parent_site_id: @site.id
|
||||
visit "/settings/#{owned_site.username}#delete"
|
||||
|
|
|
@ -26,7 +26,11 @@
|
|||
<li class="active"><a href="#profile" data-toggle="tab">Profile</a></li>
|
||||
<li><a href="#custom_domain" data-toggle="tab">Custom Domain</a></li>
|
||||
<li><a href="#username" data-toggle="tab">Username</a></li>
|
||||
|
||||
<% if @site.admin_nsfw != true %>
|
||||
<li><a href="#nsfw" data-toggle="tab">18+</a></li>
|
||||
<% end %>
|
||||
|
||||
<li><a href="#delete" data-toggle="tab">Delete</a></li>
|
||||
</ul>
|
||||
<div class="tab-content">
|
||||
|
@ -39,9 +43,13 @@
|
|||
<div class="tab-pane" id="username">
|
||||
<%== erb :'settings/site/username' %>
|
||||
</div>
|
||||
|
||||
<% if @site.admin_nsfw != true %>
|
||||
<div class="tab-pane" id="nsfw">
|
||||
<%== erb :'settings/site/nsfw' %>
|
||||
</div>
|
||||
<% end %>
|
||||
|
||||
<div class="tab-pane" id="delete">
|
||||
<%== erb :'settings/site/delete' %>
|
||||
</div>
|
||||
|
|
Loading…
Add table
Reference in a new issue