---
src/app/controllers/users_controller.rb | 1 -
src/app/services/registration_service.rb | 15 +++++++--------
src/app/views/users/_form.haml | 1 -
3 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/src/app/controllers/users_controller.rb
b/src/app/controllers/users_controller.rb
index 86adb50..bdc24d0 100644
--- a/src/app/controllers/users_controller.rb
+++ b/src/app/controllers/users_controller.rb
@@ -32,7 +32,6 @@ class UsersController < ApplicationController
@registration = RegistrationService.new(@user)
unless @registration.save
- flash.now[:warning] = "User registration failed: #{(a)registration.error}"
render :action => 'new' and return
end
diff --git a/src/app/services/registration_service.rb
b/src/app/services/registration_service.rb
index cf9ca4e..e34800b 100644
--- a/src/app/services/registration_service.rb
+++ b/src/app/services/registration_service.rb
@@ -8,7 +8,7 @@ class RegistrationService
def save
User.transaction do
begin
- if @user.quota.nil? || @user.quota.invalid?
+ if @user.quota.nil?
self_service_default_quota =
MetadataObject.lookup("self_service_default_quota")
@user.quota = Quota.new(
:maximum_running_instances =>
self_service_default_quota.maximum_running_instances,
@@ -19,13 +19,12 @@ class RegistrationService
# perm list in the format:
# "[resource1_key, resource1_role], [resource2_key, resource2_role],
..."
MetadataObject.lookup("self_service_perms_list").split(/[\]],?
?|[\[]/).
- select {|x| !x.empty? }.each do |x|
- obj_key, role_key = x.split(/, ?/)
- default_obj = MetadataObject.lookup(obj_key)
- default_role = MetadataObject.lookup(role_key)
- Permission.create!(:user => @user, :role => default_role,
- :permission_object => default_obj)
- end
+ select {|x| !x.empty? }.each do |x|
+ obj_key, role_key = x.split(/, ?/)
+ default_obj = MetadataObject.lookup(obj_key)
+ default_role = MetadataObject.lookup(role_key)
+ Permission.create!(:user => @user, :role => default_role,
:permission_object => default_obj)
+ end
return true
rescue ActiveRecord::RecordInvalid => e
Rails.logger.error e.message
diff --git a/src/app/views/users/_form.haml b/src/app/views/users/_form.haml
index 4e4e03d..5e56d73 100644
--- a/src/app/views/users/_form.haml
+++ b/src/app/views/users/_form.haml
@@ -40,7 +40,6 @@
= quota_form.label :maximum_running_instances, t(:maximum_running_instances)
= quota_form.text_field :maximum_running_instances
(instances)
- = error_messages_for @user.quota if @user and @user.quota
-if check_privilege(Privilege::MODIFY, User)
%fieldset
--
1.7.6