diff options
| author | Julian Pawlowski <julian.pawlowski@gmail.com> | 2013-02-19 10:00:15 +0100 |
|---|---|---|
| committer | Julian Pawlowski <julian.pawlowski@gmail.com> | 2013-02-19 10:00:15 +0100 |
| commit | 804814c97448d3381cfc691694692362df6ab906 (patch) | |
| tree | 95233874b048bbddb54fbb2dd498ce5913bc8ff0 | |
| parent | cdc7f100e396824410267339a1fe00b759da8f83 (diff) | |
| parent | de845aa642e22b0ae08c5ce991bcdef9b656e079 (diff) | |
Merge branch 'develop' of https://github.com/amooma/GS5 into develop
| -rw-r--r-- | app/models/phone_book_entry.rb | 2 | ||||
| -rw-r--r-- | app/views/phone_numbers/_form_core.html.haml | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/app/models/phone_book_entry.rb b/app/models/phone_book_entry.rb index 275c7b6..96c8468 100644 --- a/app/models/phone_book_entry.rb +++ b/app/models/phone_book_entry.rb @@ -1,6 +1,8 @@ # encoding: UTF-8 class PhoneBookEntry < ActiveRecord::Base + PHONE_NUMBER_NAMES = ['Phone', 'Office', 'Home', 'Mobile', 'Fax'] + before_save :run_phonetic_algorithm before_save :save_value_of_to_s diff --git a/app/views/phone_numbers/_form_core.html.haml b/app/views/phone_numbers/_form_core.html.haml index a0a69db..1589e7e 100644 --- a/app/views/phone_numbers/_form_core.html.haml +++ b/app/views/phone_numbers/_form_core.html.haml @@ -1,7 +1,7 @@ .inputs - if @phone_book_entry - = f.input :name, :collection => ['Office', 'Home', 'Mobile', 'Fax'], :include_blank => false, :label => t('phone_numbers.form.name.label'), :hint => conditional_hint('phone_numbers.form.name.hint') + = f.input :name, :collection => PhoneBookEntry::PHONE_NUMBER_NAMES, :include_blank => false, :label => t('phone_numbers.form.name.label'), :hint => conditional_hint('phone_numbers.form.name.hint') = f.input :number, :label => t('phone_numbers.form.number.label'), :hint => conditional_hint('phone_numbers.form.number.hint'), :autofocus => true - else - if @callthrough || @hunt_group_member || @access_authorization || current_user.current_tenant.array_of_available_internal_extensions_and_dids.count == 0 || current_user.current_tenant.array_of_available_internal_extensions_and_dids.count > 250 |