Skip to content
Snippets Groups Projects
Commit 0b309a01 authored by Dan Jensen's avatar Dan Jensen
Browse files

Remove optional languge from Compliance framework label

This removes the word "optional" from the input label for compliance
frameworks. This guidance was causing confusion for users, so it
seems the simplest solution is to remove it.

Changelog: changed
parent b5758f26
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -12,20 +12,17 @@
- frameworks = @project.namespace.root_ancestor.compliance_management_frameworks
 
.form-group
- if user_has_edit_permissions
= f.fields_for :compliance_framework_setting, ComplianceManagement::ComplianceFramework::ProjectSettings.new do |cf|
= cf.label :framework, class: 'gl-font-weight-bold' do
= _('Compliance framework (optional)')
= f.fields_for :compliance_framework_setting, ComplianceManagement::ComplianceFramework::ProjectSettings.new do |cf|
= cf.label :framework, class: 'gl-font-weight-bold' do
= _('Compliance framework')
- if user_has_edit_permissions
- if frameworks.any?
- selected_default_framework = @project.compliance_framework_setting&.compliance_management_framework&.id
= cf.select :framework, options_for_select(frameworks.map { |fw| [fw.name.truncate(88), fw.id] }, selected_default_framework), { selected: '', prompt: _('Choose your framework'), include_blank: _('None') }, { class: 'form-control', disabled: false }
- else
%p.form-text.text-muted
= _("No compliance frameworks are in use. Create one from the %{link} section in Group Settings.").html_safe % { link: link_to('Compliance frameworks', edit_group_path(@project.namespace.root_ancestor)).html_safe }
- else
= f.fields_for :compliance_framework_setting, ComplianceManagement::ComplianceFramework::ProjectSettings.new do |cf|
= cf.label :framework, class: 'gl-font-weight-bold' do
= _('Compliance framework')
- else
- if frameworks.any?
- selected_framework = @project.compliance_framework_setting&.compliance_management_framework&.name&.truncate(88) || _('None')
= cf.text_field :framework, value: selected_framework, class: 'form-control read-only', disabled: true
Loading
Loading
Loading
Loading
@@ -8362,9 +8362,6 @@ msgstr ""
msgid "Compliance framework"
msgstr ""
 
msgid "Compliance framework (optional)"
msgstr ""
msgid "ComplianceDashboard|created by:"
msgstr ""
 
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment