diff --git a/app.rb b/app.rb index 51838592..7bc00d3c 100644 --- a/app.rb +++ b/app.rb @@ -495,7 +495,7 @@ post '/create_validate' do if !params[:field].match /^username$|^password$|^email$|^new_tags_string$/ return {error: 'not a valid field'}.to_json - end + end site = Site.new(params[:field] => params[:value]) site.valid? diff --git a/models/site.rb b/models/site.rb index c9b7c4ad..9fb1714b 100644 --- a/models/site.rb +++ b/models/site.rb @@ -762,28 +762,28 @@ class Site < Sequel::Model @new_filtered_tags = [] if ((new? ? 0 : tags_dataset.count) + new_tags.length > 5) - errors.add :tags, 'Cannot have more than 5 tags for your site.' + errors.add :new_tags_string, 'Cannot have more than 5 tags for your site.' end new_tags.each do |tag| tag.strip! if tag.match(/[^a-zA-Z0-9 ]/) - errors.add :tags, "Tag \"#{tag}\" can only contain letters (A-Z) and numbers (0-9)." + errors.add :new_tags_string, "Tag \"#{tag}\" can only contain letters (A-Z) and numbers (0-9)." break end if tag.length > Tag::NAME_LENGTH_MAX - errors.add :tags, "Tag \"#{tag}\" cannot be longer than #{Tag::NAME_LENGTH_MAX} characters." + errors.add :new_tags_string, "Tag \"#{tag}\" cannot be longer than #{Tag::NAME_LENGTH_MAX} characters." break end if tag.match(/ /) - errors.add :tags, "Tag \"#{tag}\" cannot have spaces." + errors.add :new_tags_string, "Tag \"#{tag}\" cannot have spaces." break end if tag.split(' ').length > Tag::NAME_WORDS_MAX - errors.add :tags, "Tag \"#{tag}\" cannot be more than #{Tag::NAME_WORDS_MAX} word." + errors.add :new_tags_string, "Tag \"#{tag}\" cannot be more than #{Tag::NAME_WORDS_MAX} word." break end diff --git a/views/index.erb b/views/index.erb index 45faec32..0d0e2020 100644 --- a/views/index.erb +++ b/views/index.erb @@ -380,7 +380,6 @@ $('#createSiteForm').on('submit', function(obj) { $("input[name=blackbox_answer]").val("<%= @blackbox_question %>") $.post('/create_validate_all', $(obj.target).serialize(), function(errors) { - console.log(errors) if(errors.length == 0) { $.post('/create', $('#createSiteForm').serialize(), function(res) { if(res.result == 'ok') @@ -412,6 +411,7 @@ if(res.result == 'ok') { return $(obj.target).tooltip('hide') } + $(obj.target).attr('data-original-title', res.error) $(obj.target).tooltip('show') })