Skip to content

Commit 14d91dd

Browse files
committed
fix(model-server): show reference targets in content explorer
1 parent 66eff8e commit 14d91dd

File tree

1 file changed

+9
-11
lines changed

1 file changed

+9
-11
lines changed

model-server/src/main/kotlin/org/modelix/model/server/handlers/ContentExplorer.kt

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -34,17 +34,14 @@ import kotlinx.html.tr
3434
import kotlinx.html.ul
3535
import kotlinx.html.unsafe
3636
import org.modelix.model.ModelFacade
37+
import org.modelix.model.api.INodeResolutionScope
3738
import org.modelix.model.api.ITree
3839
import org.modelix.model.api.PNodeAdapter
3940
import org.modelix.model.api.TreePointer
4041
import org.modelix.model.client.IModelClient
4142
import org.modelix.model.lazy.CLVersion
4243
import org.modelix.model.server.templates.PageWithMenuBar
43-
import kotlin.collections.List
44-
import kotlin.collections.isNotEmpty
45-
import kotlin.collections.mutableListOf
4644
import kotlin.collections.set
47-
import kotlin.collections.toList
4845

4946
class ContentExplorer(private val client: IModelClient, private val repoManager: RepositoriesManager) {
5047

@@ -187,7 +184,7 @@ class ContentExplorer(private val client: IModelClient, private val repoManager:
187184
for (propertyRole in node.getPropertyRoles()) {
188185
tr {
189186
td { +propertyRole }
190-
td { +(node.getPropertyValue(propertyRole) ?: "null") }
187+
td { +"${node.getPropertyValue(propertyRole)}" }
191188
}
192189
}
193190
}
@@ -202,12 +199,13 @@ class ContentExplorer(private val client: IModelClient, private val repoManager:
202199
th { +"Value" }
203200
}
204201
}
205-
for (referenceRole in node.getReferenceRoles()) {
206-
tr {
207-
td { +referenceRole }
208-
td {
209-
// TODO MODELIX-387
210-
// +"${node.getReferenceTarget(referenceRole)}"
202+
INodeResolutionScope.runWithAdditionalScope(node.getArea()) {
203+
for (referenceRole in node.getReferenceRoles()) {
204+
tr {
205+
td { +referenceRole }
206+
td {
207+
+"${node.getReferenceTarget(referenceRole)}"
208+
}
211209
}
212210
}
213211
}

0 commit comments

Comments
 (0)