From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Wed, 14 Oct 2020 09:56:33 +0000 (+0000)
Subject: Merge changes Ibf4a6331,I5142a8b6 into release/1.35.3
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=3a427e5c3451ed416c30be41731049df36fdbe81;hp=708dfb62d934f425087f983fecfea0f00c59840d;p=simantics%2Fdistrict.git

Merge changes Ibf4a6331,I5142a8b6 into release/1.35.3

* changes:
  Sorting support for tech type table columns
  Disable editable style from columns other than "Enabled"
---

diff --git a/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph b/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph
index 05321a60..f91e52be 100644
--- a/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph
+++ b/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph
@@ -570,8 +570,6 @@ DN.Mapping.EdgeMapping <T DN.Mapping.Base
         DN.Mapping.HasPropertyRelation DN.Edge.HasInsulationClass
     >-- DN.Mapping.EdgeMapping.ConductanceAttribute --> L0.String <R L0.HasProperty
         DN.Mapping.HasPropertyRelation DN.Edge.HasConductance
-    >-- DN.Mapping.EdgeMapping.ConductivityAttribute --> L0.String <R L0.HasProperty
-        DN.Mapping.HasPropertyRelation DN.Edge.HasConductance
 
 // Allowed connection types
 DN.SupplyConnectionType <T STR.ConnectionType