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
3b3aa28c
Commit
3b3aa28c
authored
Oct 23, 2018
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use convertPermissionToBoolean to get a boolean
parent
b07a0167
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
2 deletions
+7
-2
app/assets/javascripts/diffs/components/tree_list.vue
app/assets/javascripts/diffs/components/tree_list.vue
+4
-1
app/assets/javascripts/vue_shared/components/file_row.vue
app/assets/javascripts/vue_shared/components/file_row.vue
+3
-1
No files found.
app/assets/javascripts/diffs/components/tree_list.vue
View file @
3b3aa28c
<
script
>
<
script
>
import
{
mapActions
,
mapGetters
,
mapState
}
from
'
vuex
'
;
import
{
mapActions
,
mapGetters
,
mapState
}
from
'
vuex
'
;
import
{
TooltipDirective
as
Tooltip
}
from
'
@gitlab-org/gitlab-ui
'
;
import
{
TooltipDirective
as
Tooltip
}
from
'
@gitlab-org/gitlab-ui
'
;
import
{
convertPermissionToBoolean
}
from
'
~/lib/utils/common_utils
'
;
import
Icon
from
'
~/vue_shared/components/icon.vue
'
;
import
Icon
from
'
~/vue_shared/components/icon.vue
'
;
import
FileRow
from
'
~/vue_shared/components/file_row.vue
'
;
import
FileRow
from
'
~/vue_shared/components/file_row.vue
'
;
import
FileRowStats
from
'
./file_row_stats.vue
'
;
import
FileRowStats
from
'
./file_row_stats.vue
'
;
...
@@ -17,10 +18,12 @@ export default {
...
@@ -17,10 +18,12 @@ export default {
},
},
data
()
{
data
()
{
const
treeListStored
=
localStorage
.
getItem
(
treeListStorageKey
);
const
treeListStored
=
localStorage
.
getItem
(
treeListStorageKey
);
const
renderTreeList
=
treeListStored
!==
null
?
convertPermissionToBoolean
(
treeListStored
)
:
true
;
return
{
return
{
search
:
''
,
search
:
''
,
renderTreeList
:
treeListStored
!==
null
?
treeListStored
===
'
true
'
:
true
,
renderTreeList
,
focusSearch
:
false
,
focusSearch
:
false
,
};
};
},
},
...
...
app/assets/javascripts/vue_shared/components/file_row.vue
View file @
3b3aa28c
...
@@ -74,7 +74,9 @@ export default {
...
@@ -74,7 +74,9 @@ export default {
outputText
()
{
outputText
()
{
const
text
=
this
.
file
[
this
.
displayTextKey
];
const
text
=
this
.
file
[
this
.
displayTextKey
];
if
(
this
.
truncateStart
===
0
)
return
text
;
if
(
this
.
truncateStart
===
0
)
{
return
text
;
}
return
`...
${
text
.
substring
(
this
.
truncateStart
,
text
.
length
)}
`
;
return
`...
${
text
.
substring
(
this
.
truncateStart
,
text
.
length
)}
`
;
},
},
...
...
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