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

bug fix with user settings for builders, fixes #784

Browse Source
This commit is contained in:
albert
2013-03-07 17:52:05 -05:00
parent 307bf5e57d
commit f8619e689e
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/posts.js
View File

@@ -255,7 +255,7 @@
$("#comments").hide(); $("#comments").hide();
$("#share").hide(); $("#share").hide();
$("#post_tag_string").focus(); $("#post_tag_string").focus();
$("") $("#related-tags-button").trigger("click");
} else { } else {
$("#edit").hide(); $("#edit").hide();
$("#comments").hide(); $("#comments").hide();

2
app/models/user.rb
View File

@@ -17,7 +17,7 @@ class User < ActiveRecord::Base
end end
attr_accessor :password, :old_password attr_accessor :password, :old_password
attr_accessible :password, :old_password, :password_confirmation, :password_hash, :email, :last_logged_in_at, :last_forum_read_at, :has_mail, :receive_email_notifications, :comment_threshold, :always_resize_images, :favorite_tags, :blacklisted_tags, :name, :ip_addr, :time_zone, :default_image_size, :as => [:moderator, :janitor, :contributor, :privileged, :member, :anonymous, :default, :admin] attr_accessible :password, :old_password, :password_confirmation, :password_hash, :email, :last_logged_in_at, :last_forum_read_at, :has_mail, :receive_email_notifications, :comment_threshold, :always_resize_images, :favorite_tags, :blacklisted_tags, :name, :ip_addr, :time_zone, :default_image_size, :as => [:moderator, :janitor, :contributor, :privileged, :member, :anonymous, :default, :builder, :admin]
attr_accessible :level, :as => :admin attr_accessible :level, :as => :admin
validates_length_of :name, :within => 2..100, :on => :create validates_length_of :name, :within => 2..100, :on => :create
validates_format_of :name, :with => /\A[^\s:]+\Z/, :on => :create, :message => "cannot have whitespace or colons" validates_format_of :name, :with => /\A[^\s:]+\Z/, :on => :create, :message => "cannot have whitespace or colons"