From 64afdeacb1444b319abfcad6c9a8cfd656fe2dd4 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Mon, 11 Mar 2013 12:19:57 +0100 Subject: Reload FaxDocument#show when a fax was send. --- app/views/fax_documents/show.html.haml | 3 +++ 1 file changed, 3 insertions(+) (limited to 'app/views/fax_documents/show.html.haml') diff --git a/app/views/fax_documents/show.html.haml b/app/views/fax_documents/show.html.haml index b8f3e9e..f860143 100644 --- a/app/views/fax_documents/show.html.haml +++ b/app/views/fax_documents/show.html.haml @@ -65,3 +65,6 @@ .row .span12 = render :partial => 'shared/show_edit_destroy_part', :locals => { :parent => @fax_document.fax_account, :child => @fax_document } + +- if @fax_document.state == 'sending' || @fax_document.state == 'queued_for_sending' + = subscribe_to "/fax_documents/#{@fax_document.id}" \ No newline at end of file -- cgit v1.2.3 From 3305624fc4b6de2dabaa292fa1480851ca141c96 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Mon, 11 Mar 2013 12:29:44 +0100 Subject: Fix the if. --- app/views/fax_documents/show.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/views/fax_documents/show.html.haml') diff --git a/app/views/fax_documents/show.html.haml b/app/views/fax_documents/show.html.haml index f860143..af5552d 100644 --- a/app/views/fax_documents/show.html.haml +++ b/app/views/fax_documents/show.html.haml @@ -66,5 +66,5 @@ .span12 = render :partial => 'shared/show_edit_destroy_part', :locals => { :parent => @fax_document.fax_account, :child => @fax_document } -- if @fax_document.state == 'sending' || @fax_document.state == 'queued_for_sending' +- if ['sending', 'queued_for_sending'].include? @fax_document.state = subscribe_to "/fax_documents/#{@fax_document.id}" \ No newline at end of file -- cgit v1.2.3 From 3c5a0511d228fb3dc00ae860ade1b8ff032cc42f Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Tue, 12 Mar 2013 11:23:20 +0100 Subject: Refactoring --- app/views/fax_documents/show.html.haml | 66 +--------------------------------- 1 file changed, 1 insertion(+), 65 deletions(-) (limited to 'app/views/fax_documents/show.html.haml') diff --git a/app/views/fax_documents/show.html.haml b/app/views/fax_documents/show.html.haml index af5552d..6ae0ee1 100644 --- a/app/views/fax_documents/show.html.haml +++ b/app/views/fax_documents/show.html.haml @@ -1,70 +1,6 @@ - content_for :title, t("fax_documents.show.page_title") -.row - .span12 - %table.table.table-striped - - case @fax_document.state - - when 'unsuccessful' - - current_status = 'error' - - when 'sending' - - current_status = 'success' - - when 'queued_for_sending' - - current_status = 'warning' - - else - - current_status = '' - - %tr{:class => current_status} - %td - %strong= t('fax_documents.index.state') + ":" - %td - = t("fax_documents.states.#{@fax_document.state}") - %tr - %td - %strong= t('fax_documents.index.result_code') + ":" - %td - = @fax_document.result_code - %tr - %td - %strong= t('fax_documents.index.result_text') + ":" - %td - = t("fax_documents.result_codes.code_#{@fax_document.result_code}") - %tr - %td - %strong= t('fax_documents.show.document_transferred_pages') + ":" - %td - = @fax_document.document_transferred_pages - %tr - %td - %strong= t('fax_documents.show.remote_station_id') + ":" - %td - = @fax_document.remote_station_id - %tr - %td - %strong= t('fax_documents.show.fax_resolution') + ":" - %td - = @fax_document.fax_resolution - - - if @fax_document.document? - %p - %a{:href => fax_account_fax_document_path(@fax_account, @fax_document, :format => :pdf), :method => :get} - %i{:class => 'icon-download'} - = t("fax_documents.index.actions.download_pdf") + " (#{number_to_human_size(@fax_document.document.size, :precision => 2)})" - -.row - .span12 - - if @fax_document.fax_thumbnails.any? - %ul.thumbnails - - @fax_document.fax_thumbnails.limit(50).each do |fax_thumbnail| - %li.span4 - %div.thumbnail - %a.thumbnail{:href => fax_thumbnail.thumbnail.url} - =image_tag(fax_thumbnail.thumbnail.url, :alt => "Page #{fax_thumbnail.position}") - %p - = "#{fax_thumbnail.position}/#{@fax_document.fax_thumbnails.count}" - -.row - .span12 - = render :partial => 'shared/show_edit_destroy_part', :locals => { :parent => @fax_document.fax_account, :child => @fax_document } += render :partial => 'fax_document', :locals => {:fax_document => @fax_document} - if ['sending', 'queued_for_sending'].include? @fax_document.state = subscribe_to "/fax_documents/#{@fax_document.id}" \ No newline at end of file -- cgit v1.2.3