diff options
| author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2012-12-30 12:21:50 +0100 |
|---|---|---|
| committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2012-12-30 12:21:50 +0100 |
| commit | f85bb3c49ee0bac3be836628685fe080da78e823 (patch) | |
| tree | 9f36ecff843ff02d0b23760044d364797f9c82fc | |
| parent | 45883189e5708d68fb41fdbd153c4875c41b02b1 (diff) | |
| parent | 131d204324062991c93cd5418d1dc7854347ffb6 (diff) | |
Merge branch 'snom_meeting_point' into develop
| -rw-r--r-- | app/controllers/config_snom_controller.rb | 1 | ||||
| -rw-r--r-- | db/migrate/20121230110747_snom_meetingpoint.rb | 14 | ||||
| -rw-r--r-- | db/schema.rb | 2 |
3 files changed, 16 insertions, 1 deletions
diff --git a/app/controllers/config_snom_controller.rb b/app/controllers/config_snom_controller.rb index 4d12082..7542415 100644 --- a/app/controllers/config_snom_controller.rb +++ b/app/controllers/config_snom_controller.rb @@ -80,6 +80,7 @@ class ConfigSnomController < ApplicationController '00041345' => 'Snom 821', '00041348' => 'Snom 821', '00041341' => 'Snom 870', + '00041332' => 'snom MeetingPoint', } @phone.phone_model = PhoneModel.where(:name => mac_address_to_model[@mac_address[0, 8]]).first diff --git a/db/migrate/20121230110747_snom_meetingpoint.rb b/db/migrate/20121230110747_snom_meetingpoint.rb new file mode 100644 index 0000000..1484777 --- /dev/null +++ b/db/migrate/20121230110747_snom_meetingpoint.rb @@ -0,0 +1,14 @@ +class SnomMeetingpoint < ActiveRecord::Migration + def up + if Manufacturer.where(:ieee_name => 'SNOM Technology AG').any? + snom = Manufacturer.where(:ieee_name => 'SNOM Technology AG').first + snom.phone_models.create(:name => 'snom MeetingPoint', + :product_homepage_url => 'http://www.snom.com/en/products/sip-conference-phone/snom-meetingpoint/', + :product_manual_homepage_url => 'http://wiki.snom.com/Snom_MeetingPoint/Documentation') + end + end + + def down + PhoneModels.where(:name => 'snom MeetingPoint').destroy_all + end +end diff --git a/db/schema.rb b/db/schema.rb index 804ff5f..12114dc 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20121228101454) do +ActiveRecord::Schema.define(:version => 20121230110747) do create_table "access_authorizations", :force => true do |t| t.string "access_authorizationable_type" |