deblan/journalduhacker
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

User: username regex is a const now

Browse source
This commit is contained in:
Carl Chenet 2017-05-23 10:35:14 +02:00
parent 0c1516bb14
commit b4f0f57df9
3 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/models/user.rb
View file

@ -95,10 +95,8 @@ class User < ActiveRecord::Base
end end
end end
def self.username_regex def self.username_regex_s
User.validators_on(:username).select{|v| "/^" + VALID_USERNAME.to_s.gsub(/(\?-mix:|\(|\))/, "") + "$/"
v.class == ActiveModel::Validations::FormatValidator }.first.
options[:with].inspect
end end
def as_json(options = {}) def as_json(options = {})

2
app/views/settings/index.html.erb
View file

@ -14,7 +14,7 @@
<%= f.label :username, t('.username'), :class => "required" %> <%= f.label :username, t('.username'), :class => "required" %>
<%= f.text_field :username, :size => 15 %> <%= f.text_field :username, :size => 15 %>
<span class="hint"> <span class="hint">
<tt><%= User.username_regex %></tt> <tt><%= User.username_regex_s %></tt>
</span> </span>
</div> </div>

2
app/views/signup/invited.html.erb
View file

@ -27,7 +27,7 @@
<%= f.label :username, "Username:", :class => "required" %> <%= f.label :username, "Username:", :class => "required" %>
<%= f.text_field :username, :size => 30 %> <%= f.text_field :username, :size => 30 %>
<span class="hint"> <span class="hint">
<tt><%= User.username_regex %></tt> <tt><%= User.username_regex_s %></tt>
</span> </span>
<br /> <br />