From e473c1aa80c342e6b79d572adc3275e4700f1c35 Mon Sep 17 00:00:00 2001 From: Tyler Lemburg <trlemburg@gmail.com> Date: Mon, 18 Jul 2016 15:35:11 -0500 Subject: [PATCH] Bugfix on resource creation --- README | 2 ++ routes/admin/resources.rb | 1 + views/admin/edit_user.erb | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/README b/README index e69de29..0d13f0f 100644 --- a/README +++ b/README @@ -0,0 +1,2 @@ +Welcome to the UNL Resource Scheduler. + diff --git a/routes/admin/resources.rb b/routes/admin/resources.rb index a645db6..e20b67d 100644 --- a/routes/admin/resources.rb +++ b/routes/admin/resources.rb @@ -38,6 +38,7 @@ post '/:service_space_url_name/admin/resources/create/?' do resource.max_minutes_per_reservation = params[:max_minutes_per_reservation] resource.increment_minutes_per_reservation = params[:increment_minutes_per_reservation] resource.needs_approval = false + resource.needs_authorization = false resource.max_reservations_per_slot = 5 resource.save diff --git a/views/admin/edit_user.erb b/views/admin/edit_user.erb index 05016d8..995fcbc 100644 --- a/views/admin/edit_user.erb +++ b/views/admin/edit_user.erb @@ -10,7 +10,7 @@ <legend>Manager Permissions</legend> <% permissions.each do |perm| %> <input <%= 'checked="checked"' if user.permissions_in_space(@space).include?(perm) %> type="checkbox" id="permission-<%= perm.id %>" name="permission_<%= perm.id %>"> - <label for="permission-<%= perm.id %>"><%= perm.name %> <%= '(Tools)' if perm.id == Permission::MANAGE_RESOURCES %></label><br> + <label for="permission-<%= perm.id %>"><%= perm.name %></label><br> <% end %> </fieldset> <fieldset> -- GitLab