From 6875af1a6f193ecc74653ad9372ab0ef2d0ef85e Mon Sep 17 00:00:00 2001
From: spag <spag@golwen.net>
Date: Wed, 13 Feb 2013 08:44:45 +0100
Subject: display softkeyable

---
 app/models/softkey.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'app/models')

diff --git a/app/models/softkey.rb b/app/models/softkey.rb
index 83c88ab..4b758e0 100644
--- a/app/models/softkey.rb
+++ b/app/models/softkey.rb
@@ -48,14 +48,14 @@ class Softkey < ActiveRecord::Base
   end
 
   def to_s
-    if (['call_forwarding'].include?(self.softkey_function.name))
-      "#{self.softkeyable}"
-    else
+    if self.softkeyable.blank?
       if ['log_out', 'log_in'].include?(self.softkey_function.name)
         I18n.t("softkeys.functions.#{self.softkey_function.name}")        
       else
-  	    "#{self.softkey_function.name} : #{self.number.to_s}"
+        "#{self.softkey_function.name} : #{self.number.to_s}"
       end
+    else
+      "#{self.softkeyable}"
     end
   end
 
-- 
cgit v1.2.3


From 14b400d563b2d33706491a20e997a1062b9acc69 Mon Sep 17 00:00:00 2001
From: spag <spag@golwen.net>
Date: Wed, 13 Feb 2013 10:08:01 +0100
Subject: language_code added to sip_account classes

---
 app/models/sip_account.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'app/models')

diff --git a/app/models/sip_account.rb b/app/models/sip_account.rb
index 9ba1f8b..7df8e3b 100644
--- a/app/models/sip_account.rb
+++ b/app/models/sip_account.rb
@@ -6,7 +6,7 @@ class SipAccount < ActiveRecord::Base
   attr_accessible :auth_name, :caller_name, :password, :voicemail_pin, 
                   :tenant_id, :call_waiting, :clir, :clip_no_screening,
                   :clip, :description, :callforward_rules_act_per_sip_account,
-                  :hotdeskable, :gs_node_id
+                  :hotdeskable, :gs_node_id, :language_code
 
   # Associations:
   #
@@ -31,6 +31,8 @@ class SipAccount < ActiveRecord::Base
 
   belongs_to :gs_node
 
+  belongs_to :language, :foreign_key => 'language_code', :primary_key => 'code'
+
   # Delegations:
   #
   delegate :host, :to => :sip_domain, :allow_nil => true
-- 
cgit v1.2.3


From 7d5aa2333f61ea8a89d52f09f0719e8cd8973c7f Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Wed, 13 Feb 2013 11:58:17 +0100
Subject: Removed def to_s which was buggy. closes #171

---
 app/models/fax_document.rb | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'app/models')

diff --git a/app/models/fax_document.rb b/app/models/fax_document.rb
index be689e2..16fdc70 100644
--- a/app/models/fax_document.rb
+++ b/app/models/fax_document.rb
@@ -48,10 +48,6 @@ class FaxDocument < ActiveRecord::Base
     end  
   end
   
-  def to_s
-    name
-  end
-  
   def render_thumbnails
     directory = "/tmp/GS-#{GsParameter.get('GEMEINSCHAFT_VERSION')}/fax_thumbnails/#{self.id}"
     system('mkdir -p ' + directory)
-- 
cgit v1.2.3