sumba 2.1.8 → 2.1.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/index.js +5 -7
- package/package.json +1 -1
- package/wiki/CHANGES.md +4 -0
package/index.js
CHANGED
|
@@ -433,8 +433,8 @@ async function factory (pkgName) {
|
|
|
433
433
|
let site = {}
|
|
434
434
|
|
|
435
435
|
if (!this.config.multiSite) {
|
|
436
|
-
const resp = await this.app.dobo.getModel('SumbaSite').
|
|
437
|
-
site = omit(resp
|
|
436
|
+
const resp = await this.app.dobo.getModel('SumbaSite').findOneRecord({ query: { alias: 'default' } }, { noHook: true })
|
|
437
|
+
site = omit(resp, omitted)
|
|
438
438
|
await mergeSetting(site)
|
|
439
439
|
return site
|
|
440
440
|
}
|
|
@@ -448,12 +448,10 @@ async function factory (pkgName) {
|
|
|
448
448
|
]
|
|
449
449
|
}
|
|
450
450
|
}
|
|
451
|
-
const
|
|
452
|
-
|
|
453
|
-
if (rows.length === 0) throw this.error('unknownSite')
|
|
454
|
-
const row = omit(rows[0], omitted)
|
|
451
|
+
const row = await this.app.dobo.getModel('SumbaSite').findOneRecord({ query }, { noHook: true })
|
|
452
|
+
if (!row) throw this.error('unknownSite')
|
|
455
453
|
if (row.status !== 'ACTIVE') throw this.error('siteInactiveInfo')
|
|
456
|
-
site = row
|
|
454
|
+
site = omit(row, omitted)
|
|
457
455
|
await mergeSetting(site)
|
|
458
456
|
return site
|
|
459
457
|
}
|
package/package.json
CHANGED