Fixed order views.

This commit is contained in:
benni 2011-06-20 00:26:17 +02:00
parent 88b268cb0b
commit b3c64ecb85
5 changed files with 11 additions and 9 deletions

View File

@ -42,12 +42,12 @@ class OrdersController < ApplicationController
@order= Order.find(params[:id])
if params[:view] # Articles-list will be replaced
partial = case params[:view]
when 'normal' then "articles"
when 'groups'then 'shared/articles_by_groups'
when 'articles'then 'shared/articles_by_articles'
end
render :partial => partial, :locals => {:order => @order} if partial
@partial = case params[:view]
when 'normal' then "articles"
when 'groups'then 'shared/articles_by_groups'
when 'articles'then 'shared/articles_by_articles'
end
render :layout => false
end
end

View File

@ -1,9 +1,7 @@
module OrdersHelper
def update_articles_link(order, text, view)
link_to_remote text, :url => order_path(order, :view => view),
:update => 'articles', :before => "Element.show('loader')", :success => "Element.hide('loader')",
:method => :get
link_to text, order_path(order, :view => view), :remote => true
end
def link_to_pdf(order, action)

View File

@ -0,0 +1 @@
$('#articles').html('<%= escape_javascript(render(:partial => @partial, :locals => {:order => @order})) %>');

View File

@ -287,6 +287,9 @@ de:
last_name: "Nachname"
order_comment:
text: 'Kommentar'
order:
starts: "Läuft vom"
ends: "Endet am"
hints:
tax: 'In Prozent, Standard sind 7,0'