Skip to content

Commit 8337515

Browse files
committed
error message when creating an ordergroup with members in another ordergroup
1 parent 591097f commit 8337515

File tree

2 files changed

+0
-3
lines changed

2 files changed

+0
-3
lines changed

app/controllers/tasks_controller.rb

-1
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,6 @@ def workgroup
112112
if @group.is_a? Ordergroup
113113
redirect_to tasks_url, :alert => I18n.t('tasks.error_not_found')
114114
end
115-
116115
end
117116

118117
private

app/models/ordergroup.rb

-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ class Ordergroup < Group
1818
validates_numericality_of :account_balance, :message => I18n.t('ordergroups.model.invalid_balance')
1919
validate :uniqueness_of_name, :uniqueness_of_members
2020

21-
2221
after_create :update_stats!
2322

2423
scope :active, -> { joins(:orders).where(orders: { starts: (Time.now.months_ago(3)..Time.now) }).group(:id) }
@@ -175,7 +174,6 @@ def self.sort_by_param(param)
175174
private
176175

177176
# Make sure, that a user can only be in one ordergroup
178-
#this does not work for adding a second order group
179177
def uniqueness_of_members
180178
users.each do |user|
181179
errors.add :user_tokens, I18n.t('ordergroups.model.error_single_group', :user => user.display) if user.groups.where(:type => 'Ordergroup').size >= 1

0 commit comments

Comments
 (0)