Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

相談部屋のタイトルの問題修正のhotfix #7710

Merged
merged 2 commits into from
Apr 18, 2024
Merged

相談部屋のタイトルの問題修正のhotfix #7710

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
096db76
相談部屋のタイトルとリンク先を変更したが、ユーザー画面のタイトルとリンク先も変更してしまったので修正した
nakamu-kazu222 Apr 18, 2024
7441259
Merge pull request #7708 from fjordllc/bug/talk_page_title
komagata Apr 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions app/views/talks/_page_title.html.slim
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
header.page-header
.container
.page-header__inner
.page-header__start
h2.page-header__title
- if current_user.admin?
= user.login_name
- else
| 相談部屋
.page-header__end
.page-header-actions
ul.page-header-actions__items
li.page-header-actions__item
- if current_user != user
- if current_user.adviser? && current_user.company_id == user.company_id && user.trainee
li.page-main-header-actions__item
.a-button.is-disabled.is-sm.is-block
i.fa-solid.fa-check
span
| 自社研修生
- else
li.page-main-header-actions__item
= render 'users/following', user:
li.page-header-actions__item
- if current_user.admin?
= link_to users_path, class: 'a-button is-md is-secondary is-block is-back' do
| ユーザー一覧
- else
= link_to root_path, class: 'a-button is-md is-secondary is-block is-back' do
| ダッシュボード
2 changes: 1 addition & 1 deletion app/views/talks/show.html.slim
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- title "#{@user.login_name}さんの相談部屋"
- set_meta_tags description: "#{@user.login_name}さんの相談部屋ページです。"

= render 'users/page_title', user: @user
= render 'talks/page_title', user: @user

- if admin_login?
= render 'users/page_tabs', user: @user
Expand Down
13 changes: 3 additions & 10 deletions app/views/users/_page_title.html.slim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,7 @@ header.page-header
.page-header__inner
.page-header__start
h2.page-header__title
- if current_user.admin?
= user.login_name
- else
| 相談部屋
= user.login_name
.page-header__end
.page-header-actions
ul.page-header-actions__items
Expand All @@ -22,9 +19,5 @@ header.page-header
li.page-main-header-actions__item
= render 'users/following', user:
li.page-header-actions__item
- if current_user.admin?
= link_to users_path, class: 'a-button is-md is-secondary is-block is-back' do
| ユーザー一覧
- else
= link_to root_path, class: 'a-button is-md is-secondary is-block is-back' do
| ダッシュボード
= link_to users_path, class: 'a-button is-md is-secondary is-block is-back' do
| ユーザー一覧
Loading