Merge branch 'develop'

1 files changed, 43 insertions, 53 deletions

diff --git a/app/controllers/voicemail_settings_controller.rb b/app/controllers/voicemail_settings_controller.rb
index 5de0c35..f270c3d 100644
--- a/app/controllers/voicemail_settings_controller.rb
+++ b/app/controllers/voicemail_settings_controller.rb
@@ -1,92 +1,82 @@
 class VoicemailSettingsController < ApplicationController
-  load_resource :sip_account
-  load_and_authorize_resource :voicemail_setting, :through => :sip_account, :singleton => true
+  load_and_authorize_resource :voicemail_account
+  load_and_authorize_resource :voicemail_setting, :through => [:voicemail_account]
 
-  before_filter :set_and_authorize_parent
   before_filter :spread_breadcrumbs
-  before_filter :voicemail_defaults, :only => [:index, :show, :new, :create, :edit]
 
   def index
-    render :edit
+    @voicemail_settings = @voicemail_account.voicemail_settings
   end
 
   def show
-    render :edit
   end
 
   def new
-    render :edit
+    @names_possible = []
+    VoicemailSetting::VOICEMAIL_SETTINGS.keys.each do |name|
+      if @voicemail_account.voicemail_settings.where(:name => name).first
+        next
+      end
+
+      label = t("voicemail_settings.settings.#{name}")
+      if label =~ /^translation missing/
+        label = name.to_s.gsub('_', ' ').capitalize;
+      end
+
+      @names_possible << [label, name]
+    end
   end
 
   def create
-    @sip_account = SipAccount.where(:id => params[:sip_account_id]).first
-    params[:voicemail_setting][:username] = @sip_account.auth_name
-    params[:voicemail_setting][:domain] = @sip_account.sip_domain.try(:host)
-    @voicemail_setting = VoicemailSetting.new(params[:voicemail_setting])
+    @voicemail_setting = @voicemail_account.voicemail_settings.build(params[:voicemail_setting])
+    @voicemail_setting.class_type = VoicemailSetting::VOICEMAIL_SETTINGS[@voicemail_setting.name]
     if @voicemail_setting.save
-      redirect_to sip_account_voicemail_settings_path(@sip_account), :notice => t('voicemail_settings.controller.successfuly_created')
+      m = method( :"#{@voicemail_account.voicemail_accountable.class.name.underscore}_voicemail_account_path" )
+      redirect_to m.( @voicemail_account.voicemail_accountable, @voicemail_account ), :notice => t('voicemail_settings.controller.successfuly_created')
     else
-      render :action => 'edit'
+      render :new
     end
   end
 
   def edit
-
+    @voicemail_setting = @voicemail_account.voicemail_settings.find(params[:id])
+    @input_type = VoicemailSetting::VOICEMAIL_SETTINGS.fetch(@voicemail_setting.name,{}).fetch(:input, 'String')
+    @input_html = VoicemailSetting::VOICEMAIL_SETTINGS.fetch(@voicemail_setting.name,{}).fetch(:html, {})
   end
 
   def update
+    @voicemail_setting = @voicemail_account.voicemail_settings.find(params[:id])
     if @voicemail_setting.update_attributes(params[:voicemail_setting])
-      redirect_to sip_account_voicemail_settings_path(@sip_account), :notice  => t('voicemail_settings.controller.successfuly_updated')
+      m = method( :"#{@voicemail_account.voicemail_accountable.class.name.underscore}_voicemail_account_path" )
+      redirect_to m.( @voicemail_account.voicemail_accountable, @voicemail_account ), :notice  => t('voicemail_settings.controller.successfuly_updated')
     else
+      @input_type = VoicemailSetting::VOICEMAIL_SETTINGS.fetch(@voicemail_setting.name,{}).fetch(:input, 'String')
+      @input_html = VoicemailSetting::VOICEMAIL_SETTINGS.fetch(@voicemail_setting.name,{}).fetch(:html, {})
       render :edit
     end
   end
 
   def destroy
-   
+    @voicemail_setting = @voicemail_account.voicemail_settings.find(params[:id])
+    @voicemail_setting.destroy
+    m = method( :"#{@voicemail_account.voicemail_accountable.class.name.underscore}_voicemail_account_path" )
+    redirect_to m.( @voicemail_account.voicemail_accountable, @voicemail_account ), :notice => t('voicemail_settings.controller.successfuly_destroyed')
   end
 
   private
-  def set_and_authorize_parent
-    @parent = @sip_account
-
-    authorize! :read, @parent
-
-    @show_path_method = method( :"#{@parent.class.name.underscore}_voicemail_setting_path" )
-    @index_path_method = method( :"#{@parent.class.name.underscore}_voicemail_settings_path" )
-    @new_path_method = method( :"new_#{@parent.class.name.underscore}_voicemail_setting_path" )
-    @edit_path_method = method( :"edit_#{@parent.class.name.underscore}_voicemail_setting_path" )
-  end
-
   def spread_breadcrumbs
-    if @parent.class == SipAccount
-     if @sip_account.sip_accountable.class == User
-       add_breadcrumb t("#{@sip_account.sip_accountable.class.name.underscore.pluralize}.index.page_title"), method( :"tenant_#{@sip_account.sip_accountable.class.name.underscore.pluralize}_path" ).(@sip_account.tenant)
-       add_breadcrumb @sip_account.sip_accountable, method( :"tenant_#{@sip_account.sip_accountable.class.name.underscore}_path" ).(@sip_account.tenant, @sip_account.sip_accountable)
-     end
-     add_breadcrumb t("sip_accounts.index.page_title"), method( :"#{@sip_account.sip_accountable.class.name.underscore}_sip_accounts_path" ).(@sip_account.sip_accountable)
-     add_breadcrumb @sip_account, method( :"#{@sip_account.sip_accountable.class.name.underscore}_sip_account_path" ).(@sip_account.sip_accountable, @sip_account)
-     add_breadcrumb t("voicemail_settings.index.page_title"), sip_account_voicemail_settings_path(@sip_account)
+    voicemail_accountable = @voicemail_account.voicemail_accountable
+    if voicemail_accountable.class == User
+      add_breadcrumb t("users.index.page_title"), tenant_users_path(voicemail_accountable.current_tenant)
+      add_breadcrumb voicemail_accountable, tenant_user_path(voicemail_accountable.current_tenant, voicemail_accountable)
     end
-  end
-
-  def voicemail_defaults
-    storage_dir = GsParameter.where(:entity => 'voicemail', :section => 'parameters', :name => 'storage-dir').first.try(:value)
-    path = "#{storage_dir}/#{@sip_account.sip_domain.host}/#{@sip_account.auth_name}/"
-    @greeting_files = Dir.glob("#{path}*greeting*.wav").collect {|r| [ File.basename(r), File.expand_path(r) ] }
-    @name_files = Dir.glob("#{path}*name*.wav").collect {|r| [ File.basename(r), File.expand_path(r) ] }
+    
+    add_breadcrumb t("voicemail_accounts.index.page_title"), method( :"#{voicemail_accountable.class.name.underscore}_voicemail_accounts_url" ).(voicemail_accountable)
+    add_breadcrumb @voicemail_account.name, method( :"#{voicemail_accountable.class.name.underscore}_voicemail_account_path" ).(voicemail_accountable, @voicemail_account)
+    add_breadcrumb t("voicemail_settings.index.page_title"), voicemail_account_voicemail_settings_url(@voicemail_account)
 
-    if @voicemail_setting.blank? then
-      @voicemail_setting = @sip_account.voicemail_setting
-    end
-
-    if @voicemail_setting.blank?
-      @voicemail_setting = VoicemailSetting.new
-      @voicemail_setting.notify = true
-      @voicemail_setting.attachment = true
-      @voicemail_setting.mark_read = true
-      @voicemail_setting.purge = false
+    if !@voicemail_setting.to_s.blank?
+      add_breadcrumb @voicemail_setting
     end
   end
-
 end