Fixes after merge

slovensko-digital · Dec 4, 2023 · 2bb86d3 · 2bb86d3
1 parent edbc7e4
commit 2bb86d3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/components/admin/users/users_list_row_component.html.erb b/app/components/admin/users/users_list_row_component.html.erb
@@ -20,7 +20,7 @@
       <%= render Common::EditButtonComponent.new %>
     <% end %>
     <% if Pundit.policy(Current.user, [:admin, @user]).destroy? %>
-      <%= button_to admin_tenant_user_path(@user.tenant, [:admin, @user]), method: :delete do %>
+      <%= button_to admin_tenant_user_path(@user.tenant, @user), method: :delete do %>
         <%= render Common::DeleteButtonComponent.new %>
       <% end %>
     <% end %>

diff --git a/app/models/user.rb b/app/models/user.rb
@@ -16,7 +16,7 @@ class User < ApplicationRecord
 
   has_many :group_memberships, dependent: :destroy
   has_many :groups, through: :group_memberships
-  has_many :own_tags, class_name: 'Tag', inverse_of: :owner, dependent: :nullify
+  has_many :own_tags, class_name: 'Tag', inverse_of: :owner, foreign_key: :owner_id, dependent: :nullify
   has_many :message_drafts, foreign_key: :author_id
   has_many :automation_rules, class_name: 'Automation::Rule'
   has_many :filters, foreign_key: :author_id