Merge branch 'master' into development

DMPRoadmap · May 12, 2022 · 5f6eaab · 5f6eaab
2 parents 577018a + 7cac435
commit 5f6eaab
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -105,7 +105,7 @@ def authenticate_admin!
  end
 
  def failure_message(obj, action = 'save')
- format(_('Unable to %{action} the %{object}. {errors}'),
+ format(_('Unable to %{action} the %{object}. %{errors}'),
  object: obj_name_for_display(obj),
  action: action || 'save', errors: errors_for_display(obj))
  end

diff --git a/app/controllers/orgs_controller.rb b/app/controllers/orgs_controller.rb
@@ -33,7 +33,11 @@ def admin_update
  @org = Org.find(params[:id])
  authorize @org
 
- @org.logo = attrs[:logo] if attrs[:logo]
+ # If a new logo was supplied then use it, otherwise retain the existing one
+ attrs[:logo] = attrs[:logo].present? ? attrs[:logo] : @org.logo
+ # Remove the logo if the user checked the box
+ attrs[:logo] = nil if attrs[:remove_logo] == '1'
+
  tab = (attrs[:feedback_enabled].present? ? 'feedback' : 'profile')
  @org.links = ActiveSupport::JSON.decode(params[:org_links]) if params[:org_links].present?
 

diff --git a/app/views/contact_us/contacts/_new_right.html.erb b/app/views/contact_us/contacts/_new_right.html.erb
@@ -7,7 +7,7 @@
  Rails.configuration.x.organisation.address.fetch(:line4, ""),
  Rails.configuration.x.organisation.address.fetch(:country, "")].compact.each do |addr_line| %>
 <% if addr_line.present? %>
-  <%= addr_line %><br>
+ <%= addr_line.is_a?(Array) ? addr_line.join(' ') : addr_line %><br>
 <% end %>
 <% end %>
 </address>