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
5a2ecbfc
Commit
5a2ecbfc
authored
Jul 19, 2019
by
Filipa Lacerda
Committed by
Phil Hughes
Jul 19, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removes EE differences for issue boards
parent
2cd7c0e5
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
1 deletion
+23
-1
app/assets/javascripts/boards/ee_functions.js
app/assets/javascripts/boards/ee_functions.js
+7
-0
app/assets/javascripts/boards/index.js
app/assets/javascripts/boards/index.js
+16
-1
No files found.
app/assets/javascripts/boards/ee_functions.js
0 → 100644
View file @
5a2ecbfc
export
const
setPromotionState
=
()
=>
{};
export
const
setWeigthFetchingState
=
()
=>
{};
export
const
setEpicFetchingState
=
()
=>
{};
export
const
getMilestoneTitle
=
()
=>
({});
export
const
getBoardsModalData
=
()
=>
({});
app/assets/javascripts/boards/index.js
View file @
5a2ecbfc
...
...
@@ -30,6 +30,13 @@ import {
}
from
'
~/lib/utils/common_utils
'
;
import
boardConfigToggle
from
'
ee_else_ce/boards/config_toggle
'
;
import
toggleFocusMode
from
'
ee_else_ce/boards/toggle_focus
'
;
import
{
setPromotionState
,
setWeigthFetchingState
,
setEpicFetchingState
,
getMilestoneTitle
,
getBoardsModalData
,
}
from
'
ee_else_ce/boards/ee_functions
'
;
import
mountMultipleBoardsSwitcher
from
'
./mount_multiple_boards_switcher
'
;
let
issueBoardsApp
;
...
...
@@ -129,6 +136,7 @@ export default () => {
});
boardsStore
.
addBlankState
();
setPromotionState
(
boardsStore
);
this
.
loading
=
false
;
})
.
catch
(()
=>
{
...
...
@@ -143,6 +151,8 @@ export default () => {
const
{
sidebarInfoEndpoint
}
=
newIssue
;
if
(
sidebarInfoEndpoint
&&
newIssue
.
subscribed
===
undefined
)
{
newIssue
.
setFetchingState
(
'
subscriptions
'
,
true
);
setWeigthFetchingState
(
newIssue
,
true
);
setEpicFetchingState
(
newIssue
,
true
);
BoardService
.
getIssueInfo
(
sidebarInfoEndpoint
)
.
then
(
res
=>
res
.
data
)
.
then
(
data
=>
{
...
...
@@ -157,6 +167,8 @@ export default () => {
}
=
convertObjectPropsToCamelCase
(
data
);
newIssue
.
setFetchingState
(
'
subscriptions
'
,
false
);
setWeigthFetchingState
(
newIssue
,
false
);
setEpicFetchingState
(
newIssue
,
false
);
newIssue
.
updateData
({
humanTimeSpent
:
humanTotalTimeSpent
,
timeSpent
:
totalTimeSpent
,
...
...
@@ -169,6 +181,7 @@ export default () => {
})
.
catch
(()
=>
{
newIssue
.
setFetchingState
(
'
subscriptions
'
,
false
);
setWeigthFetchingState
(
newIssue
,
false
);
Flash
(
__
(
'
An error occurred while fetching sidebar data
'
));
});
}
...
...
@@ -203,6 +216,7 @@ export default () => {
el
:
document
.
getElementById
(
'
js-add-list
'
),
data
:
{
filters
:
boardsStore
.
state
.
filters
,
...
getMilestoneTitle
(
$boardApp
),
},
mounted
()
{
initNewListDropdown
();
...
...
@@ -222,6 +236,7 @@ export default () => {
return
{
modal
:
ModalStore
.
store
,
store
:
boardsStore
.
state
,
...
getBoardsModalData
(
$boardApp
),
canAdminList
:
this
.
$options
.
el
.
hasAttribute
(
'
data-can-admin-list
'
),
};
},
...
...
@@ -285,6 +300,6 @@ export default () => {
});
}
toggleFocusMode
(
ModalStore
,
boardsStore
);
toggleFocusMode
(
ModalStore
,
boardsStore
,
$boardApp
);
mountMultipleBoardsSwitcher
();
};
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