diff options
| author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-02-04 14:31:12 +0100 |
|---|---|---|
| committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-02-04 14:31:12 +0100 |
| commit | 87634e025711be508501cce8c05f23085dad8f9d (patch) | |
| tree | 7fe3f270694aeeb804021048167731da698ea662 /app | |
| parent | 3dead8f9bd964c7330f193cbec82afe44db4149d (diff) | |
Bugfixes
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/phone_numbers/_index_core.html.haml | 5 | ||||
| -rw-r--r-- | app/views/sip_accounts/show.html.haml | 8 | ||||
| -rw-r--r-- | app/views/softkeys/_index_core.html.haml | 5 |
3 files changed, 10 insertions, 8 deletions
diff --git a/app/views/phone_numbers/_index_core.html.haml b/app/views/phone_numbers/_index_core.html.haml index b68e5af..85982da 100644 --- a/app/views/phone_numbers/_index_core.html.haml +++ b/app/views/phone_numbers/_index_core.html.haml @@ -10,8 +10,9 @@ - for phone_number in phone_numbers.order(:position) = content_tag_for :tr, phone_number do %td - %span.handle - %i.icon-resize-vertical + - if phone_numbers.count > 1 + %span.handle + %i.icon-resize-vertical - if phone_number.phone_numberable_type == 'PhoneBookEntry' %td= phone_number.name %td= phone_number diff --git a/app/views/sip_accounts/show.html.haml b/app/views/sip_accounts/show.html.haml index f48d927..72e10df 100644 --- a/app/views/sip_accounts/show.html.haml +++ b/app/views/sip_accounts/show.html.haml @@ -65,16 +65,16 @@ = render :partial => 'shared/show_edit_destroy_part', :locals => { :parent => @sip_account.sip_accountable, :child => @sip_account } -- if @sip_account.phone_numbers.any? || can?(:create, @sip_account.phone_numbers.build) +- if @sip_account.phone_numbers.count > 0 || can?(:create, @sip_account.phone_numbers.build) %h2= t('phone_numbers.index.page_title') - - if @sip_account.phone_numbers.any? + - if @sip_account.phone_numbers.count > 0 = render "phone_numbers/index_core", :phone_numbers => @sip_account.phone_numbers %br = render :partial => 'shared/create_link', :locals => { :parent => @sip_account, :child_class => PhoneNumber } -- if @sip_account.softkeys.any? || can?(:create, @sip_account.softkeys.build) +- if @sip_account.softkeys.count > 0 || can?(:create, @sip_account.softkeys.build) %h2= t("softkeys.index.page_title") - - if @sip_account.softkeys.any? + - if @sip_account.softkeys.count > 0 = render "softkeys/index_core", :softkeys => @sip_account.softkeys %br = render :partial => 'shared/create_link', :locals => { :parent => @sip_account, :child_class => Softkey }
\ No newline at end of file diff --git a/app/views/softkeys/_index_core.html.haml b/app/views/softkeys/_index_core.html.haml index 70c96bc..e2cb16c 100644 --- a/app/views/softkeys/_index_core.html.haml +++ b/app/views/softkeys/_index_core.html.haml @@ -12,8 +12,9 @@ - cache(['softkeys_table_tr', I18n.locale, current_user, softkey]) do = content_tag_for :tr, softkey do %td - %span.handle - %i.icon-resize-vertical + - if softkeys.count > 1 + %span.handle + %i.icon-resize-vertical %td= softkey.function %td= softkey.number %td= softkey.label |