summaryrefslogtreecommitdiff
path: root/app/models
diff options
context:
space:
mode:
authorspag <spag@golwen.net>2013-02-13 08:44:45 +0100
committerspag <spag@golwen.net>2013-02-13 08:44:45 +0100
commit6875af1a6f193ecc74653ad9372ab0ef2d0ef85e (patch)
tree6dae42ae458574023477206d9ed1234007f3975b /app/models
parent63963e63d8e211b15bedfd6719d67259440520a2 (diff)
display softkeyable
Diffstat (limited to 'app/models')
-rw-r--r--app/models/softkey.rb8
1 files changed, 4 insertions, 4 deletions
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