From 8c1a8b2ae699fb70e9fdf04ad3a948c13a8734d9 Mon Sep 17 00:00:00 2001 From: drusepth Date: Mon, 17 Jan 2022 12:24:55 -0800 Subject: [PATCH 1/4] skip a couple queries multiplicative on profile --- app/views/share_comments/_show.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/share_comments/_show.html.erb b/app/views/share_comments/_show.html.erb index 89e8a0a8..0616e275 100644 --- a/app/views/share_comments/_show.html.erb +++ b/app/views/share_comments/_show.html.erb @@ -24,7 +24,7 @@ <%= time_ago_in_words comment.created_at %> ago - <% if user_signed_in? && (share.user == current_user || comment.user == current_user) %> + <% if user_signed_in? && (share.user_id == current_user.id || comment.user_id == current_user.id) %> more_vert From ea47cf2acdd1fd879c8c59c607c5c03c35af43d1 Mon Sep 17 00:00:00 2001 From: drusepth Date: Tue, 25 Jan 2022 23:35:14 -0800 Subject: [PATCH 2/4] don't float %-complete sidelinks badges, so they block-wrap properly on low resolutions --- app/views/content/display/sidebar/_categories.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/content/display/sidebar/_categories.html.erb b/app/views/content/display/sidebar/_categories.html.erb index ed78552e..760328a4 100644 --- a/app/views/content/display/sidebar/_categories.html.erb +++ b/app/views/content/display/sidebar/_categories.html.erb @@ -45,11 +45,11 @@ <%= category[:label].capitalize.presence || '(blank)' %> <% if editing && category[:percent_complete].present? %> <% if category[:percent_complete] == 100 %> - + check <% else %> - + <%= category[:percent_complete] %>% <% end %> From c792fa15f641ecb91ac0e1bae8be9d802d6a3b34 Mon Sep 17 00:00:00 2001 From: drusepth Date: Tue, 25 Jan 2022 23:41:26 -0800 Subject: [PATCH 3/4] adjust sidelinks padding a bit more --- app/assets/stylesheets/content.css.scss | 3 ++- app/views/content/display/sidebar/_categories.html.erb | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/assets/stylesheets/content.css.scss b/app/assets/stylesheets/content.css.scss index 97363d86..c2b25ce3 100644 --- a/app/assets/stylesheets/content.css.scss +++ b/app/assets/stylesheets/content.css.scss @@ -34,7 +34,8 @@ p.long-form { a { display: block; - padding: 10px 20px; + padding: 10px; + padding-right: 0; } } diff --git a/app/views/content/display/sidebar/_categories.html.erb b/app/views/content/display/sidebar/_categories.html.erb index 760328a4..25e4c3a6 100644 --- a/app/views/content/display/sidebar/_categories.html.erb +++ b/app/views/content/display/sidebar/_categories.html.erb @@ -45,11 +45,11 @@ <%= category[:label].capitalize.presence || '(blank)' %> <% if editing && category[:percent_complete].present? %> <% if category[:percent_complete] == 100 %> - + check <% else %> - + <%= category[:percent_complete] %>% <% end %> From 3949da7a63a87748b3a4697f7b9a4e6da5b517d1 Mon Sep 17 00:00:00 2001 From: drusepth Date: Thu, 27 Jan 2022 13:27:51 -0800 Subject: [PATCH 4/4] require edit perms to view content changelogs --- app/controllers/content_controller.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/controllers/content_controller.rb b/app/controllers/content_controller.rb index ec99a8d9..8d115431 100644 --- a/app/controllers/content_controller.rb +++ b/app/controllers/content_controller.rb @@ -301,6 +301,7 @@ class ContentController < ApplicationController @content = content_type.find_by(id: params[:id]) return redirect_to(root_path, notice: "You don't have permission to view that content.") if @content.nil? @serialized_content = ContentSerializer.new(@content) + return redirect_to(root_path, notice: "You don't have permission to view that content.") unless @content.updatable_by?(current_user || User.new) if user_signed_in? @navbar_actions << {