Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
小 白蛋
Nomad
Commits
fe315fe6
Commit
fe315fe6
authored
6 years ago
by
Michael Lange
Browse files
Options
Download
Email Patches
Plain Diff
Address an issue with certain dependent keys
parent
ae0bf90b
Branches unavailable
v1.4.3
v1.4.2
v1.4.1
v1.4.0
v1.4.0-rc.1
v1.4.0-beta.1
v1.3.8
v1.3.7
v1.3.6
v1.3.5
v1.3.4
v1.3.3
v1.3.2
v1.3.1
v1.3.0
v1.3.0-rc.1
v1.3.0-beta.1
v1.2.15
v1.2.14
v1.2.13
v1.2.12
v1.2.11
v1.2.10
v1.2.9
v1.2.8
v1.2.7
v1.2.6
v1.2.5
v1.2.4
v1.2.3
v1.2.2
v1.2.1
v1.2.0
v1.2.0-rc1
v1.2.0-beta1
v1.1.18
v1.1.17
v1.1.16
v1.1.15
v1.1.14
v1.1.13
v1.1.12
v1.1.11
v1.1.10
v1.1.9
v1.1.8
v1.1.7
v1.1.6
v1.1.5
v1.1.4
v1.1.3
v1.1.2
v1.1.1
v1.1.0
v1.1.0-rc1
v1.1.0-beta1
v1.0.18
v1.0.17
v1.0.16
v1.0.15
v1.0.14
v1.0.13
v1.0.12
v1.0.11
v1.0.10
v1.0.9
v1.0.8
v1.0.7
v1.0.6
v1.0.5
v1.0.4
v1.0.3
v1.0.2
v1.0.1
v1.0.0
v1.0.0-rc1
v1.0.0-beta3
v1.0.0-beta2
v0.12.12
v0.12.11
v0.12.10
v0.12.9
v0.12.8
v0.12.7
v0.12.6
v0.12.5
v0.12.4
v0.12.4-rc1
v0.12.3
v0.12.2
v0.12.1
v0.12.0
v0.12.0-rc1
v0.12.0-beta2
v0.12.0-beta1
v0.11.8
v0.11.7
v0.11.6
v0.11.5
v0.11.4
v0.11.3
v0.11.2
v0.11.1
v0.11.0
v0.11.0-rc1
v0.11.0-beta2
v0.11.0-beta1
v0.10.9
v0.10.8
v0.10.7
v0.10.6
v0.10.5
v0.10.4
v0.10.4-rc1
v0.10.3
v0.10.2
v0.10.2-rc1
v0.10.1
v0.10.0
v0.10.0-rc1
v0.10.0-connect1
v0.10.0-beta1
v0.9.7
v0.9.6
v0.9.5
v0.9.4
v0.9.4-rc1
v0.9.3
v0.9.2
v0.9.2-rc1
v0.9.1
v0.9.1-rc1
v0.9.0
v0.9.0-rc2
v0.9.0-rc1
v0.9.0-beta3
v0.9.0-beta2
v0.9.0-beta1
nightly
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
ui/app/controllers/jobs/index.js
+11
-15
ui/app/controllers/jobs/index.js
with
11 additions
and
15 deletions
+11
-15
ui/app/controllers/jobs/index.js
+
11
-
15
View file @
fe315fe6
...
...
@@ -32,21 +32,17 @@ export default Controller.extend(Sortable, Searchable, {
Filtered jobs are those that match the selected namespace and aren't children
of periodic or parameterized jobs.
*/
filteredJobs
:
computed
(
'
model.[]
'
,
'
model.@each.parent
'
,
'
system.activeNamespace
'
,
'
system.namespaces.length
'
,
function
()
{
const
hasNamespaces
=
this
.
get
(
'
system.namespaces.length
'
);
const
activeNamespace
=
this
.
get
(
'
system.activeNamespace.id
'
)
||
'
default
'
;
return
this
.
get
(
'
model
'
)
.
compact
()
.
filter
(
job
=>
!
hasNamespaces
||
job
.
get
(
'
namespace.id
'
)
===
activeNamespace
)
.
filter
(
job
=>
!
job
.
get
(
'
parent.content
'
));
}
),
filteredJobs
:
computed
(
'
model.[]
'
,
'
model.@each.parent
'
,
function
()
{
// Namespace related properties are ommitted from the dependent keys
// due to a prop invalidation bug caused by region switching.
const
hasNamespaces
=
this
.
get
(
'
system.namespaces.length
'
);
const
activeNamespace
=
this
.
get
(
'
system.activeNamespace.id
'
)
||
'
default
'
;
return
this
.
get
(
'
model
'
)
.
compact
()
.
filter
(
job
=>
!
hasNamespaces
||
job
.
get
(
'
namespace.id
'
)
===
activeNamespace
)
.
filter
(
job
=>
!
job
.
get
(
'
parent.content
'
));
}),
listToSort
:
alias
(
'
filteredJobs
'
),
listToSearch
:
alias
(
'
listSorted
'
),
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
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
Menu
Projects
Groups
Snippets
Help