Merge branch 'develop' of github.com:amooma/GS5 into develop

3 files changed, 29 insertions, 1 deletions

diff --git a/db/migrate/20130307104654_create_switchboards.rb b/db/migrate/20130307104654_create_switchboards.rb
new file mode 100644
index 0000000..222b168
--- /dev/null
+++ b/db/migrate/20130307104654_create_switchboards.rb
@@ -0,0 +1,13 @@
+class CreateSwitchboards < ActiveRecord::Migration
+  def self.up
+    create_table :switchboards do |t|
+      t.string :name
+      t.integer :user_id
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :switchboards
+  end
+end
diff --git a/db/migrate/20130307122344_create_switchboard_entries.rb b/db/migrate/20130307122344_create_switchboard_entries.rb
new file mode 100644
index 0000000..1c7521e
--- /dev/null
+++ b/db/migrate/20130307122344_create_switchboard_entries.rb
@@ -0,0 +1,15 @@
+class CreateSwitchboardEntries < ActiveRecord::Migration
+  def self.up
+    create_table :switchboard_entries do |t|
+      t.integer :switchboard_id
+      t.integer :sip_account_id
+      t.string :name
+      t.integer :position
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :switchboard_entries
+  end
+end
diff --git a/db/migrate/20130309055700_change_perimeter_gs_parameters.rb b/db/migrate/20130309055700_change_perimeter_gs_parameters.rb
index 6e29bd0..7973ee0 100644
--- a/db/migrate/20130309055700_change_perimeter_gs_parameters.rb
+++ b/db/migrate/20130309055700_change_perimeter_gs_parameters.rb
@@ -1,6 +1,6 @@
 class ChangePerimeterGsParameters < ActiveRecord::Migration
   def up
-    GsParameter.where(:entity => 'perimeter', :section => 'bad_headers_register', :name => 'from_user').first.update_attributes(:value => '^%d+$', :class_type => 'String')
+    GsParameter.find_or_create_by_entity_and_section_and_name('perimeter', 'bad_headers_register', 'from_user').update_attributes(:value => '^%d+$', :class_type => 'String')
     GsParameter.where(:entity => 'perimeter', :section => 'bad_headers_register', :name => 'to_user').first.update_attributes(:value => '^%d+$', :class_type => 'String')
     
     GsParameter.where(:entity => 'perimeter', :section => 'checks_call', :name => 'check_bad_headers').first.update_attributes(:value => '20', :class_type => 'Integer')