Merge branch 'develop'5.0.1

4 files changed, 31 insertions, 1 deletions

diff --git a/db/migrate/20121223110948_add_tenant_to_phone.rb b/db/migrate/20121223110948_add_tenant_to_phone.rb
new file mode 100644
index 0000000..dbe0412
--- /dev/null
+++ b/db/migrate/20121223110948_add_tenant_to_phone.rb
@@ -0,0 +1,6 @@
+class AddTenantToPhone < ActiveRecord::Migration
+  def change
+    add_column :phones, :tenant_id, :integer
+
+  end
+end
diff --git a/db/migrate/20121223111155_add_fallback_sip_account_to_phone.rb b/db/migrate/20121223111155_add_fallback_sip_account_to_phone.rb
new file mode 100644
index 0000000..94a8050
--- /dev/null
+++ b/db/migrate/20121223111155_add_fallback_sip_account_to_phone.rb
@@ -0,0 +1,6 @@
+class AddFallbackSipAccountToPhone < ActiveRecord::Migration
+  def change
+    add_column :phones, :fallback_sip_account_id, :integer
+
+  end
+end
diff --git a/db/migrate/20121228101454_update_tenant_id.rb b/db/migrate/20121228101454_update_tenant_id.rb
new file mode 100644
index 0000000..dc2f37c
--- /dev/null
+++ b/db/migrate/20121228101454_update_tenant_id.rb
@@ -0,0 +1,16 @@
+class UpdateTenantId < ActiveRecord::Migration
+  def up
+  	Phone.all.each do |phone|
+      phone.tenant_id = Tenant.last.id
+      phone.save
+  	end
+
+    Phone.where(:hot_deskable => true).each do |phone|
+      phone.fallback_sip_account = phone.sip_accounts.where(:sip_accountable_type => 'Tenant').first
+      phone.save
+    end
+  end
+
+  def down
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 1395e1b..804ff5f 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 => 20121125084447) do
+ActiveRecord::Schema.define(:version => 20121228101454) do
 
   create_table "access_authorizations", :force => true do |t|
     t.string   "access_authorizationable_type"
@@ -738,6 +738,8 @@ ActiveRecord::Schema.define(:version => 20121125084447) do
     t.boolean  "nightly_reboot"
     t.string   "provisioning_key"
     t.boolean  "provisioning_key_active"
+    t.integer  "tenant_id"
+    t.integer  "fallback_sip_account_id"
   end
 
   create_table "registrations", :id => false, :force => true do |t|