Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Keunes
funkwhale
Commits
312ceb9c
Commit
312ceb9c
authored
Dec 19, 2021
by
Marcos Peña
Committed by
Georg Krause
Dec 19, 2021
Browse files
Resolve "Computed properties already defined in data"
parent
e4debe06
Changes
22
Hide whitespace changes
Inline
Side-by-side
changes/changelog.d/1649.bugfix
0 → 100644
View file @
312ceb9c
Fixed omputed properties already defined in components data (#1649)
front/src/components/library/EditCard.vue
View file @
312ceb9c
...
...
@@ -267,7 +267,7 @@ export default {
},
updatedFields
()
{
if
(
!
this
.
obj
.
target
)
{
if
(
!
this
.
obj
||
this
.
obj
.
target
)
{
return
[]
}
const
payload
=
this
.
obj
.
payload
...
...
front/src/components/library/ImportStatusModal.vue
View file @
312ceb9c
...
...
@@ -6,7 +6,7 @@
</translate>
</h4>
<div
v-if=
"
upload
"
v-if=
"
Object.keys(upload).length > 0
"
class=
"content"
>
<div
class=
"description"
>
...
...
front/src/components/manage/ChannelsTable.vue
View file @
312ceb9c
...
...
@@ -220,19 +220,15 @@ export default {
filters
:
{
type
:
Object
,
required
:
false
,
default
:
()
=>
{
return
{}
}
}
},
data
()
{
const
defaultOrdering
=
this
.
getOrderingFromString
(
this
.
defaultOrdering
||
'
-creation_date
'
)
return
{
time
,
isLoading
:
false
,
result
:
null
,
page
:
1
,
paginateBy
:
50
,
search
:
{
query
:
this
.
defaultQuery
,
tokens
:
parseTokens
(
normalizeQuery
(
this
.
defaultQuery
))
},
orderingDirection
:
defaultOrdering
.
direction
||
'
+
'
,
ordering
:
defaultOrdering
.
field
,
orderingOptions
:
[
[
'
creation_date
'
,
'
creation_date
'
],
[
'
name
'
,
'
name
'
]
...
...
front/src/components/manage/library/AlbumsTable.vue
View file @
312ceb9c
...
...
@@ -205,19 +205,15 @@ export default {
filters
:
{
type
:
Object
,
required
:
false
,
default
:
()
=>
{
return
{}
}
}
},
data
()
{
const
defaultOrdering
=
this
.
getOrderingFromString
(
this
.
defaultOrdering
||
'
-creation_date
'
)
return
{
time
,
isLoading
:
false
,
result
:
null
,
page
:
1
,
paginateBy
:
50
,
search
:
{
query
:
this
.
defaultQuery
,
tokens
:
parseTokens
(
normalizeQuery
(
this
.
defaultQuery
))
},
orderingDirection
:
defaultOrdering
.
direction
||
'
+
'
,
ordering
:
defaultOrdering
.
field
,
orderingOptions
:
[
[
'
creation_date
'
,
'
creation_date
'
],
[
'
release_date
'
,
'
release_date
'
],
...
...
front/src/components/manage/library/ArtistsTable.vue
View file @
312ceb9c
...
...
@@ -204,19 +204,15 @@ export default {
filters
:
{
type
:
Object
,
required
:
false
,
default
:
()
=>
{
return
{}
}
}
},
data
()
{
const
defaultOrdering
=
this
.
getOrderingFromString
(
this
.
defaultOrdering
||
'
-creation_date
'
)
return
{
time
,
isLoading
:
false
,
result
:
null
,
page
:
1
,
paginateBy
:
50
,
search
:
{
query
:
this
.
defaultQuery
,
tokens
:
parseTokens
(
normalizeQuery
(
this
.
defaultQuery
))
},
orderingDirection
:
defaultOrdering
.
direction
||
'
+
'
,
ordering
:
defaultOrdering
.
field
,
orderingOptions
:
[
[
'
creation_date
'
,
'
creation_date
'
],
[
'
name
'
,
'
name
'
]
...
...
front/src/components/manage/library/EditsCardList.vue
View file @
312ceb9c
...
...
@@ -152,19 +152,15 @@ export default {
filters
:
{
type
:
Object
,
required
:
false
,
default
:
()
=>
{
return
{}
}
}
},
data
()
{
const
defaultOrdering
=
this
.
getOrderingFromString
(
this
.
defaultOrdering
||
'
-creation_date
'
)
return
{
time
,
isLoading
:
false
,
result
:
null
,
page
:
1
,
paginateBy
:
25
,
search
:
{
query
:
this
.
defaultQuery
,
tokens
:
parseTokens
(
normalizeQuery
(
this
.
defaultQuery
))
},
orderingDirection
:
defaultOrdering
.
direction
||
'
+
'
,
ordering
:
defaultOrdering
.
field
,
orderingOptions
:
[
[
'
creation_date
'
,
'
creation_date
'
],
[
'
applied_date
'
,
'
applied_date
'
]
...
...
front/src/components/manage/library/LibrariesTable.vue
View file @
312ceb9c
...
...
@@ -235,19 +235,15 @@ export default {
filters
:
{
type
:
Object
,
required
:
false
,
default
:
()
=>
{
return
{}
}
}
},
data
()
{
const
defaultOrdering
=
this
.
getOrderingFromString
(
this
.
defaultOrdering
||
'
-creation_date
'
)
return
{
time
,
isLoading
:
false
,
result
:
null
,
page
:
1
,
paginateBy
:
50
,
search
:
{
query
:
this
.
defaultQuery
,
tokens
:
parseTokens
(
normalizeQuery
(
this
.
defaultQuery
))
},
orderingDirection
:
defaultOrdering
.
direction
||
'
+
'
,
ordering
:
defaultOrdering
.
field
,
orderingOptions
:
[
[
'
creation_date
'
,
'
creation_date
'
],
[
'
followers_count
'
,
'
followers
'
],
...
...
front/src/components/manage/library/TagsTable.vue
View file @
312ceb9c
...
...
@@ -168,21 +168,17 @@ export default {
filters
:
{
type
:
Object
,
required
:
false
,
default
:
()
=>
{
return
{}
}
}
},
data
()
{
const
defaultOrdering
=
this
.
getOrderingFromString
(
this
.
defaultOrdering
||
'
-creation_date
'
)
return
{
detailedUpload
:
null
,
detailedUpload
:
{}
,
showUploadDetailModal
:
false
,
time
,
isLoading
:
false
,
result
:
null
,
page
:
1
,
paginateBy
:
50
,
search
:
{
query
:
this
.
defaultQuery
,
tokens
:
parseTokens
(
normalizeQuery
(
this
.
defaultQuery
))
},
orderingDirection
:
defaultOrdering
.
direction
||
'
+
'
,
ordering
:
defaultOrdering
.
field
,
orderingOptions
:
[
[
'
creation_date
'
,
'
creation_date
'
],
[
'
name
'
,
'
name
'
],
...
...
front/src/components/manage/library/TracksTable.vue
View file @
312ceb9c
...
...
@@ -218,19 +218,15 @@ export default {
filters
:
{
type
:
Object
,
required
:
false
,
default
:
()
=>
{
return
{}
}
}
},
data
()
{
const
defaultOrdering
=
this
.
getOrderingFromString
(
this
.
defaultOrdering
||
'
-creation_date
'
)
return
{
time
,
isLoading
:
false
,
result
:
null
,
page
:
1
,
paginateBy
:
50
,
search
:
{
query
:
this
.
defaultQuery
,
tokens
:
parseTokens
(
normalizeQuery
(
this
.
defaultQuery
))
},
orderingDirection
:
defaultOrdering
.
direction
||
'
+
'
,
ordering
:
defaultOrdering
.
field
,
orderingOptions
:
[
[
'
creation_date
'
,
'
creation_date
'
]
]
...
...
front/src/components/manage/library/UploadsTable.vue
View file @
312ceb9c
...
...
@@ -329,21 +329,17 @@ export default {
filters
:
{
type
:
Object
,
required
:
false
,
default
:
function
()
{
return
{}
}
}
},
data
()
{
const
defaultOrdering
=
this
.
getOrderingFromString
(
this
.
defaultOrdering
||
'
-creation_date
'
)
return
{
detailedUpload
:
null
,
detailedUpload
:
{}
,
showUploadDetailModal
:
false
,
time
,
isLoading
:
false
,
result
:
null
,
page
:
1
,
paginateBy
:
50
,
search
:
{
query
:
this
.
defaultQuery
,
tokens
:
parseTokens
(
normalizeQuery
(
this
.
defaultQuery
))
},
orderingDirection
:
defaultOrdering
.
direction
||
'
+
'
,
ordering
:
defaultOrdering
.
field
,
orderingOptions
:
[
[
'
creation_date
'
,
'
creation_date
'
],
[
'
modification_date
'
,
'
modification_date
'
],
...
...
front/src/components/manage/moderation/AccountsTable.vue
View file @
312ceb9c
...
...
@@ -191,19 +191,15 @@ export default {
filters
:
{
type
:
Object
,
required
:
false
,
default
:
function
()
{
return
{}
}
}
},
data
()
{
const
defaultOrdering
=
this
.
getOrderingFromString
(
this
.
defaultOrdering
||
'
-creation_date
'
)
return
{
time
,
isLoading
:
false
,
result
:
null
,
page
:
1
,
paginateBy
:
50
,
search
:
{
query
:
this
.
defaultQuery
,
tokens
:
parseTokens
(
normalizeQuery
(
this
.
defaultQuery
))
},
orderingDirection
:
defaultOrdering
.
direction
||
'
+
'
,
ordering
:
defaultOrdering
.
field
,
orderingOptions
:
[
[
'
creation_date
'
,
'
first_seen
'
],
[
'
last_fetch_date
'
,
'
last_seen
'
],
...
...
front/src/components/manage/moderation/DomainsTable.vue
View file @
312ceb9c
...
...
@@ -201,17 +201,13 @@ export default {
allowListEnabled
:
{
type
:
Boolean
,
default
:
false
}
},
data
()
{
const
defaultOrdering
=
this
.
getOrderingFromString
(
this
.
defaultOrdering
||
'
-creation_date
'
)
return
{
time
,
isLoading
:
false
,
result
:
null
,
page
:
1
,
paginateBy
:
50
,
search
:
''
,
allowed
:
null
,
orderingDirection
:
defaultOrdering
.
direction
||
'
+
'
,
ordering
:
defaultOrdering
.
field
,
orderingOptions
:
[
[
'
name
'
,
'
name
'
],
[
'
creation_date
'
,
'
first_seen
'
],
...
...
front/src/components/manage/moderation/NoteForm.vue
View file @
312ceb9c
...
...
@@ -49,7 +49,7 @@ import showdown from 'showdown'
export
default
{
props
:
{
target
:
{
type
:
String
,
required
:
true
}
target
:
{
type
:
Object
,
required
:
true
}
},
data
()
{
return
{
...
...
front/src/components/manage/moderation/NotesThread.vue
View file @
312ceb9c
...
...
@@ -62,7 +62,7 @@ import showdown from 'showdown'
export
default
{
props
:
{
notes
:
{
type
:
String
,
required
:
true
}
notes
:
{
type
:
Array
,
required
:
true
}
},
data
()
{
return
{
...
...
front/src/components/manage/users/InvitationsTable.vue
View file @
312ceb9c
...
...
@@ -174,17 +174,13 @@ export default {
filters
:
{
type
:
Object
,
required
:
false
,
default
:
function
()
{
return
{}
}
}
},
data
()
{
const
defaultOrdering
=
this
.
getOrderingFromString
(
this
.
defaultOrdering
||
'
-creation_date
'
)
return
{
moment
,
isLoading
:
false
,
result
:
null
,
page
:
1
,
paginateBy
:
50
,
search
:
''
,
isOpen
:
null
,
orderingDirection
:
defaultOrdering
.
direction
||
'
+
'
,
ordering
:
defaultOrdering
.
field
,
orderingOptions
:
[
[
'
expiration_date
'
,
'
expiration_date
'
],
[
'
creation_date
'
,
'
creation_date
'
]
...
...
front/src/components/manage/users/UsersTable.vue
View file @
312ceb9c
...
...
@@ -217,16 +217,12 @@ export default {
filters
:
{
type
:
Object
,
required
:
false
,
default
:
function
()
{
return
{}
}
}
},
data
()
{
const
defaultOrdering
=
this
.
getOrderingFromString
(
this
.
defaultOrdering
||
'
-date_joined
'
)
return
{
time
,
isLoading
:
false
,
result
:
null
,
page
:
1
,
paginateBy
:
50
,
search
:
''
,
orderingDirection
:
defaultOrdering
.
direction
||
'
+
'
,
ordering
:
defaultOrdering
.
field
,
orderingOptions
:
[
[
'
date_joined
'
,
'
date_joined
'
],
[
'
last_activity
'
,
'
last_activity
'
],
...
...
front/src/components/moderation/ReportCategoryDropdown.vue
View file @
312ceb9c
...
...
@@ -31,7 +31,7 @@ export default {
mixins
:
[
TranslationsMixin
],
props
:
{
value
:
{
type
:
String
,
default
:
null
},
all
:
{
type
:
String
,
default
:
null
},
all
:
{
type
:
Boolean
,
default
:
null
},
label
:
{
type
:
Boolean
},
empty
:
{
type
:
Boolean
},
required
:
{
type
:
Boolean
},
...
...
front/src/store/ui.js
View file @
312ceb9c
...
...
@@ -105,6 +105,66 @@ export default {
orderingDirection
:
'
-
'
,
ordering
:
'
creation_date
'
},
'
manage.channels
'
:
{
paginateBy
:
50
,
orderingDirection
:
'
-
'
,
ordering
:
'
creation_date
'
},
'
manage.library.tags
'
:
{
paginateBy
:
50
,
orderingDirection
:
'
-
'
,
ordering
:
'
creation_date
'
},
'
manage.library.uploads
'
:
{
paginateBy
:
50
,
orderingDirection
:
'
-
'
,
ordering
:
'
creation_date
'
},
'
manage.library.libraries
'
:
{
paginateBy
:
50
,
orderingDirection
:
'
-
'
,
ordering
:
'
creation_date
'
},
'
manage.library.tracks
'
:
{
paginateBy
:
50
,
orderingDirection
:
'
-
'
,
ordering
:
'
creation_date
'
},
'
manage.library.albums
'
:
{
paginateBy
:
50
,
orderingDirection
:
'
-
'
,
ordering
:
'
creation_date
'
},
'
manage.library.artists
'
:
{
paginateBy
:
50
,
orderingDirection
:
'
-
'
,
ordering
:
'
creation_date
'
},
'
manage.library.edits
'
:
{
paginateBy
:
25
,
orderingDirection
:
'
-
'
,
ordering
:
'
creation_date
'
},
'
manage.users.users.list
'
:
{
paginateBy
:
50
,
orderingDirection
:
'
-
'
,
ordering
:
'
creation_date
'
},
'
manage.users.invitations.list
'
:
{
paginateBy
:
50
,
orderingDirection
:
'
-
'
,
ordering
:
'
creation_date
'
},
'
manage.moderation.accounts.list
'
:
{
paginateBy
:
50
,
orderingDirection
:
'
-
'
,
ordering
:
'
creation_date
'
},
'
manage.moderation.domains.list
'
:
{
paginateBy
:
50
,
orderingDirection
:
'
-
'
,
ordering
:
'
creation_date
'
},
'
manage.moderation.requests.list
'
:
{
paginateBy
:
25
,
orderingDirection
:
'
-
'
,
...
...
front/src/views/admin/library/UploadDetail.vue
View file @
312ceb9c
...
...
@@ -392,7 +392,7 @@ export default {
data
()
{
return
{
time
,
detailedUpload
:
null
,
detailedUpload
:
{}
,
showUploadDetailModal
:
false
,
isLoading
:
true
,
object
:
null
,
...
...
Prev
1
2
Next
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