Merge branch 'develop'

4 files changed, 17 insertions, 3 deletions

diff --git a/app/views/sip_accounts/_form_core.html.haml b/app/views/sip_accounts/_form_core.html.haml
index d7c65d0..f84f38a 100644
--- a/app/views/sip_accounts/_form_core.html.haml
+++ b/app/views/sip_accounts/_form_core.html.haml
@@ -6,7 +6,6 @@
   - else
     = f.input :auth_name, :as => :string, :label => t('sip_accounts.form.auth_name.label'), :hint => conditional_hint('sip_accounts.form.auth_name.hint')
     = f.input :password, :as => :string, :label => t('sip_accounts.form.password.label'), :hint => conditional_hint('sip_accounts.form.password.hint')
-  = f.input :voicemail_pin, :as => :string, :label => t('sip_accounts.form.voicemail_pin.label'), :hint => conditional_hint('sip_accounts.form.voicemail_pin.hint')
   = f.input :call_waiting, :label => t('sip_accounts.form.call_waiting.label'), :hint => conditional_hint('sip_accounts.form.call_waiting.hint')
   = f.input :clir, :label => t('sip_accounts.form.clir.label'), :hint => conditional_hint('sip_accounts.form.clir.hint')
   = f.input :clip, :label => t('sip_accounts.form.clip.label'), :hint => conditional_hint('sip_accounts.form.clip.hint')
@@ -14,3 +13,4 @@
     = f.input :hotdeskable, :label => t('sip_accounts.form.hotdeskable.label'), :hint => conditional_hint('sip_accounts.form.hotdeskable.hint')
   = f.input :clip_no_screening, :label => t('sip_accounts.form.clip_no_screening.label'), :hint => conditional_hint('sip_accounts.form.clip_no_screening.hint')
   = f.input :language_code, :collection => Language.all.collect{|l| [l.to_s, l.code]}, :label => t('sip_accounts.form.language_code.label'), :hint => conditional_hint('sip_accounts.form.language_id.hint'), :include_blank => false
+  = f.input :voicemail_account_id, :collection => @possible_voicemail_accounts.collect{|l| [l.to_s, l.id]}, :label => t('sip_accounts.form.voicemail_account_id.label'), :hint => conditional_hint('voicemail_accounts.form.sip_account_id.hint'), :include_blank => true
diff --git a/app/views/sip_accounts/_index_core.html.haml b/app/views/sip_accounts/_index_core.html.haml
index d98ea0a..be1f4cb 100644
--- a/app/views/sip_accounts/_index_core.html.haml
+++ b/app/views/sip_accounts/_index_core.html.haml
@@ -1,10 +1,16 @@
+
+- if defined?(users.total_pages)
+  = will_paginate users, :renderer => BootstrapPagination::Rails, :previous_label => raw('<i class = "icon-chevron-left"></i>'), :next_label => raw('<i class = "icon-chevron-right"></i>')
+  
 %table.table.table-striped
   %thead
     %tr
+      - if defined?(show_sip_accountable) && show_sip_accountable
+        %th= sortable :sip_accountable_id, t('sip_accounts.index.sip_accountable')
       %th
         %span.hidden-phone
           = t('sip_accounts.index.online')
-      %th= t('sip_accounts.index.caller_name')
+      %th= sortable :caller_name, t('sip_accounts.index.caller_name')
       %th
         %span.hidden-phone
           = t('sip_accounts.index.phone_numbers')
@@ -16,6 +22,9 @@
   %tbody
     - for sip_account in sip_accounts
       %tr{:class => (sip_account.registration ? '' : 'warning')}
+        - if defined?(show_sip_accountable) && show_sip_accountable
+          %td
+            = sip_account.sip_accountable
         %td
           - if sip_account.registration
             %i.icon-ok
diff --git a/app/views/sip_accounts/index.html.haml b/app/views/sip_accounts/index.html.haml
index fbdba48..114943e 100644
--- a/app/views/sip_accounts/index.html.haml
+++ b/app/views/sip_accounts/index.html.haml
@@ -1,6 +1,6 @@
 - content_for :title, t("sip_accounts.index.page_title")
 
 - if @sip_accounts.count > 0
-  = render "index_core", :sip_accounts => @sip_accounts
+  = render "index_core", :sip_accounts => @sip_accounts, :show_sip_accountable => (@parent.class == Tenant)
 
 = render :partial => 'shared/create_link', :locals => {:parent => @parent, :child_class => SipAccount}
\ No newline at end of file
diff --git a/app/views/sip_accounts/show.html.haml b/app/views/sip_accounts/show.html.haml
index e79907f..a7cd3ce 100644
--- a/app/views/sip_accounts/show.html.haml
+++ b/app/views/sip_accounts/show.html.haml
@@ -37,6 +37,11 @@
         %strong= t('sip_accounts.show.hotdeskable') + ":"
       %td
         = @sip_account.hotdeskable == true ? t('simple_form.yes') : t('simple_form.no') 
+    %tr
+      %td
+        %strong= t('sip_accounts.show.voicemail_account') + ":"
+      %td
+        = @sip_account.voicemail_account
 
     - if @sip_account.registration.try(:network_ip) && @sip_account.registration.try(:network_port)
       %tr