From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Fri, 1 Dec 2017 11:26:57 +0000 (+0900)
Subject: Fix invites form path (#5861)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=eee3b32b7714a302ae384c92ef13601167ec892a;p=mastodon.git

Fix invites form path (#5861)
---

diff --git a/app/controllers/admin/invites_controller.rb b/app/controllers/admin/invites_controller.rb
index f4207e3e2..607588d90 100644
--- a/app/controllers/admin/invites_controller.rb
+++ b/app/controllers/admin/invites_controller.rb
@@ -29,5 +29,11 @@ module Admin
       @invite.expire!
       redirect_to admin_invites_path
     end
+
+    private
+
+    def resource_params
+      params.require(:invite).permit(:max_uses, :expires_in)
+    end
   end
 end
diff --git a/app/views/invites/_form.html.haml b/app/views/invites/_form.html.haml
index 99647f597..a01cf5946 100644
--- a/app/views/invites/_form.html.haml
+++ b/app/views/invites/_form.html.haml
@@ -1,4 +1,4 @@
-= simple_form_for(@invite) do |f|
+= simple_form_for(@invite, url: controller.is_a?(Admin::InvitesController) ? admin_invites_path : invites_path) do |f|
   = render 'shared/error_messages', object: @invite
 
   .fields-group