You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by jo...@apache.org on 2020/06/20 20:38:42 UTC
[isis] branch master updated: ISIS-2350 Only TObjects can be
dragged from EventLogTable
This is an automated email from the ASF dual-hosted git repository.
joergrade pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 191d9bc ISIS-2350 Only TObjects can be dragged from EventLogTable
191d9bc is described below
commit 191d9bc8cfb60262f342adce571bbcbaa5410b37
Author: Jörg Rade <jo...@kuehne-nagel.com>
AuthorDate: Sat Jun 20 22:38:12 2020 +0200
ISIS-2350 Only TObjects can be dragged from EventLogTable
---
.../org/apache/isis/client/kroviz/ui/kv/EventLogTable.kt | 7 ++++---
.../org/apache/isis/client/kroviz/ui/kv/RoIconBar.kt | 15 +--------------
2 files changed, 5 insertions(+), 17 deletions(-)
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/kv/EventLogTable.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/kv/EventLogTable.kt
index 8ee0ec8..9e5fa0d 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/kv/EventLogTable.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/kv/EventLogTable.kt
@@ -1,6 +1,7 @@
package org.apache.isis.client.kroviz.ui.kv
import org.apache.isis.client.kroviz.core.event.LogEntry
+import org.apache.isis.client.kroviz.to.TObject
import org.apache.isis.client.kroviz.ui.EventLogDetail
import pl.treksoft.kvision.core.Border
import pl.treksoft.kvision.core.CssSize
@@ -29,8 +30,8 @@ class EventLogTable(val model: List<LogEntry>) : VPanel() {
}.apply { margin = CssSize(-10, UNIT.px) }
}),
ColumnDefinition<LogEntry>(
- title ="Title",
- field ="title",
+ title = "Title",
+ field = "title",
headerFilter = Editor.INPUT,
width = "450",
formatterComponentFunction = { _, _, data ->
@@ -65,7 +66,7 @@ class EventLogTable(val model: List<LogEntry>) : VPanel() {
style = ButtonStyle.LINK).onClick {
console.log(data)
}
- b.setDragDropData(Constants.format, data.url)
+ if (data.obj is TObject) b.setDragDropData(Constants.format, data.url)
return b
}
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/kv/RoIconBar.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/kv/RoIconBar.kt
index 364430e..77dbf9e 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/kv/RoIconBar.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/kv/RoIconBar.kt
@@ -3,10 +3,7 @@ package org.apache.isis.client.kroviz.ui.kv
import org.apache.isis.client.kroviz.core.event.EventStore
import org.apache.isis.client.kroviz.core.event.ResourceSpecification
import org.apache.isis.client.kroviz.core.model.Exposer
-import org.apache.isis.client.kroviz.to.Action
-import org.apache.isis.client.kroviz.to.Property
import org.apache.isis.client.kroviz.to.TObject
-import org.apache.isis.client.kroviz.to.TransferObject
import org.apache.isis.client.kroviz.ui.kv.MenuFactory.buildForTitle
import org.apache.isis.client.kroviz.utils.IconManager
import org.apache.isis.client.kroviz.utils.Utils
@@ -14,7 +11,6 @@ import pl.treksoft.kvision.core.CssSize
import pl.treksoft.kvision.core.UNIT
import pl.treksoft.kvision.core.Widget
import pl.treksoft.kvision.dropdown.DropDown
-import pl.treksoft.kvision.dropdown.dropDown
import pl.treksoft.kvision.html.Button
import pl.treksoft.kvision.html.ButtonStyle
import pl.treksoft.kvision.panel.SimplePanel
@@ -89,7 +85,7 @@ object RoIconBar : SimplePanel() {
val reSpec = ResourceSpecification(url)
val logEntry = EventStore.find(reSpec)!!
return when (val obj = logEntry.obj) {
- (obj == null) -> null
+ (obj == null) -> null
is TObject -> {
val exp = Exposer(obj)
val ed = exp.dynamise()
@@ -105,15 +101,6 @@ object RoIconBar : SimplePanel() {
initIcon(icon, url, title, "icon-bar-object", icon.buttonId()!!)
icon
}
- is TransferObject -> {
- val icon = DropDown(
- text = "",
- icon = IconManager.find("Unknown"),
- style = ButtonStyle.LIGHT)
- val title = "Generic TransferObject"
- initIcon(icon, url, title, "icon-bar-object", icon.buttonId()!!)
- icon
- }
else -> null
}
}