Markdeep importer is resolving overlapping content. Repeated errors should be fixed.
This commit is contained in:
parent
da2d989a92
commit
9bde9e6492
@ -64,24 +64,27 @@ LeDatabase >> docTreeForLink: aString [
|
|||||||
{ #category : #'*MiniDocs' }
|
{ #category : #'*MiniDocs' }
|
||||||
LeDatabase >> errorCardFor: error [
|
LeDatabase >> errorCardFor: error [
|
||||||
|
|
||||||
| keepButton overwriteButton backupButton errorMessageUI |
|
| keepButton overwriteButton backupButton errorMessageUI localPage |
|
||||||
|
localPage := self pageWithID: (error at: 'key').
|
||||||
keepButton := BrButton new
|
keepButton := BrButton new
|
||||||
aptitude: BrGlamorousButtonWithIconAndLabelAptitude;
|
aptitude: BrGlamorousButtonWithIconAndLabelAptitude;
|
||||||
beTinySize;
|
|
||||||
label: 'Keep existing local page';
|
label: 'Keep existing local page';
|
||||||
icon: BrGlamorousVectorIcons cancel;
|
icon: BrGlamorousVectorIcons cancel;
|
||||||
action: [ :aButton | ];
|
margin: (BlInsets left: 10);
|
||||||
margin: (BlInsets left: 10).
|
action: [ :aButton |
|
||||||
|
aButton phlow spawnObject: localPage
|
||||||
|
].
|
||||||
overwriteButton := BrButton new
|
overwriteButton := BrButton new
|
||||||
aptitude: BrGlamorousButtonWithIconAndLabelAptitude;
|
aptitude: BrGlamorousButtonWithIconAndLabelAptitude;
|
||||||
beTinySize;
|
|
||||||
label: 'Overwrite with remote page';
|
label: 'Overwrite with remote page';
|
||||||
icon: BrGlamorousVectorIcons edit;
|
icon: BrGlamorousVectorIcons edit;
|
||||||
action: [ :aButton | ];
|
action: [ :aButton |
|
||||||
|
self removePage: localPage.
|
||||||
|
aButton phlow spawnObject: (self addPageFromMarkdeepUrl: (error at: 'remote'))
|
||||||
|
];
|
||||||
margin: (BlInsets left: 10).
|
margin: (BlInsets left: 10).
|
||||||
backupButton := BrButton new
|
backupButton := BrButton new
|
||||||
aptitude: BrGlamorousButtonWithIconAndLabelAptitude;
|
aptitude: BrGlamorousButtonWithIconAndLabelAptitude;
|
||||||
beTinySize;
|
|
||||||
label: 'Backup local page';
|
label: 'Backup local page';
|
||||||
icon: BrGlamorousVectorIcons changes;
|
icon: BrGlamorousVectorIcons changes;
|
||||||
action: [ :aButton | ];
|
action: [ :aButton | ];
|
||||||
@ -106,8 +109,7 @@ LeDatabase >> gtViewErrorDetailsOn: aView [
|
|||||||
^ aView explicit
|
^ aView explicit
|
||||||
title: 'Errors' translated;
|
title: 'Errors' translated;
|
||||||
priority: 5;
|
priority: 5;
|
||||||
stencil: [
|
stencil: [ | container |
|
||||||
| container |
|
|
||||||
container := BlElement new
|
container := BlElement new
|
||||||
layout: BlFlowLayout new;
|
layout: BlFlowLayout new;
|
||||||
constraintsDo: [ :c |
|
constraintsDo: [ :c |
|
||||||
@ -116,7 +118,7 @@ LeDatabase >> gtViewErrorDetailsOn: aView [
|
|||||||
padding: (BlInsets all: 10).
|
padding: (BlInsets all: 10).
|
||||||
container
|
container
|
||||||
addChildren: (self errorCardFor: self errors first)
|
addChildren: (self errorCardFor: self errors first)
|
||||||
"container addChild: self asCardElement "].
|
].
|
||||||
]
|
]
|
||||||
|
|
||||||
{ #category : #'*MiniDocs' }
|
{ #category : #'*MiniDocs' }
|
||||||
|
Loading…
Reference in New Issue
Block a user