From a242e657336dffa692a5c96fb5df1428d372feaf Mon Sep 17 00:00:00 2001 From: Barry Hoggard Date: Mon, 23 Dec 2024 20:24:43 -0500 Subject: [PATCH 1/4] allow profile edit for admins too --- app/models/user.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/models/user.rb b/app/models/user.rb index fff3c20..da8ea5b 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -34,7 +34,9 @@ def show_users? end def has_profile? - artist? + return false unless profile + + artist? || admin? end def active_for_authentication? From 36eb8a03993658f4b1083f700a97c7d2cccb9da1 Mon Sep 17 00:00:00 2001 From: sepans Date: Wed, 25 Dec 2024 09:48:04 -0500 Subject: [PATCH 2/4] Add price comma, remove price from main page --- app/views/artworks/_info.html.erb | 2 +- app/views/main/_artwork.html.erb | 1 - app/views/main/_info.html.erb | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/views/artworks/_info.html.erb b/app/views/artworks/_info.html.erb index 855587b..8a0d814 100644 --- a/app/views/artworks/_info.html.erb +++ b/app/views/artworks/_info.html.erb @@ -19,7 +19,7 @@ <% if @artwork.price.present? %>
- Price: <%= @artwork.price %> + Price: <%= number_with_delimiter(@artwork.price) %>
<% end %> <% if @artwork.description.present? %> diff --git a/app/views/main/_artwork.html.erb b/app/views/main/_artwork.html.erb index 99ee704..b5c32bc 100644 --- a/app/views/main/_artwork.html.erb +++ b/app/views/main/_artwork.html.erb @@ -6,7 +6,6 @@
<%= artwork.artist_name %>
<%= artwork.title %>
-
Price: <%= artwork.price.present? ? artwork.price : "N/A" %>
<%= simple_format artwork.description %>
diff --git a/app/views/main/_info.html.erb b/app/views/main/_info.html.erb index 6615853..d2c430f 100644 --- a/app/views/main/_info.html.erb +++ b/app/views/main/_info.html.erb @@ -18,7 +18,7 @@ Location: <%= @artwork.location %>
- Price: <%= @artwork.price.present? ? @artwork.price : "N/A" %> + Price: <%= @artwork.price.present? ? number_with_delimiter(@artwork.price) : "N/A" %>
<% if @artwork.description.present? %>
From e16c7132318620ba24aa80abfe367d2c4199b900 Mon Sep 17 00:00:00 2001 From: sepans Date: Wed, 25 Dec 2024 10:02:35 -0500 Subject: [PATCH 3/4] just break lines --- app/views/main/show.html.erb | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/app/views/main/show.html.erb b/app/views/main/show.html.erb index c346d17..0f211f3 100644 --- a/app/views/main/show.html.erb +++ b/app/views/main/show.html.erb @@ -45,7 +45,11 @@ <% end %> @@ -105,15 +106,17 @@
-
+
1 %>"> <%= render "info" %>
-
-
- About artist: -
- <%= simple_format(@artwork.user.profile&.bio) %> -
+ <% if @artwork.user.profile&.bio&.present? %> +
+
+ About artist: +
+ <%= simple_format(@artwork.user.profile&.bio) %> +
+ <% end %>
<%= javascript_include_tag "lightbox-refresh" %>