diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-18 12:45:46 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-18 12:45:46 +0300 |
| commit | a7b3560714b4d9cc4ab32dffcd1f74a284b93580 (patch) | |
| tree | 7452bd5c3545c2fa67a28aa013835fb4fa071baf /app/helpers/issuables_description_templates_helper.rb | |
| parent | ee9173579ae56a3dbfe5afe9f9410c65bb327ca7 (diff) | |
Add latest changes from gitlab-org/gitlab@14-8-stable-eev14.8.0-rc42
Diffstat (limited to 'app/helpers/issuables_description_templates_helper.rb')
| -rw-r--r-- | app/helpers/issuables_description_templates_helper.rb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/app/helpers/issuables_description_templates_helper.rb b/app/helpers/issuables_description_templates_helper.rb index 6c23f888823..a82a5ac0fb0 100644 --- a/app/helpers/issuables_description_templates_helper.rb +++ b/app/helpers/issuables_description_templates_helper.rb @@ -38,7 +38,13 @@ module IssuablesDescriptionTemplatesHelper # Only local templates will be listed if licenses for inherited templates are not present all_templates = all_templates.values.flatten.map { |tpl| tpl[:name] }.compact.uniq - all_templates.find { |tmpl_name| tmpl_name == params[:issuable_template] } + template = all_templates.find { |tmpl_name| tmpl_name == params[:issuable_template] } + + unless issuable.description.present? + template ||= all_templates.find { |tmpl_name| tmpl_name.casecmp?('default') } + end + + template end def available_service_desk_templates_for(project) |