diff --git a/app/views/pages/_form.html.erb b/app/views/pages/_form.html.erb index 1881d3d..a1b4bcb 100644 --- a/app/views/pages/_form.html.erb +++ b/app/views/pages/_form.html.erb @@ -5,7 +5,7 @@ <% if params[:action] == "new" %> <%= f.label :name, content_tag(:i, nil, :class => "icons-star") + t(:page)+' ID' %> <div class="controls"> - <%= f.text_field :page_id, class:"input-xlarge change", data: {"fv-validation" => "required;nospace;pageid_validation;detect_chinese;", "fv-messages" => "Cannot be empty.;Cannot have blank spaces.;Page id is already taken.;Page ID cannot be in chinese.;"} %> + <%= f.text_field :page_id, class:"input-xlarge change", data: {"fv-validation" => "required;nospace;pageid_validation;detect_chinese;cannot_have_dash;", "fv-messages" => "Cannot be empty.;Cannot have blank spaces.;Page id is already taken.;Page ID cannot be in chinese.;Cannot have dash (-) in Page ID.;"} %> <span><%= t("front_page.name_field_helper") %></span> </div> <% end %> diff --git a/app/views/pages/_form_link.html.erb b/app/views/pages/_form_link.html.erb index d78f74e..c309406 100644 --- a/app/views/pages/_form_link.html.erb +++ b/app/views/pages/_form_link.html.erb @@ -5,7 +5,7 @@ <% if params[:action] == "new" %> <%= f.label :name, content_tag(:i, nil, :class => "icons-star")+t(:link)+' ID' %> <div class="controls"> - <%= f.text_field :page_id, class: "input-xlarge change", data: {"fv-validation" => "required;nospace;pageid_validation;", "fv-messages" => "Cannot be empty.;Cannot have blank spaces;Page id is already taken.;"} %> + <%= f.text_field :page_id, class: "input-xlarge change", data: {"fv-validation" => "required;nospace;pageid_validation;detect_chinese;cannot_have_dash;", "fv-messages" => "Cannot be empty.;Cannot have blank spaces;Page id is already taken.;Page ID cannot be in chinese.;Cannot have dash (-) in Page ID.;"} %> <span class="help-block"><%= t("front_page.name_field_helper") %></span> </div> <% end %> diff --git a/app/views/pages/new.html.erb b/app/views/pages/new.html.erb index 4dab28e..1e0b06c 100644 --- a/app/views/pages/new.html.erb +++ b/app/views/pages/new.html.erb @@ -23,5 +23,9 @@ $(document).ready(function(){ re2 = new RegExp("^[\uE7C7-\uE7F3]*$"); //Chinese character range return (!(re1.test(value) && (! re2.test(value)))); } + + fromvalidator.validate_functions.cannot_have_dash = function(value){ + return (value.indexOf("-") == -1 ? true : false); + } }) </script> \ No newline at end of file