fixed workbench closing

OpenPonk · Nov 10, 2024 · 62f2069 · 62f2069
1 parent eb0c530
commit 62f2069
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 5 deletions.
diff --git a/repository/OpenPonk-Spec/OPDynamicFormMagritteVisitor.class.st b/repository/OpenPonk-Spec/OPDynamicFormMagritteVisitor.class.st
@@ -155,6 +155,17 @@ OPDynamicFormMagritteVisitor >> visitStringDescription: aStringDescription [
 { #category : 'visiting' }
 OPDynamicFormMagritteVisitor >> visitToManyRelationDescription: aMAToManyRelationDescription [
 
-	form addHeadingLabel: aMAToManyRelationDescription label.
-	(form addButton: 'Edit ') action: [ controller maEdit ]
+	| label hasDisplay |
+	label := aMAToManyRelationDescription label.
+	form addHeadingLabel: label.
+	hasDisplay := aMAToManyRelationDescription displayBlockOrSymbol
+	              ~=
+	              aMAToManyRelationDescription class
+		              defaultDisplayProperty.
+	hasDisplay ifTrue: [
+		(aMAToManyRelationDescription accessor read: controller) do: [ :each |
+			form addLabel:
+				(aMAToManyRelationDescription displayStringFor: each) ] ].
+	(form addButton: 'Edit ' , (label ifNil: [ '' ])) action: [
+		controller maEdit ]
 ]
diff --git a/repository/OpenPonk-Spec/OPLegacyProjectLoadTest.class.st b/repository/OpenPonk-Spec/OPLegacyProjectLoadTest.class.st
@@ -80,7 +80,7 @@ OPLegacyProjectLoadTest >> projectZip [
 OPLegacyProjectLoadTest >> tearDown [
 
 	self file ensureDelete.
-	workbench ifNotNil: [ workbench delete ].
+	workbench ifNotNil: [ workbench close ].
 	super tearDown
 ]
 

diff --git a/repository/OpenPonk-Spec/OPProjectBrowser.class.st b/repository/OpenPonk-Spec/OPProjectBrowser.class.st
@@ -170,7 +170,7 @@ OPProjectBrowser >> openProject: project [
 
 	project saveInImage.
 	project open.
-	self delete
+	self withWindowDo: [ :window | window close ]
 ]
 
 { #category : 'accessing - spec' }

diff --git a/repository/OpenPonk-Spec/OPProjectExitCommand.class.st b/repository/OpenPonk-Spec/OPProjectExitCommand.class.st
@@ -30,5 +30,6 @@ OPProjectExitCommand >> defaultMenuItemName [
 
 { #category : 'accessing' }
 OPProjectExitCommand >> execute [
-	workbench delete
+
+	workbench close
 ]
diff --git a/repository/OpenPonk-Spec/OPWorkbench.class.st b/repository/OpenPonk-Spec/OPWorkbench.class.st
@@ -114,6 +114,12 @@ OPWorkbench class >> settingsOn: aBuilder [
 	(aBuilder group: #openponk) label: 'OpenPonk'
 ]
 
+{ #category : 'initialize-release' }
+OPWorkbench >> close [
+
+	self withWindowDo: [ :window | window close ]
+]
+
 { #category : 'opening' }
 OPWorkbench >> closeEditorOfDiagram: aDiagram [