Projects >> nuxeo-features >>8f763f7a5cfe1080ac86f8920886057f1e2976d9

Chunk
Conflicting content
        VersionIncEditOptions versIncOpts = getVersionIncOptions(
                lifecycleState, type.getName(), docModel);

<<<<<<< HEAD
=======
        // if the rule says to query workflow do so
        if (versIncOpts.getVersioningAction() == VersioningActions.ACTION_QUERY_WORKFLOW) {
            versIncOpts.addInfo("check versioning policy in document workflow");

            final VersioningActions wfvaction = WFVersioningPolicyProvider.getVersioningPolicyFor(docModel);
            versIncOpts.addInfo("wfvaction = " + wfvaction);

            if (wfvaction != null) {
                if (wfvaction == VersioningActions.ACTION_CASE_DEPENDENT) {
                    if (versIncOpts.getOptions() == null
                            || versIncOpts.getOptions().isEmpty()) {
                    versIncOpts.addOption(VersioningActions.ACTION_NO_INCREMENT);
                    versIncOpts.addOption(VersioningActions.ACTION_INCREMENT_MINOR);
                        versIncOpts.addOption(VersioningActions.ACTION_INCREMENT_MAJOR);
                    }
                } else {
                    versIncOpts.clearOptions();
                    // because LE needs options we add the option received from
                    // WF also the rule is that if wf specified an inc option
                    // that one is to be added
                    versIncOpts.addOption(wfvaction);
                    // set default so it will appear selected
                    versIncOpts.setDefaultVersioningAction(wfvaction);
                }
                versIncOpts.setVersioningAction(wfvaction);
            } else {
                log.error("wf action is null");
                versIncOpts.addInfo("wf action is null");
                versIncOpts.setVersioningAction(null);
            }
        }

>>>>>>> 50e0907d4286b6f153ca0ea0f42695d41a582c31
        return versIncOpts;
    }
Solution content
        VersionIncEditOptions versIncOpts = getVersionIncOptions(
                lifecycleState, type.getName(), docModel);
        return versIncOpts;
    }
File
VersioningService.java
Developer's decision
Version 1
Kind of conflict
Comment
If statement