SUZUKI Miho
null+****@clear*****
Thu Oct 11 13:09:09 JST 2012
SUZUKI Miho 2012-10-11 13:09:09 +0900 (Thu, 11 Oct 2012) New Revision: 8cea68d2a91c2371eadfece4924ce42e4c3606a2 https://github.com/logaling/logaling-server/commit/8cea68d2a91c2371eadfece4924ce42e4c3606a2 Log: Add validation to name alphabet/numeric/symbol(_-) are available Modified files: app/models/user_glossary.rb app/views/user_glossaries/_form.html.haml Modified: app/models/user_glossary.rb (+5 -0) =================================================================== --- app/models/user_glossary.rb 2012-10-11 10:37:49 +0900 (6f74a6f) +++ app/models/user_glossary.rb 2012-10-11 13:09:09 +0900 (6d1d21e) @@ -17,10 +17,15 @@ class UserGlossary < ActiveRecord::Base validates_presence_of :name, :source_language, :target_language, :user_id validates_uniqueness_of :name, scope: [:user_id, :source_language, :target_language] + validate :original_user_glossary_id_must_exist, if: "original_user_glossary_id.present?", on: :create + validates_format_of :name, + with: /\A[\w\d_-]*\z/, + message: 'に使用できるのは半角英数字と_(アンダースコア)と-(ハイフン)です' + validates_each :source_language, :target_language do |record, attr, value| if value.size != 2 || !ISO_639.find_by_code(value) record.errors.add attr, 'には言語名コードを指定して下さい' Modified: app/views/user_glossaries/_form.html.haml (+1 -0) =================================================================== --- app/views/user_glossaries/_form.html.haml 2012-10-11 10:37:49 +0900 (bb6d34c) +++ app/views/user_glossaries/_form.html.haml 2012-10-11 13:09:09 +0900 (18f791b) @@ -14,6 +14,7 @@ = f.label :name, :class => 'control-label required' .controls = f.text_field :name, :placeholder => 'my_glossary' + %span.help-block 半角英数字と _ (アンダースコア) と - (ハイフン) で入力して下さい .control-group = f.label :source_language, :class => 'control-label required' .controls -------------- next part -------------- An HTML attachment was scrubbed...Download
