diff --git a/entity/Task_entity/afterUiInit.js b/entity/Task_entity/afterUiInit.js index bf767e8d66bdf98162be04e45d523c10384d49e9..566c37e5652d388bc77fea8c23183811a2da9f3c 100644 --- a/entity/Task_entity/afterUiInit.js +++ b/entity/Task_entity/afterUiInit.js @@ -1,8 +1,31 @@ import("system.neon"); import("system.vars"); +import("system.neon"); import("ActivityTask_lib"); +import("Keyword_lib"); +import("KeywordRegistry_basic"); -if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW) +var recordState = vars.get("$sys.recordstate"); +if(recordState == neon.OPERATINGSTATE_NEW) { TaskUtils.addLinkRecords("$param.ObjectId_param", "$param.RowId_param", "$param.PresetLinks_param", "$field.PARENT_CONTEXT", "$field.PARENT_ID"); +} +else if (recordState != neon.OPERATINGSTATE_SEARCH) +{ + var statusFilterElement = { + "type":"row", + "name":"STATUS", + "operator":"NOT_EQUAL", + "key":$KeywordRegistry.taskStatus$ended(), + "contenttype": vars.get("$property.STATUS.contentType") + }; + statusFilterElement.value = KeywordUtils.getViewValue($KeywordRegistry.taskStatus(), statusFilterElement.key); + + var filter = { + "type":"group", + "operator":"AND", + "childs": [statusFilterElement] + }; + filter = JSON.stringify(filter); + neon.setFilter("#ENTITY", filter); } \ No newline at end of file diff --git a/neonView/TaskFilter_view/TaskFilter_view.aod b/neonView/TaskFilter_view/TaskFilter_view.aod index bab5b6e34e73604daa3c8b7ddb848c149796e8b5..730b7bc918280e82487643b93249f58f648a13e6 100644 --- a/neonView/TaskFilter_view/TaskFilter_view.aod +++ b/neonView/TaskFilter_view/TaskFilter_view.aod @@ -8,7 +8,7 @@ <name>mytasks</name> <title>My tasks</title> <description>Tasks for which I am responsible</description> - <fragment>Task/filter</fragment> + <fragment>Task/filter?search=eyJ0eXBlIjoiZ3JvdXAiLCJvcGVyYXRvciI6IkFORCIsImNoaWxkcyI6W3sidHlwZSI6InJvdyIsIm5hbWUiOiJTVEFUVVMiLCJvcGVyYXRvciI6Ik5PVF9FUVVBTCIsInZhbHVlIjoiRU5ERUQgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIiwia2V5IjoiRU5ERUQgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIiwiY29udGVudHR5cGUiOiJURVhUIn1dfSXc</fragment> <singleton v="true" /> <requiresConfiguration v="false" /> <storeRoles />