Upgraded to rails 3.1.8. Fixed various bugs in wiki.

app/views/admin/base/index.html.haml

@@ -33,7 +33,7 @@
       - for group in @groups
         %tr{:class => cycle('even','odd', :name => 'groups')}
           %td= link_to group.name, [:admin, group]
-          %td= group.class.human_name
+          %td= group.class.model_name.human
           %td= group.users.size
     %br/
     = link_to 'Alle Bestellgruppen', admin_ordergroups_path

app/views/finance/invoices/index.html.erb

@@ -26,7 +26,7 @@
       <td><%= format_date invoice.paid_on %></td>
       <td><%= number_to_currency invoice.amount %></td>
       <td><%= link_to "Lieferung", [invoice.supplier,invoice.delivery] if invoice.delivery %></td>
-      <td><%= link_to format_date(invoice.order.ends), :controller => 'balancing', :action => 'new', :id => invoice.order if invoice.order %></td>
+      <td><%= link_to format_date(invoice.order.ends), new_finance_order_path(order_id: invoice.order_id) if invoice.order %></td>
       <td><%= truncate(invoice.note) %></td>
       <td><%= link_to icon(:edit), edit_finance_invoice_path(invoice) %></td>
       <td><%= link_to icon(:delete), finance_invoice_path(invoice), :confirm => 'Are you sure?', :method => :delete %></td>

app/views/home/index.html.haml

@@ -42,7 +42,8 @@
     .box_title
       %h2 Neuste Nachrichten
     .column_content
-      = render :partial => 'messages/messages', :locals => {:messages => Message.public.order(:created_at.desc).limit(5), :subject_length => 70}
+      = render :partial => 'messages/messages',
+        :locals => {:messages => Message.public.order('created_at DESC').limit(5), :subject_length => 70}
       %br/
       = link_to "Alle Nachrichten einsehen", messages_path
 

app/views/layouts/application.html.haml

@@ -3,15 +3,13 @@
   %head
     %meta{"http-equiv" => "content-type", :content => "text/html;charset=UTF-8"}
     %title= "FoodSoft - " + (yield(:title) or controller.controller_name)
-    = stylesheet_link_tag 'main', 'rails_messages', 'nav', 'simple_form', 'token-input', 'jquery.fancybox-1.3.4',
-      :cache => "all_cached"
+    = stylesheet_link_tag 'application'
     = stylesheet_link_tag "print", :media => "print"
     <!--[if lte IE 7]>
     = stylesheet_link_tag 'ie_hacks'
     <![endif]-->
-    = javascript_include_tag 'jquery.min', 'jquery-ui.min', 'jquery_ujs', 'jquery.tokeninput', 'jquery.observe_field',
-      'rails.validations', 'application', 'ordering', 'jquery.fancybox-1.3.4.pack', :cache => 'all_cached'
-    = csrf_meta_tag
+    = javascript_include_tag 'application'
+    = csrf_meta_tags
     = yield(:head)
   %body
     #logininfo= render :partial => 'shared/loginInfo'

app/views/layouts/login.html.haml

@@ -3,8 +3,9 @@
   %head
     %meta{"http-equiv" => "content-type", :content => "text/html;charset=UTF-8"}
     %title= "FoodSoft - " + (yield(:title) or controller.controller_name)
-    = stylesheet_link_tag 'main', 'rails_messages', 'nav', 'simple_form', :cache => "login_cached"
-    = javascript_include_tag 'jquery.min'
+    = stylesheet_link_tag 'application'
+    = javascript_include_tag 'application'
+    = csrf_meta_tags
     = yield(:head)
   %body
     #login

app/views/messages/new.haml

@@ -36,7 +36,7 @@
 
   #recipients
     = f.input :recipient_tokens, :input_html => { 'data-pre' => User.find_all_by_id(@message.recipients_ids).map { |u| u.token_attributes }.to_json }
-    = f.input :group_id, :as => :select, :collection => Group.order(:type.desc, :name.desc).all.reject { |g| g.memberships.empty? }
+    = f.input :group_id, :as => :select, :collection => Group.order('type DESC, name DESC').all.reject { |g| g.memberships.empty? }
   = f.input :private
   = f.input :subject
   = f.input :body

app/views/pages/_page_list_item.html.haml

@@ -2,7 +2,7 @@
 %tr
   %td{:style => "padding-left: #{ident}px"}
     = link_to page.title, wiki_page_path(page.permalink)
-  %td= "#{User.find(page.updated_by).nick} (#{format_datetime_timespec(page.updated_at, '%a, %d. %B %Y %H:%M:%S')})"
+  %td #{page.user.try(:nick)} (#{format_datetime_timespec(page.updated_at, '%a, %d. %B %Y %H:%M:%S')})
 -if siteMap == 1
   -for child in page.children.all
     = render :partial => 'page_list_item', :locals => {:page => child, :level => level+1, :siteMap => 1}

app/views/pages/_recent_changes.html.haml

@@ -3,5 +3,5 @@
     %tr
       %th Titel
       %th Zuletzt aktualisiert
-    - for page in Page.non_redirected.order(:updated_at.desc)
+    - for page in Page.non_redirected.order('updated_at DESC')
       = render :partial => "page_list_item", :locals => {:page => page, :level => 0, :siteMap => 0}

app/views/pages/_site_map.html.haml

@@ -6,6 +6,6 @@
     - homepage = Page.find_by_permalink('Home')
     - unless homepage.nil?
       = render :partial => 'page_list_item', :locals => {:page => homepage, :level => 0, :siteMap => 1}
-    - for page in Page.no_parent.non_redirected.order(:created_at.desc)
+    - for page in Page.no_parent.non_redirected.order('created_at DESC')
       - if page.id != homepage.id
         = render :partial => 'page_list_item', :locals => {:page => page, :level => 0, :siteMap => 1}

app/views/pages/_title_list.html.haml

@@ -3,5 +3,5 @@
     %tr
       %th Titel
       %th Zuletzt aktualisiert
-    - for page in Page.non_redirected.order(:title.desc)
+    - for page in Page.non_redirected.order('title DESC')
       = render :partial => "page_list_item", :locals => {:page => page, :level => 0, :siteMap => 0}

app/views/shared/_group_form_fields.html.haml

@@ -7,7 +7,7 @@
   %h3 Wöchentliche Jobs
   = f.input :weekly_task
   #weekly_task_fields
-    = f.input :weekday
+    = f.input :weekday, as: :select, collection: Workgroup.weekdays
     = f.input :task_name
     = f.input :task_required_users
     = f.input :task_duration, :as => :select, :collection => (1..3)