error message when creating an ordergroup with members in another ord…

…ergroup
foodcoops · Apr 11, 2023 · 8337515 · 8337515
1 parent 591097f
commit 8337515
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 3 deletions.
diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb
@@ -112,7 +112,6 @@ def workgroup
     if @group.is_a? Ordergroup
       redirect_to tasks_url, :alert => I18n.t('tasks.error_not_found')
     end
-
   end
 
   private

diff --git a/app/models/ordergroup.rb b/app/models/ordergroup.rb
@@ -18,7 +18,6 @@ class Ordergroup < Group
   validates_numericality_of :account_balance, :message => I18n.t('ordergroups.model.invalid_balance')
   validate :uniqueness_of_name, :uniqueness_of_members
 
-
   after_create :update_stats!
 
   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)
   private
 
   # Make sure, that a user can only be in one ordergroup
-  #this does not work for adding a second order group 
   def uniqueness_of_members
     users.each do |user|
       errors.add :user_tokens, I18n.t('ordergroups.model.error_single_group', :user => user.display) if user.groups.where(:type => 'Ordergroup').size >= 1
-Original file line number
+Diff line change
@@ Expand Up / @@ -112,7 +112,6 @@ def workgroup @@
         if @group.is_a? Ordergroup
           redirect_to tasks_url, :alert => I18n.t('tasks.error_not_found')
         end
       end
       private
@@ Expand Down @@