Fix Slash command templates
These templates were broken, as the same views didn't have a @project defined. Now I've added checks on the service being a template or not. Fixes #26042
This commit is contained in:
parent
365612ce36
commit
b46ad4c90b
2 changed files with 75 additions and 73 deletions
|
@ -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
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
- run_actions_text = "Perform common operations on this project: #{@project.name_with_namespace}"
|
||||
- pretty_name = defined?(@project) ? @project.path_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,85 +10,86 @@
|
|||
%code /<command> help
|
||||
%br
|
||||
%br
|
||||
To setup this service:
|
||||
%ul.list-unstyled
|
||||
%li
|
||||
1.
|
||||
= link_to 'Add a slash command', 'https://my.slack.com/services/new/slash-commands'
|
||||
in your Slack team with these options:
|
||||
- unless @service.template?
|
||||
To setup this service:
|
||||
%ul.list-unstyled
|
||||
%li
|
||||
1.
|
||||
= link_to 'Add a slash command', 'https://my.slack.com/services/new/slash-commands'
|
||||
in your Slack team with these options:
|
||||
|
||||
%hr
|
||||
%hr
|
||||
|
||||
.help-form
|
||||
.form-group
|
||||
= label_tag nil, 'Command', class: 'col-sm-2 col-xs-12 control-label'
|
||||
.col-sm-10.col-xs-12.text-block
|
||||
%p Fill in the word that works best for your team.
|
||||
%p
|
||||
Suggestions:
|
||||
%code= 'gitlab'
|
||||
%code= @project.path # Path contains no spaces, but dashes
|
||||
%code= @project.path_with_namespace
|
||||
.help-form
|
||||
.form-group
|
||||
= label_tag nil, 'Command', class: 'col-sm-2 col-xs-12 control-label'
|
||||
.col-sm-10.col-xs-12.text-block
|
||||
%p Fill in the word that works best for your team.
|
||||
%p
|
||||
Suggestions:
|
||||
%code= 'gitlab'
|
||||
%code= @project.path # Path contains no spaces, but dashes
|
||||
%code= @project.path_with_namespace
|
||||
|
||||
.form-group
|
||||
= label_tag :url, 'URL', class: 'col-sm-2 col-xs-12 control-label'
|
||||
.col-sm-10.col-xs-12.input-group
|
||||
= text_field_tag :url, service_trigger_url(subject), class: 'form-control input-sm', readonly: 'readonly'
|
||||
.input-group-btn
|
||||
= clipboard_button(clipboard_target: '#url')
|
||||
.form-group
|
||||
= label_tag :url, 'URL', class: 'col-sm-2 col-xs-12 control-label'
|
||||
.col-sm-10.col-xs-12.input-group
|
||||
= text_field_tag :url, service_trigger_url(subject), class: 'form-control input-sm', readonly: 'readonly'
|
||||
.input-group-btn
|
||||
= clipboard_button(clipboard_target: '#url')
|
||||
|
||||
.form-group
|
||||
= label_tag nil, 'Method', class: 'col-sm-2 col-xs-12 control-label'
|
||||
.col-sm-10.col-xs-12.text-block POST
|
||||
.form-group
|
||||
= label_tag nil, 'Method', class: 'col-sm-2 col-xs-12 control-label'
|
||||
.col-sm-10.col-xs-12.text-block POST
|
||||
|
||||
.form-group
|
||||
= label_tag :customize_name, 'Customize name', class: 'col-sm-2 col-xs-12 control-label'
|
||||
.col-sm-10.col-xs-12.input-group
|
||||
= text_field_tag :customize_name, 'GitLab', class: 'form-control input-sm', readonly: 'readonly'
|
||||
.input-group-btn
|
||||
= clipboard_button(clipboard_target: '#customize_name')
|
||||
.form-group
|
||||
= label_tag :customize_name, 'Customize name', class: 'col-sm-2 col-xs-12 control-label'
|
||||
.col-sm-10.col-xs-12.input-group
|
||||
= text_field_tag :customize_name, 'GitLab', class: 'form-control input-sm', readonly: 'readonly'
|
||||
.input-group-btn
|
||||
= clipboard_button(clipboard_target: '#customize_name')
|
||||
|
||||
.form-group
|
||||
= label_tag nil, 'Customize icon', class: 'col-sm-2 col-xs-12 control-label'
|
||||
.col-sm-10.col-xs-12.text-block
|
||||
= image_tag(asset_url('slash-command-logo.png'), width: 36, height: 36)
|
||||
= link_to('Download image', asset_url('gitlab_logo.png'), class: 'btn btn-sm', target: '_blank')
|
||||
.form-group
|
||||
= label_tag nil, 'Customize icon', class: 'col-sm-2 col-xs-12 control-label'
|
||||
.col-sm-10.col-xs-12.text-block
|
||||
= image_tag(asset_url('slash-command-logo.png'), width: 36, height: 36)
|
||||
= link_to('Download image', asset_url('gitlab_logo.png'), class: 'btn btn-sm', target: '_blank')
|
||||
|
||||
.form-group
|
||||
= label_tag nil, 'Autocomplete', class: 'col-sm-2 col-xs-12 control-label'
|
||||
.col-sm-10.col-xs-12.text-block Show this command in the autocomplete list
|
||||
.form-group
|
||||
= label_tag nil, 'Autocomplete', class: 'col-sm-2 col-xs-12 control-label'
|
||||
.col-sm-10.col-xs-12.text-block Show this command in the autocomplete list
|
||||
|
||||
.form-group
|
||||
= label_tag :autocomplete_description, 'Autocomplete description', class: 'col-sm-2 col-xs-12 control-label'
|
||||
.col-sm-10.col-xs-12.input-group
|
||||
= text_field_tag :autocomplete_description, run_actions_text, class: 'form-control input-sm', readonly: 'readonly'
|
||||
.input-group-btn
|
||||
= clipboard_button(clipboard_target: '#autocomplete_description')
|
||||
.form-group
|
||||
= label_tag :autocomplete_description, 'Autocomplete description', class: 'col-sm-2 col-xs-12 control-label'
|
||||
.col-sm-10.col-xs-12.input-group
|
||||
= text_field_tag :autocomplete_description, run_actions_text, class: 'form-control input-sm', readonly: 'readonly'
|
||||
.input-group-btn
|
||||
= clipboard_button(clipboard_target: '#autocomplete_description')
|
||||
|
||||
.form-group
|
||||
= label_tag :autocomplete_usage_hint, 'Autocomplete usage hint', class: 'col-sm-2 col-xs-12 control-label'
|
||||
.col-sm-10.col-xs-12.input-group
|
||||
= text_field_tag :autocomplete_usage_hint, '[help]', class: 'form-control input-sm', readonly: 'readonly'
|
||||
.input-group-btn
|
||||
= clipboard_button(clipboard_target: '#autocomplete_usage_hint')
|
||||
.form-group
|
||||
= label_tag :autocomplete_usage_hint, 'Autocomplete usage hint', class: 'col-sm-2 col-xs-12 control-label'
|
||||
.col-sm-10.col-xs-12.input-group
|
||||
= text_field_tag :autocomplete_usage_hint, '[help]', class: 'form-control input-sm', readonly: 'readonly'
|
||||
.input-group-btn
|
||||
= clipboard_button(clipboard_target: '#autocomplete_usage_hint')
|
||||
|
||||
.form-group
|
||||
= label_tag :descriptive_label, 'Descriptive label', class: 'col-sm-2 col-xs-12 control-label'
|
||||
.col-sm-10.col-xs-12.input-group
|
||||
= text_field_tag :descriptive_label, 'Perform common operations on GitLab project', class: 'form-control input-sm', readonly: 'readonly'
|
||||
.input-group-btn
|
||||
= clipboard_button(clipboard_target: '#descriptive_label')
|
||||
.form-group
|
||||
= label_tag :descriptive_label, 'Descriptive label', class: 'col-sm-2 col-xs-12 control-label'
|
||||
.col-sm-10.col-xs-12.input-group
|
||||
= text_field_tag :descriptive_label, 'Perform common operations on GitLab project', class: 'form-control input-sm', readonly: 'readonly'
|
||||
.input-group-btn
|
||||
= clipboard_button(clipboard_target: '#descriptive_label')
|
||||
|
||||
%hr
|
||||
%hr
|
||||
|
||||
%ul.list-unstyled
|
||||
%li
|
||||
2. Paste the
|
||||
%strong Token
|
||||
into the field below
|
||||
%li
|
||||
3. Select the
|
||||
%strong Active
|
||||
checkbox, press
|
||||
%strong Save changes
|
||||
and start using GitLab inside Slack!
|
||||
%ul.list-unstyled
|
||||
%li
|
||||
2. Paste the
|
||||
%strong Token
|
||||
into the field below
|
||||
%li
|
||||
3. Select the
|
||||
%strong Active
|
||||
checkbox, press
|
||||
%strong Save changes
|
||||
and start using GitLab inside Slack!
|
||||
|
|
Loading…
Reference in a new issue