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
abaa80eb
Commit
abaa80eb
authored
Apr 18, 2019
by
Roman Rodionov
Committed by
Phil Hughes
Apr 18, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace ee-specific code for boards/issue_card_inner (EE-port)
parent
59e73693
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
45 additions
and
13 deletions
+45
-13
app/assets/javascripts/boards/components/issue_card_inner.vue
...assets/javascripts/boards/components/issue_card_inner.vue
+3
-10
app/assets/javascripts/boards/mixins/issue_card_inner.js
app/assets/javascripts/boards/mixins/issue_card_inner.js
+5
-0
changelogs/unreleased/10012-move-ee-diff-for-boards-issue-card-inner.yml
...leased/10012-move-ee-diff-for-boards-issue-card-inner.yml
+5
-0
ee/app/assets/javascripts/boards/mixins/issue_card_inner.js
ee/app/assets/javascripts/boards/mixins/issue_card_inner.js
+12
-0
ee/changelogs/unreleased/10012-move-ee-diff-for-boards-issue-card-inner-ee.yml
...sed/10012-move-ee-diff-for-boards-issue-card-inner-ee.yml
+5
-0
ee/spec/javascripts/boards/issue_card_spec.js
ee/spec/javascripts/boards/issue_card_spec.js
+9
-3
spec/javascripts/boards/issue_card_spec.js
spec/javascripts/boards/issue_card_spec.js
+6
-0
No files found.
app/assets/javascripts/boards/components/issue_card_inner.vue
View file @
abaa80eb
...
...
@@ -4,7 +4,7 @@ import { GlTooltipDirective } from '@gitlab/ui';
import
{
sprintf
,
__
}
from
'
~/locale
'
;
import
Icon
from
'
~/vue_shared/components/icon.vue
'
;
import
TooltipOnTruncate
from
'
~/vue_shared/components/tooltip_on_truncate.vue
'
;
import
IssueCardWeight
from
'
ee/boards/components/issue_card_weight.vue
'
;
import
issueCardInner
from
'
ee_else_ce/boards/mixins/issue_card_inner
'
;
import
UserAvatarLink
from
'
../../vue_shared/components/user_avatar/user_avatar_link.vue
'
;
import
eventHub
from
'
../eventhub
'
;
import
IssueDueDate
from
'
./issue_due_date.vue
'
;
...
...
@@ -19,13 +19,14 @@ export default {
UserAvatarLink
,
TooltipOnTruncate
,
IssueDueDate
,
IssueCardWeight
,
IssueTimeEstimate
,
IssueCardWeight
:
()
=>
import
(
'
ee_component/boards/components/issue_card_weight.vue
'
),
IssueCardInnerScopedLabel
,
},
directives
:
{
GlTooltip
:
GlTooltipDirective
,
},
mixins
:
[
issueCardInner
],
props
:
{
issue
:
{
type
:
Object
,
...
...
@@ -137,14 +138,6 @@ export default {
this
.
applyFilter
(
filter
);
},
filterByWeight
(
weight
)
{
if
(
!
this
.
updateFilters
)
return
;
const
issueWeight
=
encodeURIComponent
(
weight
);
const
filter
=
`weight=
${
issueWeight
}
`
;
this
.
applyFilter
(
filter
);
},
applyFilter
(
filter
)
{
const
filterPath
=
boardsStore
.
filter
.
path
.
split
(
'
&
'
);
const
filterIndex
=
filterPath
.
indexOf
(
filter
);
...
...
app/assets/javascripts/boards/mixins/issue_card_inner.js
0 → 100644
View file @
abaa80eb
export
default
{
methods
:
{
filterByWeight
()
{},
},
};
changelogs/unreleased/10012-move-ee-diff-for-boards-issue-card-inner.yml
0 → 100644
View file @
abaa80eb
---
title
:
Move ee-specific code from boards/components/issue_card_inner.vue
merge_request
:
27394
author
:
Roman Rodionov
type
:
other
ee/app/assets/javascripts/boards/mixins/issue_card_inner.js
0 → 100644
View file @
abaa80eb
export
default
{
methods
:
{
filterByWeight
(
weight
)
{
if
(
!
this
.
updateFilters
)
return
;
const
issueWeight
=
encodeURIComponent
(
weight
);
const
filter
=
`weight=
${
issueWeight
}
`
;
this
.
applyFilter
(
filter
);
},
},
};
ee/changelogs/unreleased/10012-move-ee-diff-for-boards-issue-card-inner-ee.yml
0 → 100644
View file @
abaa80eb
---
title
:
Move ee-specific code from boards/components/issue_card_inner.vue
merge_request
:
11032
author
:
Roman Rodionov
type
:
other
ee/spec/javascripts/boards/issue_card_spec.js
View file @
abaa80eb
/* global ListLabel */
/* global ListIssue */
import
Vue
from
'
vue
'
;
import
_
from
'
underscore
'
;
import
'
~/vue_shared/models/label
'
;
import
'
~/vue_shared/models/assignee
'
;
import
'
~/boards/models/issue
'
;
import
'
~/boards/models/list
'
;
import
IssueCardInner
from
'
~/boards/components/issue_card_inner.vue
'
;
import
{
listObj
}
from
'
spec/boards/mock_data
'
;
import
ListIssueEE
from
'
ee/boards/models/issue
'
;
describe
(
'
Issue card component
'
,
()
=>
{
const
label1
=
new
ListLabel
({
...
...
@@ -27,7 +26,7 @@ describe('Issue card component', () => {
setFixtures
(
'
<div class="test-container"></div>
'
);
list
=
listObj
;
issue
=
new
ListIssue
({
issue
=
new
ListIssue
EE
({
title
:
'
Testing
'
,
id
:
1
,
iid
:
1
,
...
...
@@ -36,6 +35,7 @@ describe('Issue card component', () => {
assignees
:
[],
reference_path
:
'
#1
'
,
real_path
:
'
/test/1
'
,
weight
:
1
,
});
component
=
new
Vue
({
...
...
@@ -112,4 +112,10 @@ describe('Issue card component', () => {
.
catch
(
done
.
fail
);
});
});
describe
(
'
weights
'
,
()
=>
{
it
(
'
shows weight component
'
,
()
=>
{
expect
(
component
.
$el
.
querySelector
(
'
.board-card-weight
'
)).
not
.
toBeNull
();
});
});
});
spec/javascripts/boards/issue_card_spec.js
View file @
abaa80eb
...
...
@@ -285,4 +285,10 @@ describe('Issue card component', () => {
.
catch
(
done
.
fail
);
});
});
describe
(
'
weights
'
,
()
=>
{
it
(
'
not shows weight component
'
,
()
=>
{
expect
(
component
.
$el
.
querySelector
(
'
.board-card-weight
'
)).
toBeNull
();
});
});
});
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