Merge branch 'develop'5.0.1

3 files changed, 28 insertions, 0 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