Saving a default permission whever a new user is created, although th…

…e details will likely change

src/app/controllers/users_controller.rb

@@ -63,15 +63,27 @@ def new
   end
 
   def create
-    @user = User.new(params[:user])
-    @user.save!
-    notice @user.username + _(" created successfully.")
-
-    if User.where(:id => @user.id).search_for(params[:search]).include?(@user) 
-      render :partial=>"common/list_item", :locals=>{:item=>@user, :accessor=>"id", :columns=>["username"], :name=>controller_display_name}
-    else
-      notice _("'#{@user["name"]}' did not meet the current search criteria and is not being shown."), { :level => 'message', :synchronous_request => false }
-      render :json => { :no_match => true }
+    begin
+      @user = User.new(params[:user])
+      @organization = Organization.find(params[:user]['org_id'])
+      @user.save!
+      Permission.create! :role => @user.own_role,
+                         :resource_type=> ResourceType.find_or_create_by_name("organizations"),
+                         :verbs=>[Verb.find_or_create_by_verb("register_systems")],
+                         :name=>"default systems reg permission",
+                         :organization=> @organization
+
+      notice @user.username + _(" created successfully.")
+      if User.where(:id => @user.id).search_for(params[:search]).include?(@user)
+        render :partial=>"common/list_item", :locals=>{:item=>@user, :accessor=>"id", :columns=>["username"], :name=>controller_display_name}
+      else
+        notice _("'#{@user["name"]}' did not meet the current search criteria and is not being shown."), { :level => 'message', :synchronous_request => false }
+        render :json => { :no_match => true }
+    rescue Exception => error
+      errors error
+      #transaction, if something goes wrong with the creation of the permission, we will need to delete the user
+      @user.destroy if @user.id
+      render :json=>@user.errors, :status=>:bad_request
     end
   rescue Exception => error
     errors error

src/app/helpers/users_helper.rb

@@ -11,10 +11,17 @@
 # http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
 
 module UsersHelper
-	
+
   def mask_password user
-   return "" if user.password.nil?
-	 user.password.gsub(/./, "●")
+    return "" if user.password.nil?
+    user.password.gsub(/./, "●")
+  end
+
+  def organization_select
+    select(:org_id, "org_id",
+           Organization.all.map {|a| [a.name, a.id]},
+           {:prompt => _('Select Organization'), :id=>"org_field",
+           :selected => current_organization.id})
   end
-	
+
 end

src/app/views/users/_new.html.haml

@@ -29,6 +29,11 @@
         .grid_2.ra
         .grid_5.la
           #password_conflict
+      %fieldset.fl.clear
+        .grid_2.ra
+          = label :user, :org, _("Default Organization:")
+        .grid_5.la
+          = organization_select
 
     .grid_5.la.prefix_2
       #save_user.verify_password.button{'data-url' => users_path, :tabindex => auto_tab_index}

src/public/javascripts/user_methods.js

@@ -88,10 +88,11 @@ KT.user_page = function() {
             button.addClass('disabled');
             var username = $('#username_field').val();
             var password = $('#password_field').val();
+            var org_id = $('#org_id_org_idorg_id').val();
             $.ajax({
                 type: "POST",
                 url: button.attr('data-url'),
-                data: { "user":{"username":username, "password":password}},
+                data: { "user":{"username":username, "password":password, "org_id":org_id }},
                 cache: false,
                 success: function(data) {
                     button.removeClass('disabled');