diff --git a/app/controllers/workshop_logs_controller.rb b/app/controllers/workshop_logs_controller.rb index 49adc2a73..4577abc8a 100644 --- a/app/controllers/workshop_logs_controller.rb +++ b/app/controllers/workshop_logs_controller.rb @@ -72,7 +72,7 @@ def create def show @workshop_log = Report.find(params[:id]).decorate - @workshop = @workshop_log.workshop.decorate + @workshop = @workshop_log.workshop&.decorate @answers = @workshop_log.report_form_field_answers if @workshop_log diff --git a/app/frontend/stylesheets/application.tailwind.css b/app/frontend/stylesheets/application.tailwind.css index b26cbf066..f0ea48b67 100644 --- a/app/frontend/stylesheets/application.tailwind.css +++ b/app/frontend/stylesheets/application.tailwind.css @@ -73,3 +73,7 @@ .readonly textarea { @apply bg-gray-100 text-gray-500 cursor-not-allowed border-gray-300; } + +.rotate-180 { + transform: rotate(180deg); +} diff --git a/app/views/community_news/show.html.erb b/app/views/community_news/show.html.erb index df851d810..0eebc6a29 100644 --- a/app/views/community_news/show.html.erb +++ b/app/views/community_news/show.html.erb @@ -19,7 +19,7 @@ -
Attachment:
-Attachment:
+Story by: <%= @story.story_idea&.author_credit || @story.created_by.full_name %>
-Organization Name: <%= @story.organization_name %>
- <% if @story.decorate.workshop_title.present? %> -Workshop: <%= @story.decorate.workshop_title %>
- <% end %> -Story by: + <% author_credit = @story.story_idea&.author_credit || @story.created_by.full_name %> + <% if @story.created_by.facilitator&.profile_is_searchable %> + <%= link_to author_credit, facilitator_path(@story.created_by) %> + <% else %> + <%= author_credit %> <% end %> +
+Organization Name: + <%= link_to @story.decorate.organization_name, + organization_path(@story.project), + class: "hover:underline" %> +
+ <% if @story.decorate.workshop_title.present? %> +Workshop: + <%= link_to @story.decorate.workshop_title, workshop_path(@story.workshop), class: "hover:underline" %> +
+ <% end %> +Workshop: - <%= @story_idea.workshop.title %> + <%= @story_idea.workshop&.title || @story_idea.external_workshop_title %>