mirror of https://github.com/halo-dev/halo
Resolve conflict
parent
8dac1a176a
commit
d7a8723c61
|
@ -64,6 +64,17 @@ public class SheetServiceImpl extends BasePostServiceImpl<Sheet> implements Shee
|
||||||
@Override
|
@Override
|
||||||
public Sheet createBy(Sheet sheet, boolean autoSave) {
|
public Sheet createBy(Sheet sheet, boolean autoSave) {
|
||||||
Sheet createdSheet = createOrUpdateBy(sheet);
|
Sheet createdSheet = createOrUpdateBy(sheet);
|
||||||
|
if (!autoSave) {
|
||||||
|
// Log the creation
|
||||||
|
LogEvent logEvent = new LogEvent(this, createdSheet.getId().toString(), LogType.SHEET_PUBLISHED, createdSheet.getTitle());
|
||||||
|
eventPublisher.publishEvent(logEvent);
|
||||||
|
}
|
||||||
|
return createdSheet;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Sheet createBy(Sheet sheet, Set<SheetMeta> sheetMetas, boolean autoSave) {
|
||||||
|
Sheet createdSheet = createOrUpdateBy(sheet);
|
||||||
|
|
||||||
// Create sheet meta data
|
// Create sheet meta data
|
||||||
List<SheetMeta> sheetMetaList = sheetMetaService.createOrUpdateByPostId(sheet.getId(), sheetMetas);
|
List<SheetMeta> sheetMetaList = sheetMetaService.createOrUpdateByPostId(sheet.getId(), sheetMetas);
|
||||||
|
@ -80,6 +91,17 @@ public class SheetServiceImpl extends BasePostServiceImpl<Sheet> implements Shee
|
||||||
@Override
|
@Override
|
||||||
public Sheet updateBy(Sheet sheet, boolean autoSave) {
|
public Sheet updateBy(Sheet sheet, boolean autoSave) {
|
||||||
Sheet updatedSheet = createOrUpdateBy(sheet);
|
Sheet updatedSheet = createOrUpdateBy(sheet);
|
||||||
|
if (!autoSave) {
|
||||||
|
// Log the creation
|
||||||
|
LogEvent logEvent = new LogEvent(this, updatedSheet.getId().toString(), LogType.SHEET_EDITED, updatedSheet.getTitle());
|
||||||
|
eventPublisher.publishEvent(logEvent);
|
||||||
|
}
|
||||||
|
return updatedSheet;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Sheet updateBy(Sheet sheet, Set<SheetMeta> sheetMetas, boolean autoSave) {
|
||||||
|
Sheet updatedSheet = createOrUpdateBy(sheet);
|
||||||
|
|
||||||
// Create sheet meta data
|
// Create sheet meta data
|
||||||
List<SheetMeta> sheetMetaList = sheetMetaService.createOrUpdateByPostId(updatedSheet.getId(), sheetMetas);
|
List<SheetMeta> sheetMetaList = sheetMetaService.createOrUpdateByPostId(updatedSheet.getId(), sheetMetas);
|
||||||
|
|
Loading…
Reference in New Issue