Merge branch 'master' of https://github.com/ari/jobsworth

ari · Jun 2, 2016 · f82229d · f82229d
2 parents f9cb624 + 0c2c5dc
commit f82229d
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/app/controllers/resources_controller.rb b/app/controllers/resources_controller.rb
@@ -3,6 +3,7 @@ class ResourcesController < ApplicationController
   before_filter :check_permission
 
   def new
+
     @resource = Resource.new
     @resource.customer_id = params[:customer_id]
 
@@ -138,6 +139,6 @@ def log_resource_changes(resource)
 
     def resource_attributes
       params.require(:resource).permit :name, :customer_id, :parent_id, :resource_type_id, :notes, :active,
-        :attribute_values => [:id, :resource_type_attribute_id, :value]
+        :attribute_values => [:id, :resource_type_attribute_id, :value, :password]
     end
 end