Issue 11609 fixes mssql #13239

jdotcms · 2017-12-19T18:10:10Z

No description provided.

…ate table and other minor changes.

…the scheme

…ctions, etc

…, unlocked and both choices

…hemes

…, it is deleted

…s-mssql

…n on mssql

CLAassistant · 2017-12-19T18:10:18Z

Thank you for your submission, we really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
2 out of 3 committers have signed the CLA.

✅ oswaldogallango
✅ jcastro-dotcms
❌ Jonathan

Jonathan seems not to be a GitHub user. You need a GitHub account to be able to sign the CLA. If you have already a GitHub account, please add the email address used for this commit to your account.
_{You have signed the CLA already but the status is still pending? Let us recheck it.}

dev-dotcms · 2017-12-19T18:16:56Z

dotCMS/src/main/java/com/dotmarketing/portlets/workflows/business/WorkflowAPI.java

-import com.dotmarketing.portlets.workflows.model.WorkflowSearcher;
-import com.dotmarketing.portlets.workflows.model.WorkflowStep;
-import com.dotmarketing.portlets.workflows.model.WorkflowTask;
+import com.dotmarketing.portlets.workflows.model.*;
 import com.liferay.portal.model.User;

 public interface WorkflowAPI {


Move constants to a class or enum.

dev-dotcms · 2017-12-19T18:16:56Z

dotCMS/src/main/java/com/dotmarketing/portlets/workflows/business/WorkflowAPI.java

 import com.liferay.portal.model.User;

 public interface WorkflowAPI {

+	public static final Set<WorkflowStatus> DEFAULT_SHOW_ON = EnumSet.of(WorkflowStatus.LOCKED, WorkflowStatus.UNLOCKED);


Move "DEFAULT_SHOW_ON" to a class and lower its visibility

it is share between other object and need the visibility to be use as a part of the biz rule

dev-dotcms · 2017-12-19T18:16:57Z

SonarQube analysis reported 4 issues

1 critical
1 major
2 minor

Watch the comments in this conversation to review them.

dev-dotcms · 2017-12-19T18:16:57Z

dotCMS/src/main/java/com/dotmarketing/portlets/workflows/model/WorkflowStatus.java

+                        .<String>of(value.toString().split(DELIMITER))
+                        .map(WorkflowStatus::valueOf)
+                        .collect(Collectors.toSet());
+            } catch (Exception e) {


Either log or rethrow this exception.
Catch a list of specific exception subtypes instead.

no specific one, so

nollymar · 2017-12-19T18:18:01Z

dotCMS/src/main/java/com/dotcms/util/ConversionUtils.java

@@ -213,4 +214,17 @@ public static boolean toBoolean(final String strBool, final boolean defaultBool)
 		}
 	}

+	/**
+	 * Based on a value get from the database, if it is a boolean will returns a cast.
+	 * Otherwise will use the {@link DbConnectionFactory} to determinate the boolean value cross-db


"Otherwise, it will use .... to determine"

nollymar · 2017-12-19T18:19:00Z

dotCMS/src/main/java/com/dotcms/util/ConversionUtils.java

@@ -213,4 +214,17 @@ public static boolean toBoolean(final String strBool, final boolean defaultBool)
 		}
 	}

+	/**
+	 * Based on a value get from the database, if it is a boolean will returns a cast.


"Based on a value obtained from database, if it is a boolean will return a cast"

jcastro-dotcms and others added 30 commits November 6, 2017 09:41

#11609 : Updating DB scripts. Adding upgrade task to create intermedi…

9525217

…ate table and other minor changes.

#11609 added first draft for add/edit workflow action

f285dc8

#11609 merge done

8a6444a

#11609 almost code done for save/edit workflow actions associated to …

ce25b42

…the scheme

#11609 the add action and action to step are done

60ef0e7

#11609 Added the delete steps and dependencies/minor fixes for transa…

eeb4172

…ctions, etc

#11609 delete action from step done in the ui/ajax and endpoint

0929145

#11609 Added the deletes for the UI

1f17c62

#12960 changes for reorder done

4cd30de

#13104 Added the new field requires lock options that supports locked…

fe70d6c

…, unlocked and both choices

#12960 added the scripts changes for all dbs

677079c

#12960 MERGE MASTER DONE

161c206

#12960 added changes for the workflow, action and step new relationships

ab38919

#12960 merge done

d30507c

#12960 notes and fixes

4992dd9

#12960 fixing the IT test

df465db

#12960 code review feedback

f558a7b

#11691 added changes for the new endpoint for getting content type sc…

329da3e

…hemes

#12960 added changes for h2 and mysql

a0fbd9c

#12960 added the changes for the show_on column

82e3837

#12960 adding changes for the showOn

96c6ceb

#12960 merge done

6a709f4

#12960 changes for show on functionality

c4d12df

resolving the error of the missing schemeid

92347c1

solving issue with content resource test

5ab4a08

Fixing the Task04305UpdateWorkflowActionTable

694375b

Reverting to master configuration

62e4317

#12960 merge done

6caba12

#12960 fixing postgres and oracle UT

43483c8

#11609 fixes for 11609

cc1cde1

Jonathan added 9 commits December 14, 2017 10:41

#11609 merge done

8f0b9bf

#11609 configuration rollback

0261f20

#11609 fixes by code review

ff87ab2

#13208 now when there is a wrong workflow task associated to the step…

71bac80

…, it is deleted

#13208 merge master done

dd52111

#11690 fixes for show_on

12c54fa

Merge branch 'master' of github.com:dotCMS/core into issue-11609-fixe…

e2ee88e

…s-mssql

#11609 Fixes for the indexer that could not convert a short to boolea…

ad8f3cd

…n on mssql

#11609 rollback enterprise reference

c834fab

#11609 removing unnecessary change

058930d

dev-dotcms reviewed Dec 19, 2017

View reviewed changes

nollymar reviewed Dec 19, 2017

View reviewed changes

#11609 feedback changes

85dfe15

jgambarios approved these changes Dec 19, 2017

View reviewed changes

#11609 fixing the log level

fa246ba

jgambarios merged commit 5e2fd07 into master Dec 19, 2017

jgambarios deleted the issue-11609-fixes-mssql branch December 19, 2017 18:45

jgambarios mentioned this pull request Dec 19, 2017

DB: Workflow Actions should have a many-to-many relationship with workflow steps #11609

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Issue 11609 fixes mssql #13239

Issue 11609 fixes mssql #13239

jdotcms commented Dec 19, 2017

CLAassistant commented Dec 19, 2017 •

edited

Loading

dev-dotcms Dec 19, 2017

dev-dotcms Dec 19, 2017

jdotcms Dec 19, 2017

dev-dotcms commented Dec 19, 2017

dev-dotcms Dec 19, 2017

jdotcms Dec 19, 2017

nollymar Dec 19, 2017

jdotcms Dec 19, 2017

nollymar Dec 19, 2017

jdotcms Dec 19, 2017

Issue 11609 fixes mssql #13239

Issue 11609 fixes mssql #13239

Conversation

jdotcms commented Dec 19, 2017

CLAassistant commented Dec 19, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dev-dotcms commented Dec 19, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

CLAassistant commented Dec 19, 2017 •

edited

Loading