Merge branch 'dev' into 238_Event_Description_Textfield

app/models/request.rb

@@ -13,7 +13,7 @@ class Request < ActiveRecord::Base
   validates_format_of :email, :with => Devise::email_regexp
 
   enum form_of_address: [:mr, :mrs, :prefer_to_omit]
-  enum status: [:open, :accepted]  # per database declaration, the first value is default
+  enum status: [:open, :accepted, :declined]  # per database declaration, the first value is default
 
   def name
     "#{first_name} #{last_name}"

app/views/requests/index.html.erb

@@ -9,6 +9,7 @@
       <th><%= model_class.human_attribute_name(:name) %></th>
       <th><%= model_class.human_attribute_name(:time_period) %></th>
       <th><%= model_class.human_attribute_name(:number_of_participants) %></th>
+      <th><%= model_class.human_attribute_name(:status) %></th>
       <th><%=t '.actions', :default => t("helpers.actions") %></th>
     </tr>
   </thead>
@@ -19,6 +20,7 @@
         <td><%= request.name %></td>
         <td><%= request.time_period %></td>
         <td><%= request.number_of_participants %></td>
+        <td><%= t("activerecord.attributes.request.statuses.#{request.status}") %></td>
         <td>
           <% if can? :edit, request %>
             <%= link_to t('.edit', :default => t("helpers.links.edit")),

config/locales/de.requests.yml

@@ -44,7 +44,8 @@ de:
         contact_person: "Ansprechpartner"
         status: "Status"
         statuses:
-          open: "Noch nicht angenommen"
+          open: "Offen"
           accepted: "Angenommen"
+          declined: "Abgelehnt"
   dialogues:
     confirm_delete: "Bist du sicher, dass du diese Anfrage löschen möchtest? Diese Aktion kann nicht widerrufen werden."

spec/views/requests/index.html.erb_spec.rb

@@ -18,6 +18,7 @@
         assert_select 'td', :text => r.name
         assert_select 'td', :text => r.time_period
         assert_select 'td', :text => r.number_of_participants.to_s
+        assert_select 'td', :text => I18n.t("activerecord.attributes.request.statuses.#{r.status}")
       end
     end