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

3 files changed, 33 insertions, 1 deletions

diff --git a/app/models/call_route.rb b/app/models/call_route.rb
index 28120c1..b4496ab 100644
--- a/app/models/call_route.rb
+++ b/app/models/call_route.rb
@@ -238,4 +238,15 @@ class CallRoute < ActiveRecord::Base
       end
     end
   end
+
+  def endpoint
+    if self.endpoint_id.to_i > 0 
+      begin
+        return self.endpoint_type.camelize.constantize.where(:id => self.endpoint_id.to_i).first 
+      rescue
+        return nil
+      end
+    end
+  end
+
 end
diff --git a/app/models/sip_account.rb b/app/models/sip_account.rb
index d35f9b4..444eb12 100644
--- a/app/models/sip_account.rb
+++ b/app/models/sip_account.rb
@@ -133,7 +133,7 @@ class SipAccount < ActiveRecord::Base
   end
 
   def registration
-    return FreeswitchRegistration.where(:reg_user => self.auth_name).first
+    return SipRegistration.where(:sip_user => self.auth_name).first
   end
 
   def call( phone_number )
diff --git a/app/models/sip_registration.rb b/app/models/sip_registration.rb
new file mode 100644
index 0000000..b668301
--- /dev/null
+++ b/app/models/sip_registration.rb
@@ -0,0 +1,21 @@
+class SipRegistration < ActiveRecord::Base  
+  # Makes sure that this is a readonly model.
+  def readonly?
+    return true
+  end
+ 
+  # Prevent objects from being destroyed
+  def before_destroy
+    raise ActiveRecord::ReadOnlyRecord
+  end
+
+  # Prevent objects from being deleted
+  def self.delete_all
+    raise ActiveRecord::ReadOnlyRecord
+  end
+
+  # Prevent objects from being deleted
+  def delete
+    raise ActiveRecord::ReadOnlyRecord
+  end
+end