Merge branch 'zj-fix-admin-templates' into 'master'

Fix Slash command templates

Closes #26042

See merge request !8320

app/views/projects/services/mattermost_slash_commands/_help.html.haml

@@ -8,8 +8,8 @@
   by entering
   %code /<command_trigger_word> help
 
-  - unless enabled
+  - unless enabled || @service.template?
     = render 'projects/services/mattermost_slash_commands/detailed_help', subject: @service
 
-- if enabled
+- if enabled && !@service.template?
   = render 'projects/services/mattermost_slash_commands/installation_info', subject: @service

app/views/projects/services/slack_slash_commands/_help.html.haml

-- run_actions_text = "Perform common operations on this project: #{@project.name_with_namespace}"
+- pretty_name = defined?(@project) ? @project.name_with_namespace : "namespace / path"
+- run_actions_text = "Perform common operations on this project: #{pretty_name}"
 
 .well
   This service allows GitLab users to perform common operations on this
@@ -9,6 +10,7 @@
   %code /<command> help
   %br
   %br
+  - unless @service.template?
     To setup this service:
     %ul.list-unstyled
       %li

spec/controllers/admin/services_controller_spec.rb

+require 'spec_helper'
+
+describe Admin::ServicesController do
+  let(:admin) { create(:admin) }
+
+  before { sign_in(admin) }
+
+  describe 'GET #edit' do
+    let!(:project) { create(:empty_project) }
+
+    Service.available_services_names.each do |service_name|
+      context "#{service_name}" do
+        let!(:service) do
+          service_template = service_name.concat("_service").camelize.constantize
+          service_template.where(template: true).first_or_create
+        end
+
+        it 'successfully displays the template' do
+          get :edit, id: service.id
+
+          expect(response).to have_http_status(200)
+        end
+      end
+    end
+  end
+end