Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
db8fed26
Commit
db8fed26
authored
Nov 02, 2016
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Refactor template selector in issuable form
Signed-off-by:
Rémy Coutable
<
remy@rymai.me
>
parent
5a0a4506
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
68 additions
and
44 deletions
+68
-44
app/helpers/blob_helper.rb
app/helpers/blob_helper.rb
+0
-27
app/helpers/issuables_helper.rb
app/helpers/issuables_helper.rb
+51
-0
app/views/shared/issuable/_form.html.haml
app/views/shared/issuable/_form.html.haml
+4
-17
app/views/shared/issuable/form/_template_selector.html.haml
app/views/shared/issuable/form/_template_selector.html.haml
+13
-0
No files found.
app/helpers/blob_helper.rb
View file @
db8fed26
...
@@ -179,33 +179,6 @@ module BlobHelper
...
@@ -179,33 +179,6 @@ module BlobHelper
}
}
end
end
def
selected_template
(
issuable
)
templates
=
issuable_templates
(
issuable
)
params
[
:issuable_template
]
if
templates
.
include?
(
params
[
:issuable_template
])
end
def
can_add_template?
(
issuable
)
names
=
issuable_templates
(
issuable
)
names
.
empty?
&&
can?
(
current_user
,
:push_code
,
@project
)
&&
!
@project
.
private?
end
def
merge_request_template_names
@merge_request_templates
||=
Gitlab
::
Template
::
MergeRequestTemplate
.
dropdown_names
(
ref_project
)
end
def
issue_template_names
@issue_templates
||=
Gitlab
::
Template
::
IssueTemplate
.
dropdown_names
(
ref_project
)
end
def
issuable_templates
(
issuable
)
@issuable_templates
||=
if
issuable
.
is_a?
(
Issue
)
issue_template_names
elsif
issuable
.
is_a?
(
MergeRequest
)
merge_request_template_names
end
end
def
ref_project
def
ref_project
@ref_project
||=
@target_project
||
@project
@ref_project
||=
@target_project
||
@project
end
end
...
...
app/helpers/issuables_helper.rb
View file @
db8fed26
...
@@ -30,6 +30,33 @@ module IssuablesHelper
...
@@ -30,6 +30,33 @@ module IssuablesHelper
end
end
end
end
def
can_add_template?
(
issuable
)
names
=
issuable_templates
(
issuable
)
names
.
empty?
&&
can?
(
current_user
,
:push_code
,
@project
)
&&
!
@project
.
private?
end
def
template_dropdown_tag
(
issuable
,
&
block
)
title
=
selected_template
(
issuable
)
||
"Choose a template"
options
=
{
toggle_class:
'js-issuable-selector'
,
title:
title
,
filter:
true
,
placeholder:
'Filter'
,
footer_content:
true
,
data:
{
data:
issuable_templates
(
issuable
),
field_name:
'issuable_template'
,
selected:
selected_template
(
issuable
),
project_path:
ref_project
.
path
,
namespace_path:
ref_project
.
namespace
.
path
}
}
dropdown_tag
(
title
,
options:
options
)
do
capture
(
&
block
)
end
end
def
user_dropdown_label
(
user_id
,
default_label
)
def
user_dropdown_label
(
user_id
,
default_label
)
return
default_label
if
user_id
.
nil?
return
default_label
if
user_id
.
nil?
return
"Unassigned"
if
user_id
==
"0"
return
"Unassigned"
if
user_id
==
"0"
...
@@ -153,4 +180,28 @@ module IssuablesHelper
...
@@ -153,4 +180,28 @@ module IssuablesHelper
hexdigest
([
'issuables_count'
,
issuable_type
,
opts
.
sort
].
flatten
.
join
(
'-'
))
hexdigest
([
'issuables_count'
,
issuable_type
,
opts
.
sort
].
flatten
.
join
(
'-'
))
end
end
def
issuable_templates
(
issuable
)
@issuable_templates
||=
case
issuable
when
Issue
issue_template_names
when
MergeRequest
merge_request_template_names
else
raise
'Unknown issuable type!'
end
end
def
merge_request_template_names
@merge_request_templates
||=
Gitlab
::
Template
::
MergeRequestTemplate
.
dropdown_names
(
ref_project
)
end
def
issue_template_names
@issue_templates
||=
Gitlab
::
Template
::
IssueTemplate
.
dropdown_names
(
ref_project
)
end
def
selected_template
(
issuable
)
params
[
:issuable_template
]
if
issuable_templates
(
issuable
).
include?
(
params
[
:issuable_template
])
end
end
end
app/views/shared/issuable/_form.html.haml
View file @
db8fed26
-
project
=
@target_project
||
@project
-
project
=
@target_project
||
@project
=
form_errors
(
issuable
)
=
form_errors
(
issuable
)
-
if
@conflict
-
if
@conflict
...
@@ -11,23 +12,9 @@
...
@@ -11,23 +12,9 @@
.form-group
.form-group
=
f
.
label
:title
,
class:
'control-label'
=
f
.
label
:title
,
class:
'control-label'
-
issuable_template_names
=
issuable_templates
(
issuable
)
=
render
'shared/issuable/form/template_selector'
,
issuable:
issuable
-
if
issuable_template_names
.
any?
%div
{
class:
issuable_templates
(
issuable
).
any?
?
'col-sm-7 col-lg-8'
:
'col-sm-10'
}
.col-sm-3.col-lg-2
.js-issuable-selector-wrap
{
data:
{
issuable_type:
issuable
.
class
.
to_s
.
underscore
.
downcase
}
}
-
title
=
selected_template
(
issuable
)
||
"Choose a template"
=
dropdown_tag
(
title
,
options:
{
toggle_class:
'js-issuable-selector'
,
title:
title
,
filter:
true
,
placeholder:
'Filter'
,
footer_content:
true
,
data:
{
data:
issuable_template_names
,
field_name:
'issuable_template'
,
selected:
selected_template
(
issuable
),
project_path:
ref_project
.
path
,
namespace_path:
ref_project
.
namespace
.
path
}
}
)
do
%ul
.dropdown-footer-list
%li
%a
.no-template
No template
%a
.reset-template
Reset template
%div
{
class:
issuable_template_names
.
any?
?
'col-sm-7 col-lg-8'
:
'col-sm-10'
}
=
f
.
text_field
:title
,
maxlength:
255
,
autofocus:
true
,
autocomplete:
'off'
,
=
f
.
text_field
:title
,
maxlength:
255
,
autofocus:
true
,
autocomplete:
'off'
,
class:
'form-control pad'
,
required:
true
class:
'form-control pad'
,
required:
true
...
...
app/views/shared/issuable/form/_template_selector.html.haml
0 → 100644
View file @
db8fed26
-
issuable
=
local_assigns
.
fetch
(
:issuable
,
nil
)
-
return
unless
issuable
&&
issuable_templates
(
issuable
).
any?
.col-sm-3.col-lg-2
.js-issuable-selector-wrap
{
data:
{
issuable_type:
issuable
.
to_ability_name
}
}
=
template_dropdown_tag
(
issuable
)
do
%ul
.dropdown-footer-list
%li
%a
.no-template
No template
%a
.reset-template
Reset template
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment