zydronium/neocities
1
0
Fork 0
mirror of https://github.com/neocities/neocities.git synced 2025-04-25 01:32:36 +02:00
Code Issues Projects Releases Packages Wiki Activity

admin nsfw flag

Browse source
This commit is contained in:
Kyle Drake 2015-07-18 16:59:28 -07:00
parent 08ce614451
commit b85903c4f6
3 changed files with 24 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/settings.rb
View file

@ -211,6 +211,8 @@ post '/settings/:username/change_nsfw' do
require_login require_login
require_ownership_for_settings require_ownership_for_settings
redirect "/settings/#{@site.username}" if @site.admin_nsfw == true
@site.is_nsfw = params[:is_nsfw] @site.is_nsfw = params[:is_nsfw]
@site.save_changes validate: false @site.save_changes validate: false
flash[:success] = @site.is_nsfw ? 'Marked 18+' : 'Unmarked 18+' flash[:success] = @site.is_nsfw ? 'Marked 18+' : 'Unmarked 18+'
@ -260,7 +262,7 @@ end
post '/settings/change_email' do post '/settings/change_email' do
require_login require_login
if params[:email] == parent_site.email if params[:email] == parent_site.email
flash[:error] = 'You are already using this email address for this account.' flash[:error] = 'You are already using this email address for this account.'
redirect '/settings#email' redirect '/settings#email'
@ -331,4 +333,4 @@ get '/settings/unsubscribe_email/?' do
@message = 'There was an error unsubscribing your email address. Please contact support.' @message = 'There was an error unsubscribing your email address. Please contact support.'
end end
erb :'settings/account/unsubscribe' erb :'settings/account/unsubscribe'
end end

8
tests/acceptance/settings/site_tests.rb
View file

@ -320,6 +320,12 @@ describe 'delete' do
someone_elses_site.is_deleted.must_equal false someone_elses_site.is_deleted.must_equal false
end 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 it 'should succeed if you own the site' do
owned_site = Fabricate :site, parent_site_id: @site.id owned_site = Fabricate :site, parent_site_id: @site.id
visit "/settings/#{owned_site.username}#delete" visit "/settings/#{owned_site.username}#delete"
@ -341,4 +347,4 @@ describe 'delete' do
visit "/settings/#{@site.username}#delete" visit "/settings/#{@site.username}#delete"
page.body.must_match /You cannot delete the parent site without deleting the children sites first/i page.body.must_match /You cannot delete the parent site without deleting the children sites first/i
end end
end end

18
views/settings/site.erb
View file

@ -26,7 +26,11 @@
<li class="active"><a href="#profile" data-toggle="tab">Profile</a></li> <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="#custom_domain" data-toggle="tab">Custom Domain</a></li>
<li><a href="#username" data-toggle="tab">Username</a></li> <li><a href="#username" data-toggle="tab">Username</a></li>
<li><a href="#nsfw" data-toggle="tab">18+</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> <li><a href="#delete" data-toggle="tab">Delete</a></li>
</ul> </ul>
<div class="tab-content"> <div class="tab-content">
@ -39,9 +43,13 @@
<div class="tab-pane" id="username"> <div class="tab-pane" id="username">
<%== erb :'settings/site/username' %> <%== erb :'settings/site/username' %>
</div> </div>
<div class="tab-pane" id="nsfw">
<%== erb :'settings/site/nsfw' %> <% if @site.admin_nsfw != true %>
</div> <div class="tab-pane" id="nsfw">
<%== erb :'settings/site/nsfw' %>
</div>
<% end %>
<div class="tab-pane" id="delete"> <div class="tab-pane" id="delete">
<%== erb :'settings/site/delete' %> <%== erb :'settings/site/delete' %>
</div> </div>
@ -90,4 +98,4 @@ $(document).ready(function() {
return location.hash = $(e.target).attr('href').substr(1); return location.hash = $(e.target).attr('href').substr(1);
}); });
}); });
</script> </script>