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

fixes #2890: Danbooru account upgrades reset permissions

Browse Source
This commit is contained in:
r888888888
2017-02-21 12:39:45 -08:00
parent 176510909a
commit 6ca83a2f3c
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/logical/user_promotion.rb
View File

@@ -15,8 +15,15 @@ class UserPromotion
@old_can_upload_free = user.can_upload_free? @old_can_upload_free = user.can_upload_free?
user.level = new_level user.level = new_level
user.can_approve_posts = options[:can_approve_posts]
user.can_upload_free = options[:can_upload_free] if options.has_key?(:can_approve_posts)
user.can_approve_posts = options[:can_approve_posts]
end
if options.has_key?(:can_upload_free)
user.can_upload_free = options[:can_upload_free]
end
user.inviter_id = promoter.id user.inviter_id = promoter.id
create_user_feedback unless options[:skip_feedback] create_user_feedback unless options[:skip_feedback]

8
app/views/admin/users/edit.html.erb
View File

@@ -10,14 +10,14 @@
<%= user_level_select(:user, :level) %> <%= user_level_select(:user, :level) %>
</div> </div>
<div class="input boolean optional"> <div class="input">
<label for="user_can_upload_free" class="optional">Unrestricted Uploads</label> <label for="user_can_upload_free" class="optional">Unrestricted Uploads</label>
<%= check_box(:user, :can_upload_free) %> <%= select(:user, :can_upload_free, [["Yes", true], ["No", false]]) %>
</div> </div>
<div class="input boolean optional"> <div class="input">
<label for="user_can_approve_posts" class="optional">Approve Posts</label> <label for="user_can_approve_posts" class="optional">Approve Posts</label>
<%= check_box(:user, :can_approve_posts) %> <%= select(:user, :can_approve_posts, [["Yes", true], ["No", false]]) %>
</div> </div>
<%= submit_tag "Update" %> <%= submit_tag "Update" %>