forked from geolba/tethys.backend
- npm updates
- prettier formaing for migration models
This commit is contained in:
parent
4714dfdd94
commit
4e97e47fbc
19 changed files with 103 additions and 108 deletions
|
@ -78,6 +78,7 @@ export default class DatasetController {
|
|||
},
|
||||
});
|
||||
}
|
||||
|
||||
public async create({ inertia }: HttpContextContract) {
|
||||
const licenses = await License.query().select('id', 'name_long').pluck('name_long', 'id');
|
||||
|
||||
|
@ -519,7 +520,13 @@ export default class DatasetController {
|
|||
if (!validStates.includes(dataset.server_state)) {
|
||||
// throw new Error('Invalid server state!');
|
||||
// return response.flash('warning', 'Invalid server state. Dataset cannot be released to editor').redirect().back();
|
||||
return dataset.serialize();
|
||||
return response
|
||||
.flash(
|
||||
'warning',
|
||||
`Invalid server state. Dataset with id ${id} cannot be released to editor. Datset has server state ${dataset.server_state}.`,
|
||||
)
|
||||
.redirect()
|
||||
.toRoute('dataset.list');
|
||||
}
|
||||
|
||||
if (dataset.files.length === 0) {
|
||||
|
@ -581,7 +588,9 @@ export default class DatasetController {
|
|||
}
|
||||
|
||||
public async edit({ params, inertia }) {
|
||||
const dataset = await Dataset.query().where('id', params.id).preload('titles').firstOrFail();
|
||||
const datasetQuery = Dataset.query().where('id', params.id);
|
||||
datasetQuery.preload('titles');
|
||||
const dataset = await datasetQuery.firstOrFail();
|
||||
|
||||
// await dataset.loadMany([
|
||||
// 'licenses',
|
||||
|
@ -659,7 +668,7 @@ export default class DatasetController {
|
|||
|
||||
return inertia.render('Submitter/Dataset/Edit', {
|
||||
dataset,
|
||||
titletypes : titleTypes,
|
||||
titletypes: titleTypes,
|
||||
descriptionTypes,
|
||||
contributorTypes,
|
||||
nameTypes,
|
||||
|
|
Loading…
Add table
editor.link_modal.header
Reference in a new issue