diff --git a/common/router.js b/common/router.js index e2437d33..ce3ea8e7 100644 --- a/common/router.js +++ b/common/router.js @@ -136,4 +136,4 @@ module.exports = class Router extends Observable { } return route; } -} \ No newline at end of file +} diff --git a/package.json b/package.json index 6635d115..27603255 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "express": "^4.16.2", "feather-icons": "^4.7.3", "flatpickr": "^4.3.2", - "frappe-datatable": "^1.1.2", + "frappe-datatable": "^1.3.1", "friendly-errors-webpack-plugin": "^1.7.0", "html-webpack-plugin": "^3.2.0", "jquery": "^3.3.1", diff --git a/server/index.js b/server/index.js index f1c841ef..7ff914d1 100644 --- a/server/index.js +++ b/server/index.js @@ -43,6 +43,7 @@ module.exports = { app.use(bodyParser.urlencoded({ extended: true })); app.use(express.static(frappe.conf.distPath)); + app.use('/static', express.static(frappe.conf.staticPath)) app.use(morgan('tiny')); diff --git a/test.db-journal b/test.db-journal new file mode 100644 index 00000000..aba14275 Binary files /dev/null and b/test.db-journal differ diff --git a/ui/components/List/List.vue b/ui/components/List/List.vue index b844c1e2..9e99ba85 100644 --- a/ui/components/List/List.vue +++ b/ui/components/List/List.vue @@ -93,6 +93,7 @@ export default { }, async deleteCheckedItems() { await frappe.db.deleteMany(this.doctype, this.checkList); + this.$router.push(`/list/${this.doctype}`); this.checkList = []; }, toggleCheck(name) { diff --git a/ui/components/controls/Link.vue b/ui/components/controls/Link.vue index bcdc74df..b89ba602 100644 --- a/ui/components/controls/Link.vue +++ b/ui/components/controls/Link.vue @@ -101,6 +101,9 @@ export default { }, sort() { return (a, b) => { + a = a.toLowerCase(); + b = b.toLowerCase(); + if (a.value === '__newItem') { return 1; } diff --git a/ui/pages/Report/index.vue b/ui/pages/Report/index.vue index 35a3eb05..e921a8cf 100644 --- a/ui/pages/Report/index.vue +++ b/ui/pages/Report/index.vue @@ -2,7 +2,7 @@