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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
fbe91125
Commit
fbe91125
authored
Oct 26, 2018
by
Heinrich Lee Yu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update project selection dropdown API params
parent
2ec2a906
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
12 additions
and
4 deletions
+12
-4
app/assets/javascripts/boards/components/project_select.vue
app/assets/javascripts/boards/components/project_select.vue
+5
-1
app/assets/javascripts/project_select.js
app/assets/javascripts/project_select.js
+4
-0
app/views/groups/issues.html.haml
app/views/groups/issues.html.haml
+1
-1
app/views/groups/merge_requests.html.haml
app/views/groups/merge_requests.html.haml
+1
-1
app/views/shared/_new_project_item_select.html.haml
app/views/shared/_new_project_item_select.html.haml
+1
-1
No files found.
app/assets/javascripts/boards/components/project_select.vue
View file @
fbe91125
...
@@ -48,7 +48,11 @@ export default {
...
@@ -48,7 +48,11 @@ export default {
selectable
:
true
,
selectable
:
true
,
data
:
(
term
,
callback
)
=>
{
data
:
(
term
,
callback
)
=>
{
this
.
loading
=
true
;
this
.
loading
=
true
;
return
Api
.
groupProjects
(
this
.
groupId
,
term
,
{
with_issues_enabled
:
true
},
projects
=>
{
return
Api
.
groupProjects
(
this
.
groupId
,
term
,
{
with_issues_enabled
:
true
,
include_shared
:
false
,
include_subgroups
:
true
},
projects
=>
{
this
.
loading
=
false
;
this
.
loading
=
false
;
callback
(
projects
);
callback
(
projects
);
});
});
...
...
app/assets/javascripts/project_select.js
View file @
fbe91125
...
@@ -14,6 +14,8 @@ export default function projectSelect() {
...
@@ -14,6 +14,8 @@ export default function projectSelect() {
this
.
orderBy
=
$
(
select
).
data
(
'
orderBy
'
)
||
'
id
'
;
this
.
orderBy
=
$
(
select
).
data
(
'
orderBy
'
)
||
'
id
'
;
this
.
withIssuesEnabled
=
$
(
select
).
data
(
'
withIssuesEnabled
'
);
this
.
withIssuesEnabled
=
$
(
select
).
data
(
'
withIssuesEnabled
'
);
this
.
withMergeRequestsEnabled
=
$
(
select
).
data
(
'
withMergeRequestsEnabled
'
);
this
.
withMergeRequestsEnabled
=
$
(
select
).
data
(
'
withMergeRequestsEnabled
'
);
this
.
includeShared
=
$
(
select
).
data
(
'
includeShared
'
)
===
undefined
?
true
:
$
(
select
).
data
(
'
includeShared
'
);
this
.
includeProjectsInSubgroups
=
$
(
select
).
data
(
'
includeProjectsInSubgroups
'
)
||
false
;
this
.
allowClear
=
$
(
select
).
data
(
'
allowClear
'
)
||
false
;
this
.
allowClear
=
$
(
select
).
data
(
'
allowClear
'
)
||
false
;
placeholder
=
'
Search for project
'
;
placeholder
=
'
Search for project
'
;
...
@@ -54,6 +56,8 @@ export default function projectSelect() {
...
@@ -54,6 +56,8 @@ export default function projectSelect() {
{
{
with_issues_enabled
:
_this
.
withIssuesEnabled
,
with_issues_enabled
:
_this
.
withIssuesEnabled
,
with_merge_requests_enabled
:
_this
.
withMergeRequestsEnabled
,
with_merge_requests_enabled
:
_this
.
withMergeRequestsEnabled
,
include_shared
:
_this
.
includeShared
,
include_subgroups
:
_this
.
includeProjectsInSubgroups
,
},
},
projectsCallback
,
projectsCallback
,
);
);
...
...
app/views/groups/issues.html.haml
View file @
fbe91125
...
@@ -9,7 +9,7 @@
...
@@ -9,7 +9,7 @@
=
render
'shared/issuable/nav'
,
type: :issues
=
render
'shared/issuable/nav'
,
type: :issues
.nav-controls
.nav-controls
=
render
'shared/issuable/feed_buttons'
=
render
'shared/issuable/feed_buttons'
=
render
'shared/new_project_item_select'
,
path:
'issues/new'
,
label:
"New issue"
,
type: :issues
,
with_feature_enabled:
'issues'
=
render
'shared/new_project_item_select'
,
path:
'issues/new'
,
label:
"New issue"
,
type: :issues
,
with_feature_enabled:
'issues'
,
include_shared:
false
,
include_projects_in_subgroups:
true
=
render
'shared/issuable/search_bar'
,
type: :issues
=
render
'shared/issuable/search_bar'
,
type: :issues
...
...
app/views/groups/merge_requests.html.haml
View file @
fbe91125
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
=
render
'shared/issuable/nav'
,
type: :merge_requests
=
render
'shared/issuable/nav'
,
type: :merge_requests
-
if
current_user
-
if
current_user
.nav-controls
.nav-controls
=
render
'shared/new_project_item_select'
,
path:
'merge_requests/new'
,
label:
"New merge request"
,
type: :merge_requests
,
with_feature_enabled:
'merge_requests'
=
render
'shared/new_project_item_select'
,
path:
'merge_requests/new'
,
label:
"New merge request"
,
type: :merge_requests
,
with_feature_enabled:
'merge_requests'
,
include_shared:
false
,
include_projects_in_subgroups:
true
=
render
'shared/issuable/search_bar'
,
type: :merge_requests
=
render
'shared/issuable/search_bar'
,
type: :merge_requests
...
...
app/views/shared/_new_project_item_select.html.haml
View file @
fbe91125
...
@@ -2,6 +2,6 @@
...
@@ -2,6 +2,6 @@
.project-item-select-holder.btn-group
.project-item-select-holder.btn-group
%a
.btn.btn-success.new-project-item-link.qa-new-project-item-link
{
href:
''
,
data:
{
label:
local_assigns
[
:label
],
type:
local_assigns
[
:type
]
}
}
%a
.btn.btn-success.new-project-item-link.qa-new-project-item-link
{
href:
''
,
data:
{
label:
local_assigns
[
:label
],
type:
local_assigns
[
:type
]
}
}
=
icon
(
'spinner spin'
)
=
icon
(
'spinner spin'
)
=
project_select_tag
:project_path
,
class:
"project-item-select"
,
data:
{
include_groups:
local_assigns
[
:include_groups
],
order_by:
'last_activity_at'
,
relative_path:
local_assigns
[
:path
]
},
with_feature_enabled:
local_assigns
[
:with_feature_enabled
]
=
project_select_tag
:project_path
,
class:
"project-item-select"
,
data:
{
include_groups:
local_assigns
[
:include_groups
],
order_by:
'last_activity_at'
,
relative_path:
local_assigns
[
:path
]
,
include_shared:
local_assigns
[
:include_shared
],
include_projects_in_subgroups:
local_assigns
[
:include_projects_in_subgroups
]
},
with_feature_enabled:
local_assigns
[
:with_feature_enabled
]
%button
.btn.btn-success.new-project-item-select-button.qa-new-project-item-select-button
%button
.btn.btn-success.new-project-item-select-button.qa-new-project-item-select-button
=
icon
(
'caret-down'
)
=
icon
(
'caret-down'
)
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