From a8458b624a82ace9bd5ed9de3ddea1174e91654d Mon Sep 17 00:00:00 2001 From: motohiro-mm Date: Thu, 24 Oct 2024 14:55:52 +0900 Subject: [PATCH 1/2] =?UTF-8?q?remark=E3=81=AEuser=E3=82=92nil=E3=81=A7?= =?UTF-8?q?=E3=82=82=E8=A8=B1=E5=8F=AF=E3=81=99=E3=82=8B=E3=82=88=E3=81=86?= =?UTF-8?q?migration=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB=E3=82=92=E4=BD=9C?= =?UTF-8?q?=E6=88=90=E3=81=97migrate=E5=AE=9F=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/migrate/20241024054119_change_column_to_null.rb | 11 +++++++++++ db/schema.rb | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 db/migrate/20241024054119_change_column_to_null.rb diff --git a/db/migrate/20241024054119_change_column_to_null.rb b/db/migrate/20241024054119_change_column_to_null.rb new file mode 100644 index 0000000..846f4d1 --- /dev/null +++ b/db/migrate/20241024054119_change_column_to_null.rb @@ -0,0 +1,11 @@ +# frozen_string_literal: true + +class ChangeColumnToNull < ActiveRecord::Migration[7.2] + def up + change_column_null :remarks, :user_id, true + end + + def down + change_column_null :remarks, :user_id, false + end +end diff --git a/db/schema.rb b/db/schema.rb index 3b79aae..c1a1a31 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema[7.2].define(version: 2024_09_20_054406) do +ActiveRecord::Schema[7.2].define(version: 2024_10_24_054119) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -52,7 +52,7 @@ end create_table "remarks", force: :cascade do |t| - t.bigint "user_id", null: false + t.bigint "user_id" t.bigint "meeting_room_id", null: false t.integer "remark_type", null: false t.string "content", null: false From 6995f97f1475972c6c6e9155e4ba9b7063082a5c Mon Sep 17 00:00:00 2001 From: motohiro-mm Date: Thu, 24 Oct 2024 14:57:01 +0900 Subject: [PATCH 2/2] =?UTF-8?q?remark=E3=81=AEuser=E3=81=8Cnil=E3=81=AB?= =?UTF-8?q?=E3=81=AA=E3=81=A3=E3=81=9F=E3=81=A8=E3=81=8D=E3=81=AE=E3=82=A2?= =?UTF-8?q?=E3=82=A4=E3=82=B3=E3=83=B3=E7=94=BB=E5=83=8F=E3=82=92=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0=E3=81=97=E8=A8=AD=E5=AE=9A=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/assets/images/user_icons/user_nil.svg | 1 + app/views/remarks/_comment.html.erb | 2 +- app/views/remarks/_proposal.html.erb | 2 +- app/views/remarks/_user_icon.html.erb | 5 +++++ 4 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 app/assets/images/user_icons/user_nil.svg create mode 100644 app/views/remarks/_user_icon.html.erb diff --git a/app/assets/images/user_icons/user_nil.svg b/app/assets/images/user_icons/user_nil.svg new file mode 100644 index 0000000..3def777 --- /dev/null +++ b/app/assets/images/user_icons/user_nil.svg @@ -0,0 +1 @@ +user_24 \ No newline at end of file diff --git a/app/views/remarks/_comment.html.erb b/app/views/remarks/_comment.html.erb index faee24a..2827eed 100644 --- a/app/views/remarks/_comment.html.erb +++ b/app/views/remarks/_comment.html.erb @@ -3,7 +3,7 @@
- <%= image_tag "user_icons/#{remark.user.icon}", class: 'icon mr-2' %> + <%= render 'remarks/user_icon', remark: %> <%= l remark.created_at, format: :long %> diff --git a/app/views/remarks/_proposal.html.erb b/app/views/remarks/_proposal.html.erb index 54ddd3b..4c3973f 100644 --- a/app/views/remarks/_proposal.html.erb +++ b/app/views/remarks/_proposal.html.erb @@ -2,7 +2,7 @@
<%= link_to edit_meeting_room_remark_path(remark.meeting_room, remark), class: 'w-5/6 z-0' do %>
- <%= image_tag "user_icons/#{remark.user.icon}", class: 'icon mr-2' %> + <%= render 'remarks/user_icon', remark: %> <%= remark.content %>
diff --git a/app/views/remarks/_user_icon.html.erb b/app/views/remarks/_user_icon.html.erb new file mode 100644 index 0000000..d10db68 --- /dev/null +++ b/app/views/remarks/_user_icon.html.erb @@ -0,0 +1,5 @@ +<% if remark.user.nil? %> + <%= image_tag 'user_icons/user_nil.svg', class: 'icon mr-2' %> +<% else %> + <%= image_tag "user_icons/#{remark.user.icon}", class: 'icon mr-2' %> +<% end %>