Add invite comments (#10465)

diff --git a/app/controllers/invites_controller.rb b/app/controllers/invites_controller.rb
index de5280305e90cd00877ea029b03a8047653cfe09..8d92147e276b7a5674949e895680952dbbfb739c 100644 (file)
--- a/app/controllers/invites_controller.rb
+++ b/app/controllers/invites_controller.rb
@@ -43,7 +43,7 @@ class InvitesController < ApplicationController
   end
 
   def resource_params
-    params.require(:invite).permit(:max_uses, :expires_in, :autofollow)
+    params.require(:invite).permit(:max_uses, :expires_in, :autofollow, :comment)
   end
 
   def set_body_classes

diff --git a/app/models/invite.rb b/app/models/invite.rb
index 02ab8e0b2170926fc0e1125163615643f8b5115f..29d25eae801c3ea576bf45cffbd05d92024424f5 100644 (file)
--- a/app/models/invite.rb
+++ b/app/models/invite.rb
@@ -12,6 +12,7 @@
 #  created_at :datetime         not null
 #  updated_at :datetime         not null
 #  autofollow :boolean          default(FALSE), not null
+#  comment    :text
 #
 
 class Invite < ApplicationRecord
@@ -22,6 +23,8 @@ class Invite < ApplicationRecord
 
   scope :available, -> { where(expires_at: nil).or(where('expires_at >= ?', Time.now.utc)) }
 
+  validates :comment, length: { maximum: 420 }
+
   before_validation :set_code
 
   def valid_for_use?

diff --git a/app/views/invites/_form.html.haml b/app/views/invites/_form.html.haml
index 3a2a5ef0e1c78d64a84d92fdb361ad43f0bcc105..b19f7053962506cfc0d46270ea57968b728861c8 100644 (file)
--- a/app/views/invites/_form.html.haml
+++ b/app/views/invites/_form.html.haml
@@ -10,5 +10,8 @@
   .fields-group
     = f.input :autofollow, wrapper: :with_label
 
+  .fields-group
+    = f.input :comment, wrapper: :with_label, input_html: { maxlength: 420 }
+
   .actions
     = f.button :button, t('invites.generate'), type: :submit

diff --git a/app/views/invites/_invite.html.haml b/app/views/invites/_invite.html.haml
index 62799ca5be20ef8e9f22986199a85c6ea9bd9333..03050c86839e7b3b63afe0b0d3983c7c448193a3 100644 (file)
--- a/app/views/invites/_invite.html.haml
+++ b/app/views/invites/_invite.html.haml
@@ -20,6 +20,9 @@
     %td{ colspan: 2 }
       = t('invites.expired')
 
+  %td
+    = invite.comment
+
   %td
     - if invite.valid_for_use? && policy(invite).destroy?
       = table_link_to 'times', t('invites.delete'), invite_path(invite), method: :delete

diff --git a/app/views/invites/index.html.haml b/app/views/invites/index.html.haml
index 61420ab1e407970e14345717a4184bd7c7e38cae..62065d6ae9fcc17b4ce9bf32471ef8a7fa886476 100644 (file)
--- a/app/views/invites/index.html.haml
+++ b/app/views/invites/index.html.haml
@@ -15,6 +15,7 @@
         %th
         %th= t('invites.table.uses')
         %th= t('invites.table.expires_at')
+        %th= t('invites.table.comment')
         %th
     %tbody
       = render @invites

diff --git a/db/migrate/20190403141604_add_comment_to_invites.rb b/db/migrate/20190403141604_add_comment_to_invites.rb
new file mode 100644 (file)
index 0000000..f0d7b1d
--- /dev/null
+++ b/db/migrate/20190403141604_add_comment_to_invites.rb
@@ -0,0 +1,5 @@
+class AddCommentToInvites < ActiveRecord::Migration[5.2]
+  def change
+    add_column :invites, :comment, :text
+  end
+end

diff --git a/db/schema.rb b/db/schema.rb
index 0da20d62f53cdefafc5808e6e0e048fc7f0a2874..18f615d6182faba86618fe26aff4e49fdd826d9e 100644 (file)
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -344,6 +344,7 @@ ActiveRecord::Schema.define(version: 2019_08_15_225426) do
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.boolean "autofollow", default: false, null: false
+    t.text "comment"
     t.index ["code"], name: "index_invites_on_code", unique: true
     t.index ["user_id"], name: "index_invites_on_user_id"
   end