Commit 08cfaa30 authored by christianrhansen's avatar christianrhansen

Merge branch 'master' of gitlab.rlp.net:motionbank/applications/systems-frontend

parents 8ce27c36 02b18c56
......@@ -10936,9 +10936,9 @@
}
},
"mbjs-data-models": {
"version": "2.0.13",
"resolved": "https://registry.npmjs.org/mbjs-data-models/-/mbjs-data-models-2.0.13.tgz",
"integrity": "sha512-AdR88T6MRg0/NxSMCjXtlJHBXkIy24lswp6KSVA8t0WuVyWchCnwgNM5YeYD9bebGLLyAIKUozz+YDA2+Whxdw==",
"version": "2.0.15",
"resolved": "https://registry.npmjs.org/mbjs-data-models/-/mbjs-data-models-2.0.15.tgz",
"integrity": "sha512-zHgfwG6o6P3TK6W19NjpqK60pAaAHvkiVCwyr13H/uCaozLAKlSxWF7rJ1NIvGrl6yFE2n250D50gYtr5GqO5A==",
"requires": {
"bignumber.js": "^6.0.0",
"bluebird": "^3.5.1",
......
......@@ -125,7 +125,7 @@ module.exports = function (ctx) {
//
// Build flags
//
FLAG_DISABLE_FRAGMENT_ENCODING: JSON.stringify(process.env.FLAG_DISABLE_FRAGMENT_ENCODING || false),
FLAG_ENABLE_FRAGMENT_ENCODING: JSON.stringify(process.env.FLAG_ENABLE_FRAGMENT_ENCODING || false),
//
// Features
//
......
Subproject commit 45ee886cbaf7b11d6e45c98e0e3ad5cb5942e991
Subproject commit c5026e232475ebd4430e7affd26fddee5b051e19
......@@ -59,7 +59,8 @@
label: _this.$t('labels.title'),
field: 'title',
sortable: true,
filter: true
filter: true,
style: 'white-space: normal'
},
{
name: 'last_updated',
......@@ -68,7 +69,7 @@
sort: _this.$sort.onDateValue,
field: 'last_updated',
format: val => DateTime.fromISO(val)
.toLocaleString(DateTime.DATETIME_SHORT_WITH_SECONDS)
.toLocaleString(DateTime.DATETIME_SHORT)
},
{
name: 'creator',
......
......@@ -37,8 +37,7 @@
const meta = await _this.$store.dispatch('metadata/getLocal', row)
transformed.title = meta && meta.title ? meta.title : _this.$t('labels.title_unknown')
if (row.target.selector) {
const parsed = row.target.selector.parse()
console.log(parsed)
const parsed = row.target.selector._value
if (Array.isArray(parsed['date-time:t'])) transformed.date = parsed['date-time:t'][0]
else transformed.date = parsed['date-time:t']
}
......@@ -64,7 +63,8 @@
label: _this.$t('labels.title'),
field: 'title',
sortable: true,
filter: true
filter: true,
style: 'white-space: normal'
},
{
name: 'type',
......@@ -89,14 +89,15 @@
sort: _this.$sort.onDateValue,
field: 'last_updated',
format: val => DateTime.fromISO(val)
.toLocaleString(DateTime.DATETIME_SHORT_WITH_SECONDS)
.toLocaleString(DateTime.DATETIME_SHORT)
},
{
name: 'tags',
label: _this.$t('labels.tags'),
filter: true,
sortable: false,
field: 'tags'
field: 'tags',
style: 'white-space: normal'
},
{
name: 'creator',
......
......@@ -40,7 +40,8 @@
label: _this.$t('labels.title'),
field: 'title',
sortable: true,
filter: true
filter: true,
style: 'white-space: normal'
}
],
actions: [
......
......@@ -88,7 +88,8 @@
label: _this.$t('labels.title'),
field: 'title',
filter: true,
sortable: true
sortable: true,
style: 'white-space: normal'
},
{
name: 'last_updated',
......@@ -97,7 +98,7 @@
sort: _this.$sort.onDateValue,
field: 'last_updated',
format: val => DateTime.fromISO(val)
.toLocaleString(DateTime.DATETIME_SHORT_WITH_SECONDS)
.toLocaleString(DateTime.DATETIME_SHORT)
},
{
name: 'creator',
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment