[midPoint-git] [Evolveum/midpoint] 7673c3: First attempt at custom forms in work items (showi...

[Pavol Mederly]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 7673c360fd63e693857be7743f19f979a6d0dac9
      https://github.com/Evolveum/midpoint/commit/7673c360fd63e693857be7743f19f979a6d0dac9
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-01-28 (Sat, 28 Jan 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/DynamicFormPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItem.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkItemPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkItemPanel.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/Item.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/WfContextUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/common/common-workflows-3.xsd
    M infra/util/src/main/java/com/evolveum/midpoint/util/MiscUtil.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/QNameUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/visualizer/Visualizer.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalRequest.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalRequestImpl.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ItemApprovalProcessInterface.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ItemApprovalSpecificContent.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PcpChildWfTaskCreationInstruction.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/AddAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/ModifyAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/entitlements/AddAssociationAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/objects/AddObjectAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/other/ChangePasswordAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/ApprovalSchemaBuilder.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/PolicyRuleBasedAspect.java

  Log Message:
  -----------
  First attempt at custom forms in work items (showing empty form only now). Limited ability to merge approval schema levels. Functionality to merge PCVs.


  Commit: eb32c458963716410eadf0219d622300c87a2917
      https://github.com/Evolveum/midpoint/commit/eb32c458963716410eadf0219d622300c87a2917
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-01-28 (Sat, 28 Jan 2017)

  Changed paths:
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/util/GuiImplUtil.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/DynamicFieldGroupPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/DynamicFormPanel.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/TestParseForm.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java
    A testing/story/src/test/resources/strings/orgs/2-role-catalog.xml
    A testing/story/src/test/resources/strings/roles-2/a-test-3a.xml
    A testing/story/src/test/resources/strings/roles-2/a-test-3b.xml
    A testing/story/src/test/resources/strings/roles-2/a-test-3x.xml
    A testing/story/src/test/resources/strings/roles-2/a-test-3y.xml
    A testing/story/src/test/resources/strings/roles-2/a-test-4.xml
    A testing/story/src/test/resources/strings/roles/form-user-details.xml
    A testing/story/src/test/resources/strings/roles/metarole-approval-role-approvers-form.xml

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/Evolveum/midpoint + preliminary version of custom forms in approvals

# Conflicts:
#	infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd


  Commit: e47ef8d21cc26ab4a2ab0dd453ba9c659f659f97
      https://github.com/Evolveum/midpoint/commit/e47ef8d21cc26ab4a2ab0dd453ba9c659f659f97
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-01-28 (Sat, 28 Jan 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/DynamicFieldGroupPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/DynamicFormPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItem.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItems.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkItemPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/WorkItemDto.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/ObjectTreeDeltas.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/WfContextUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-workflows-3.xsd
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/WorkflowService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
    M model/workflow-api/src/main/java/com/evolveum/midpoint/wf/api/WorkflowManager.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/WorkflowManagerImpl.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/activiti/dao/WorkItemManager.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/CommonProcessVariableNames.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/Decision.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/InitializeLoopThroughApproversInLevel.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/MidpointUtil.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/RecordIndividualDecision.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/legacy/AbstractWfTestLegacy.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/AbstractWfTestPolicy.java
    M testing/story/src/test/resources/strings/roles-2/a-test-1.xml
    M testing/story/src/test/resources/strings/roles-2/a-test-2a.xml
    M testing/story/src/test/resources/strings/roles-2/a-test-2b.xml
    M testing/story/src/test/resources/strings/roles/metarole-approval-role-approvers-all.xml
    M testing/story/src/test/resources/strings/roles/metarole-approval-role-approvers-first.xml
    M testing/story/src/test/resources/strings/roles/metarole-approval-sod.xml

  Log Message:
  -----------
  Preliminary version of custom forms in approvals


Compare: https://github.com/Evolveum/midpoint/compare/987e0a8ed8fa...e47ef8d21cc2