Merge branch 'c/feature/#81' of https://github.com/hpi-swt2/event-und…

…-raumplanung into c/feature/#81
hpi-swt2 · Dec 8, 2014 · 6558220 · 6558220
2 parents 8c79b3a + 1b04c97
commit 6558220
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 8 deletions.
diff --git a/app/views/event_templates/_form.html.erb b/app/views/event_templates/_form.html.erb
@@ -49,6 +49,6 @@
 
   <%= f.submit nil, :class => 'btn btn-primary' %>
   <%= link_to t('.cancel', :default => t("helpers.links.cancel")),
-            events_path, :class => 'btn btn-default' %>
+            event_templates_path, :class => 'btn btn-default' %>
 
 <% end %>
diff --git a/app/views/event_templates/_list.html.erb b/app/views/event_templates/_list.html.erb
@@ -23,14 +23,16 @@
         <% if can? :edit, event_template%>
           <%= link_to t('.edit', :default => t("helpers.links.edit")),
                       edit_event_template_path(event_template), :class => 'btn btn-default btn-xs' %>
-        <% end %>   
-         <% if can? :destroy, event_template %>  
+        <% end %>
+         <% if can? :destroy, event_template %>
           <%= link_to t('.destroy', :default => t("helpers.links.destroy")),
                       event_template_path(event_template),
                       :method => :delete,
                       :data => { :confirm => t('.confirm', :default => t("helpers.links.confirm", :default => 'Are you sure?')) },
                       :class => 'btn btn-xs btn-danger' %>
-        <% end %> 
+        <% end %>
+           <%= link_to t('.create', :default => t("helpers.submit.create", :model => Event.model_name.human.titleize)),
+                      new_event_from_template_path(event_template), :class => 'btn btn-default btn-xs' %>
         </td>
       </tr>
     <% end %>

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -55,9 +55,9 @@
             <li><%= link_to Room.model_name.human.pluralize, rooms_path %></li>
             <li><%= link_to Group.model_name.human.pluralize, groups_path %></li>
             <li><%= link_to Task.model_name.human.pluralize, tasks_path %></li>
-             <li><%= link_to "Booking", "bookings/new" %></li>
-             <li><%= link_to "Filtering", "rooms/list" %></li>
-            <li><%= link_to "Process Requests", "events_approval/" %></li>
+            <li><%= link_to Booking.model_name.human.pluralize, new_booking_path %></li>
+            <li><%= link_to "Filtering", rooms_list_path %></li>
+            <li><%= link_to "Process Requests", events_approval_path %></li>
           </ul>
           <ul class="nav navbar-nav navbar-right" style="height: 50px;">
             <% if user_signed_in? %>

diff --git a/db/schema.rb b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20141126141428) do
+ActiveRecord::Schema.define(version: 20141208100208) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -51,6 +51,16 @@
 
   add_index "equipment", ["room_id"], name: "index_equipment_on_room_id", using: :btree
 
+  create_table "event_suggestions", force: true do |t|
+    t.string   "starts_at"
+    t.string   "datetime"
+    t.string   "ends_at"
+    t.string   "status"
+    t.integer  "room_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
   create_table "event_templates", force: true do |t|
     t.string   "name"
     t.text     "description"