From 5f5762000814274d3fd7b242ee0adc60faec54d2 Mon Sep 17 00:00:00 2001
From: Victor Ghita <tomi.gvf@gmail.com>
Date: Sat, 25 Nov 2023 13:46:05 +0100
Subject: [PATCH] Fixed requested changes
---
app/controllers/badges_controller.rb | 2 +-
app/views/badges/award.html.erb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/controllers/badges_controller.rb b/app/controllers/badges_controller.rb
index 6f93964c9..07148f0b6 100644
--- a/app/controllers/badges_controller.rb
+++ b/app/controllers/badges_controller.rb
@@ -85,7 +85,7 @@ class BadgesController < ApplicationController
end
if @user_badge.save
- content = "You have been awarded a new custom badge '#{@user_badge.badge.title}'!"
+ content = "You have been awarded a new badge: '#{@user_badge.badge.title}'!"
link = Rails.application.routes.path_for(controller: 'users', action: 'awarded_badges',
id: @user.id)
@user.create_notification(content, link)
diff --git a/app/views/badges/award.html.erb b/app/views/badges/award.html.erb
index b3e2c2e61..da5396794 100644
--- a/app/views/badges/award.html.erb
+++ b/app/views/badges/award.html.erb
@@ -13,7 +13,7 @@
<%= f.label :badge, 'Select Badge', class: 'form-element' %>
<span class="form-caption">
Select which badge should be awarded. In case you want to create a new badge, you can do so
- <%= link_to "here", new_badge_path, class: 'link is-underlined', 'aria-label': 'Add new badge' %>
+ <%= link_to "here", new_badge_path, class: 'link is-underlined', target: "_blank", 'aria-label': 'Add new badge' %>
</span>
<%= f.select :badge, options_for_select(Badge.where(:manually_awardable => true).mapping.to_a, selected: []),
{ include_blank: false }, multiple: false, class: 'form-element' %>
--
GitLab