diff --git a/entity/WorkflowDefinition_entity/WorkflowDefinition_entity.aod b/entity/WorkflowDefinition_entity/WorkflowDefinition_entity.aod index 43bd4194877fb2a0fa8ccfd9b7d4385d7d1c5db0..5719de94c66c1f01c91b39451f9d96deb117f2c6 100644 --- a/entity/WorkflowDefinition_entity/WorkflowDefinition_entity.aod +++ b/entity/WorkflowDefinition_entity/WorkflowDefinition_entity.aod @@ -194,6 +194,9 @@ </entityParameter> </children> </entityConsumer> + <entityField> + <name>VERSION_TITLE</name> + </entityField> </entityFields> <recordContainers> <jDitoRecordContainer> @@ -234,6 +237,9 @@ <jDitoRecordFieldMapping> <name>DESCRIPTION.value</name> </jDitoRecordFieldMapping> + <jDitoRecordFieldMapping> + <name>VERSION_TITLE.value</name> + </jDitoRecordFieldMapping> </recordFieldMappings> </jDitoRecordContainer> </recordContainers> diff --git a/entity/WorkflowDefinition_entity/entityfields/diagram/valueProcess.js b/entity/WorkflowDefinition_entity/entityfields/diagram/valueProcess.js index 732cf42d0b882149fc1e4dad9234383106637c06..a9231e7044d7ab9e4331809c863662b08f525404 100644 --- a/entity/WorkflowDefinition_entity/entityfields/diagram/valueProcess.js +++ b/entity/WorkflowDefinition_entity/entityfields/diagram/valueProcess.js @@ -3,5 +3,5 @@ import("system.result"); import("system.neon"); import("system.workflow"); -if (vars.get("$sys.viewmode") == neon.FRAME_VIEWMODE_DATASET && vars.get("$sys.recordstate") == neon.OPERATINGSTATE_VIEW && vars.get("$field.VERSION")) +if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_VIEW && vars.get("$field.VERSION")) result.string(workflow.getProcessDiagram(vars.get("$field.UID"))); \ No newline at end of file diff --git a/entity/WorkflowDefinition_entity/recordcontainers/jdito/contentProcess.js b/entity/WorkflowDefinition_entity/recordcontainers/jdito/contentProcess.js index 6523e43702e8fd2ac39f3fbc8222069d5abd4eff..aff0261cf5187f58d2b66bafd7d223034036e2a4 100644 --- a/entity/WorkflowDefinition_entity/recordcontainers/jdito/contentProcess.js +++ b/entity/WorkflowDefinition_entity/recordcontainers/jdito/contentProcess.js @@ -1,3 +1,4 @@ +import("system.translate"); import("KeywordRegistry_basic"); import("system.vars"); import("system.result"); @@ -50,7 +51,8 @@ result.object((function () def.key, def.version, def.active, - def.description || "" + def.description || "", + translate.withArguments("Version %0", [def.version]) ]; }); diff --git a/neonView/WorkflowDefinitionFilter_view/WorkflowDefinitionFilter_view.aod b/neonView/WorkflowDefinitionFilter_view/WorkflowDefinitionFilter_view.aod index 20bba3477ed256945986f4fd72c6f3e034e01413..72d74e806524ebeb8368af01869eef0d22a9e8eb 100644 --- a/neonView/WorkflowDefinitionFilter_view/WorkflowDefinitionFilter_view.aod +++ b/neonView/WorkflowDefinitionFilter_view/WorkflowDefinitionFilter_view.aod @@ -4,9 +4,9 @@ <majorModelMode>DISTRIBUTED</majorModelMode> <filterable v="true" /> <layout> - <boxLayout> + <groupLayout> <name>layout</name> - </boxLayout> + </groupLayout> </layout> <children> <tableViewTemplate> @@ -35,5 +35,15 @@ </neonTableColumn> </columns> </tableViewTemplate> + <tilesViewTemplate> + <name>Tiles</name> + <iconField>DIAGRAM</iconField> + <titleField>NAME</titleField> + <descriptionField>DESCRIPTION</descriptionField> + <infoTopField>VERSION_TITLE</infoTopField> + <favoriteActionGroup1>tableActions</favoriteActionGroup1> + <entityField>#ENTITY</entityField> + <isCreatable v="true" /> + </tilesViewTemplate> </children> </neonView>