refactor user views

Author: squidgetx

app/views/terms_of_service/_user_accepted.html.erb

@@ -1,24 +1,10 @@
-<% accepted = (@user.terms_of_service_accepted == true) %>
-<% new_user_by_self = !current_user %>
-<% new_user_by_admin = ((params[:action] == 'new') && (can? :manage, Reservation)) %>
-<% edit_user_by_self = (current_user == @user) %>
-<% edit_user_by_admin = (can? :manage, Reservation) %>
+<% accepted = @user.terms_of_service_accepted == true %>
 
-<% if new_user_by_self %>
-    <%= f.input :terms_of_service_accepted,
-                  input_html: {type: "checkbox", value: accepted },
-                  label: "I accept the #{link_to("Terms of Service", tos_path, target: '_blank')}" %>
-<% elsif new_user_by_admin %>
-	<%= f.input :created_by_admin, as: :hidden, value: true %>
-	<%= f.input :terms_of_service_accepted,
-                  input_html: {value: accepted, disabled: true },
-                  label: "User must accept the #{link_to("Terms of Service", tos_path, target: '_blank')} during first checkout." %>
-<% elsif edit_user_by_self %>
-	<%= f.input :terms_of_service_accepted,
-              input_html: {type: "checkbox", value: accepted },
-              label: "I accept the #{link_to("Terms of Service", tos_path, target: '_blank')}" %>
-<% elsif edit_user_by_admin %>
-	<%= f.input :terms_of_service_accepted,
-                  input_html: {type: "checkbox", value: accepted, disabled: true },
-                  label: "Has user accepted the #{link_to("Terms of Service", tos_path, target: '_blank')}?" %>
-<% end %>
+<%= f.input :terms_of_service_accepted,
+          input_html: {value: accepted, disabled: (cannot? :manage, Reservation)},
+          label: "#{ (current_user == @user) ? 'I accept' : 'User accepts'} the #{
+                    link_to('Terms of Service', tos_path, target: '_blank')}".html_safe %>
+
+<% if can? :manage, Reservation %>
+  <%= f.input :created_by_admin, as: :hidden, value: true %>
+<% end%>

app/views/users/_form.html.erb

@@ -26,7 +26,6 @@
       <%# TODO: Make this a fancy box %>
       <%= f.association :requirements, :collection => Requirement.all.map{|req| [req.description,req.id]}, :label => "Requirements user has satisfied"%>
       <%= f.input :role, :collection => (can? :appoint, :superuser) ? ['normal', 'checkout', 'admin', 'superuser', 'banned'] : ['normal', 'checkout', 'admin', 'banned'], placeholder: 'normal' %>
-      <%= f.input :deleted_at, label: "Disabled", :as => :deleted %>
   <% end %>
 
   <% if @user %>