Skip to content
代码片段 群组 项目
未验证 提交 8873114d 编辑于 作者: Alex Pennells's avatar Alex Pennells 提交者: GitLab
浏览文件

Merge branch...

Merge branch '499775-add-clarifying-help-text-on-legacy-issue-linked-item-input-about-only-being-able-to-link' into 'master' 

Resolve "Add clarifying help text on legacy issue linked item input about only being able to link Issues (and update docs)"

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/170336



Merged-by: default avatarAlex Pennells <apennells@gitlab.com>
Approved-by: default avatarMarcin Sedlak-Jakubowski <msedlakjakubowski@gitlab.com>
Approved-by: default avatarAlex Pennells <apennells@gitlab.com>
Reviewed-by: default avatarAlex Pennells <apennells@gitlab.com>
Co-authored-by: default avatarChad Lavimoniere <clavimoniere@gitlab.com>
No related branches found
No related tags found
无相关合并请求
<script>
import { GlFormGroup } from '@gitlab/ui';
import $ from 'jquery';
import GfmAutoComplete from 'ee_else_ce/gfm_auto_complete';
import { TYPE_ISSUE } from '~/issues/constants';
......@@ -14,6 +15,7 @@ const SPACE_FACTOR = 1;
export default {
name: 'RelatedIssuableInput',
components: {
GlFormGroup,
IssueToken,
},
props: {
......@@ -179,49 +181,61 @@ export default {
</script>
<template>
<div
ref="issuableFormWrapper"
:class="{ focus: isInputFocused }"
class="add-issuable-form-input-wrapper form-control gl-field-error-outline gl-h-auto gl-px-3 gl-pb-0 gl-pt-2"
@click="onIssuableFormWrapperClick"
>
<ul class="gl-m-0 gl-flex gl-list-none gl-flex-wrap gl-items-baseline gl-p-0">
<li
v-for="(reference, index) in references"
:key="reference"
class="gl-mb-2 gl-mr-2 gl-max-w-full"
>
<issue-token
:id-key="index"
:display-reference="reference.text || reference"
can-remove
is-condensed
:path-id-separator="pathIdSeparator"
event-namespace="pendingIssuable"
@pendingIssuableRemoveRequest="
(params) => {
$emit('pendingIssuableRemoveRequest', params);
}
"
/>
</li>
<li class="gl-mb-2 gl-grow">
<input
:id="inputId"
ref="input"
:value="inputValue"
:placeholder="inputPlaceholder"
:aria-label="inputPlaceholder"
type="text"
class="gl-w-full gl-border-none gl-outline-none"
data-testid="add-issue-field"
autocomplete="off"
@input="onInput"
@focus="onFocus"
@blur="onBlur"
@keyup.escape.exact="$emit('addIssuableFormCancel')"
/>
</li>
</ul>
</div>
<gl-form-group>
<div
ref="issuableFormWrapper"
:class="{ focus: isInputFocused }"
class="add-issuable-form-input-wrapper form-control gl-field-error-outline gl-h-auto gl-px-3 gl-pb-0 gl-pt-2"
@click="onIssuableFormWrapperClick"
>
<ul class="gl-m-0 gl-flex gl-list-none gl-flex-wrap gl-items-baseline gl-p-0">
<li
v-for="(reference, index) in references"
:key="reference"
class="gl-mb-2 gl-mr-2 gl-max-w-full"
>
<issue-token
:id-key="index"
:display-reference="reference.text || reference"
can-remove
is-condensed
:path-id-separator="pathIdSeparator"
event-namespace="pendingIssuable"
@pendingIssuableRemoveRequest="
(params) => {
$emit('pendingIssuableRemoveRequest', params);
}
"
/>
</li>
<li class="gl-mb-2 gl-grow">
<input
:id="inputId"
ref="input"
:aria-describedby="`${inputId}-description`"
:value="inputValue"
:placeholder="inputPlaceholder"
:aria-label="inputPlaceholder"
type="text"
class="gl-w-full gl-border-none gl-outline-none"
data-testid="add-issue-field"
autocomplete="off"
@input="onInput"
@focus="onFocus"
@blur="onBlur"
@keyup.escape.exact="$emit('addIssuableFormCancel')"
/>
</li>
</ul>
</div>
<template #description>
<span :id="`${inputId}-description`">
{{
__(
'Only issues can be linked from this form. You can also link this issue from an epic or task.',
)
}}
</span>
</template>
</gl-form-group>
</template>
......@@ -38149,6 +38149,9 @@ msgstr ""
msgid "Only include features new to your current subscription tier."
msgstr ""
 
msgid "Only issues can be linked from this form. You can also link this issue from an epic or task."
msgstr ""
msgid "Only log Akismet verdict, do not prevent issue or snippet creation when spam is detected."
msgstr ""
 
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册