bring back download data/assets changes #13422

erickgonzalez · 2018-01-17T21:46:15Z

No description provided.

dev-dotcms · 2018-01-17T21:50:58Z

.../src/main/java/com/dotmarketing/portlets/cmsmaintenance/action/ViewCMSMaintenanceAction.java

+					else if(MultiTree.class.equals(clazz)){
+						_dh.setQuery("from " + clazz.getName() + " order by parent1, parent2, child, relation_type");
+					}
+					else if(TagInode.class.equals(clazz)){


Move this "else" on the same line that the previous closing curly brace.

dev-dotcms · 2018-01-17T21:50:58Z

.../src/main/java/com/dotmarketing/portlets/cmsmaintenance/action/ViewCMSMaintenanceAction.java

+
+			/* Run Liferay's Tables */
+			/* Companies */
+			_list = PublicCompanyFactory.getCompanies();


Remove this use of "PublicCompanyFactory"; it is deprecated.

dev-dotcms · 2018-01-17T21:50:59Z

.../src/main/java/com/dotmarketing/portlets/cmsmaintenance/action/ViewCMSMaintenanceAction.java

+
+			/* pollsdisplay */
+			dc.setSQL("select * from pollsdisplay");
+			_list = dc.getResults();


Remove this use of "getResults"; it is deprecated.

dev-dotcms · 2018-01-17T21:50:59Z

.../src/main/java/com/dotmarketing/portlets/cmsmaintenance/action/ViewCMSMaintenanceAction.java

+			/* Run Liferay's Tables */
+			/* Companies */
+			_list = PublicCompanyFactory.getCompanies();
+			List<Company> companies = new ArrayList<Company>(_list);


Replace the type specification in this constructor call with the diamond operator ("<>").
Remove this unused "companies" local variable.

dev-dotcms · 2018-01-17T21:51:00Z

.../src/main/java/com/dotmarketing/portlets/cmsmaintenance/action/ViewCMSMaintenanceAction.java

+			while (it.hasNext()) {
+				Map.Entry pairs = (Map.Entry) it.next();
+				Class x = (Class) pairs.getKey();
+				if (!x.equals(Inode.class) && !x.equals(Clickstream.class) && !x.equals(ClickstreamRequest.class) && !x.equals(Clickstream404.class))


Missing curly brace.

dev-dotcms · 2018-01-17T21:51:00Z

.../src/main/java/com/dotmarketing/portlets/cmsmaintenance/action/ViewCMSMaintenanceAction.java

+					else if(TagInode.class.equals(clazz)){
+						_dh.setQuery("from " + clazz.getName() + " order by inode, tag_id");
+					}
+					else if(Tag.class.equals(clazz)){


Move this "else" on the same line that the previous closing curly brace.

dev-dotcms · 2018-01-17T21:51:00Z

.../src/main/java/com/dotmarketing/portlets/cmsmaintenance/action/ViewCMSMaintenanceAction.java

+			_list = PublicCompanyFactory.getCompanies();
+			List<Company> companies = new ArrayList<Company>(_list);
+			_xstream = new XStream(new DomDriver());
+			_writing = new File(backupTempFilePath + "/" + Company.class.getName() + ".xml");


Remove this hard-coded path-delimiter.

dev-dotcms · 2018-01-17T21:51:01Z

.../src/main/java/com/dotmarketing/portlets/cmsmaintenance/action/ViewCMSMaintenanceAction.java

+					else if(Tag.class.equals(clazz)){
+						_dh.setQuery("from " + clazz.getName() + " order by tag_id, tagname");
+					}
+					else if(CalendarReminder.class.equals(clazz)){


Move this "else" on the same line that the previous closing curly brace.

dev-dotcms · 2018-01-17T21:51:02Z

.../src/main/java/com/dotmarketing/portlets/cmsmaintenance/action/ViewCMSMaintenanceAction.java

+
+			}
+
+			XStream _xstream = null;


Rename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.

dev-dotcms · 2018-01-17T21:51:02Z

.../src/main/java/com/dotmarketing/portlets/cmsmaintenance/action/ViewCMSMaintenanceAction.java

+			}
+
+			XStream _xstream = null;
+			HibernateUtil _dh = null;


Rename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.

dev-dotcms · 2018-01-17T21:51:03Z

.../src/main/java/com/dotmarketing/portlets/cmsmaintenance/action/ViewCMSMaintenanceAction.java

+					else if(CalendarReminder.class.equals(clazz)){
+						_dh.setQuery("from " + clazz.getName() + " order by user_id, event_id, send_date");
+					}
+					else if(Identifier.class.equals(clazz)){


Move this "else" on the same line that the previous closing curly brace.

dev-dotcms · 2018-01-17T21:51:03Z

.../src/main/java/com/dotmarketing/portlets/cmsmaintenance/action/ViewCMSMaintenanceAction.java

+
+			/* portlet_preferences */
+
+			try{


Extract this nested try block into a separate method.

dev-dotcms · 2018-01-17T21:51:04Z

.../src/main/java/com/dotmarketing/portlets/cmsmaintenance/action/ViewCMSMaintenanceAction.java

+			XStream _xstream = null;
+			HibernateUtil _dh = null;
+			DotConnect dc = null;
+			List _list = null;


Rename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.

dev-dotcms · 2018-01-17T21:51:04Z

.../src/main/java/com/dotmarketing/portlets/cmsmaintenance/action/ViewCMSMaintenanceAction.java

+			HibernateUtil _dh = null;
+			DotConnect dc = null;
+			List _list = null;
+			File _writing = null;


Rename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.

dev-dotcms · 2018-01-17T21:51:05Z

.../src/main/java/com/dotmarketing/portlets/cmsmaintenance/action/ViewCMSMaintenanceAction.java

+
+			try{
+				_list = PortletPreferencesLocalManagerUtil.getPreferences();
+			}catch(Exception e){


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

dev-dotcms · 2018-01-17T21:51:05Z

.../src/main/java/com/dotmarketing/portlets/cmsmaintenance/action/ViewCMSMaintenanceAction.java

+			DotConnect dc = null;
+			List _list = null;
+			File _writing = null;
+			BufferedOutputStream _bout = null;


Rename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.

dev-dotcms · 2018-01-17T21:51:06Z

.../src/main/java/com/dotmarketing/portlets/cmsmaintenance/action/ViewCMSMaintenanceAction.java

+
+			/* pollsquestion */
+			dc.setSQL("select * from pollsquestion");
+			_list = dc.getResults();


Remove this use of "getResults"; it is deprecated.

dev-dotcms · 2018-01-17T21:51:06Z

.../src/main/java/com/dotmarketing/portlets/cmsmaintenance/action/ViewCMSMaintenanceAction.java

+			File _writing = null;
+			BufferedOutputStream _bout = null;
+
+			for (Class clazz : _tablesToDump) {


Reduce the total number of break and continue statements in this loop to use at most one.

dev-dotcms · 2018-01-17T21:51:07Z

.../src/main/java/com/dotmarketing/portlets/cmsmaintenance/action/ViewCMSMaintenanceAction.java

+			BufferedOutputStream _bout = null;
+
+			for (Class clazz : _tablesToDump) {
+				if(clazz.equals(Structure.class) || clazz.equals(Field.class) || clazz.equals(FieldVariable.class)){


Remove this use of "Field"; it is deprecated.
Remove this use of "FieldVariable"; it is deprecated.

dev-dotcms · 2018-01-17T21:51:07Z

.../src/main/java/com/dotmarketing/portlets/cmsmaintenance/action/ViewCMSMaintenanceAction.java

+			_list = APILocator.getUserAPI().findAllUsers();
+			_list.add(APILocator.getUserAPI().getDefaultUser());
+			_xstream = new XStream(new DomDriver());
+			_writing = new File(backupTempFilePath + "/" + User.class.getName() + ".xml");


Remove this hard-coded path-delimiter.

dev-dotcms · 2018-01-17T21:51:07Z

.../src/main/java/com/dotmarketing/portlets/cmsmaintenance/action/ViewCMSMaintenanceAction.java

@@ -244,11 +277,46 @@ else if(cmd.equals("dropoldassets")){
 			boolean dataOnly = Parameter.getBooleanFromString(req.getParameter("dataOnly"), true);

 			if(cmd.equals("createZip")) {


Convert this "if/else if" structure into a "switch".

dev-dotcms · 2018-01-17T21:51:08Z

.../src/main/java/com/dotmarketing/portlets/cmsmaintenance/action/ViewCMSMaintenanceAction.java

+						_list = _dh.list();
+					}
+
+					if(_list.size() ==0){


Use isEmpty() to check whether the collection is empty or not.

dev-dotcms · 2018-01-17T21:51:08Z

.../src/main/java/com/dotmarketing/portlets/cmsmaintenance/action/ViewCMSMaintenanceAction.java

+					}
+
+					if(_list.size() ==0){
+						try {


Refactor this code to not nest more than 4 if/for/while/switch/try statements.
Extract this nested try block into a separate method.

dev-dotcms · 2018-01-17T21:51:09Z

.../src/main/java/com/dotmarketing/portlets/cmsmaintenance/action/ViewCMSMaintenanceAction.java

+
+			/* pollsvote */
+			dc.setSQL("select * from pollsvote");
+			_list = dc.getResults();


Remove this use of "getResults"; it is deprecated.

dev-dotcms · 2018-01-17T21:51:09Z

.../src/main/java/com/dotmarketing/portlets/cmsmaintenance/action/ViewCMSMaintenanceAction.java

+						try {
+							_bout.close();
+						}
+						catch( java.lang.NullPointerException npe){}


Avoid catching NullPointerException.
Either log or rethrow this exception.
Either remove or fill this block of code.
Move this "catch" on the same line that the previous closing curly brace.

dev-dotcms · 2018-01-17T21:51:09Z

.../src/main/java/com/dotmarketing/portlets/cmsmaintenance/action/ViewCMSMaintenanceAction.java

+				}
+				message = "Creating XML Files. ";
+				createXMLFiles();
+				String x = UtilMethods.dateToJDBC(new Date()).replace(':', '-').replace(' ', '_');


Use the Java 8 Date and Time API instead.

dev-dotcms · 2018-01-17T21:51:10Z

.../src/main/java/com/dotmarketing/portlets/cmsmaintenance/action/ViewCMSMaintenanceAction.java

+
+			/* counter */
+			dc.setSQL("select * from counter");
+			_list = dc.getResults();


Remove this use of "getResults"; it is deprecated.

dev-dotcms · 2018-01-17T21:51:10Z

.../src/main/java/com/dotmarketing/portlets/cmsmaintenance/action/ViewCMSMaintenanceAction.java

+						break;
+					}
+
+					if(_list != null && _list.size() > 0 && _list.get(0) instanceof Comparable){


Use isEmpty() to check whether the collection is empty or not.

dev-dotcms · 2018-01-17T21:51:11Z

.../src/main/java/com/dotmarketing/portlets/cmsmaintenance/action/ViewCMSMaintenanceAction.java


+//			}else if(cmd.equals("wipeOutDotCMSDatabase")) {


This block of commented-out lines of code should be removed.

dev-dotcms · 2018-01-17T21:51:11Z

.../src/main/java/com/dotmarketing/portlets/cmsmaintenance/action/ViewCMSMaintenanceAction.java

+						java.util.Collections.sort(_list);
+					}
+
+					_writing = new File(backupTempFilePath + "/" + clazz.getName() + "_" + formatter.format(i) + ".xml");


Remove this hard-coded path-delimiter.

dev-dotcms · 2018-01-17T21:51:12Z

.../src/main/java/com/dotmarketing/portlets/cmsmaintenance/action/ViewCMSMaintenanceAction.java


+//			}else if(cmd.equals("wipeOutDotCMSDatabase")) {
+//
+//				message = "Deleted dotCMS Database";


This block of commented-out lines of code should be removed.

dev-dotcms · 2018-01-17T21:51:12Z

.../src/main/java/com/dotmarketing/portlets/cmsmaintenance/action/ViewCMSMaintenanceAction.java

+
+				/*
+				 * String _shortClassName =
+				 * clazz.getName().substring(clazz.getName().lastIndexOf("."),clazz.getName().length());


This block of commented-out lines of code should be removed.

dev-dotcms · 2018-01-17T21:51:12Z

.../src/main/java/com/dotmarketing/portlets/cmsmaintenance/action/ViewCMSMaintenanceAction.java

+
+			/* counter */
+			dc.setSQL("select * from address");
+			_list = dc.getResults();


Remove this use of "getResults"; it is deprecated.

dev-dotcms · 2018-01-17T21:51:13Z

.../src/main/java/com/dotmarketing/portlets/cmsmaintenance/action/ViewCMSMaintenanceAction.java

+//				message = "Deleted dotCMS Database";
+//				deleteDotCMS();
+
+			}else if(cmd.equals("downloadZip")) {


Move the "downloadZip" string literal on the left side of this string comparison.

dev-dotcms · 2018-01-17T21:51:13Z

.../src/main/java/com/dotmarketing/portlets/cmsmaintenance/action/ViewCMSMaintenanceAction.java

+				 * xstream.alias(_shortClassName, clazz);
+				 */
+				int i= 0;
+				int step = 1000;


Assign this magic number 1000 to a well-named constant, and use the constant instead.

dev-dotcms · 2018-01-17T21:51:14Z

.../src/main/java/com/dotmarketing/portlets/cmsmaintenance/action/ViewCMSMaintenanceAction.java

+
+					total = total + _list.size();
+
+					try {


Extract this nested try block into a separate method.

* Updating commit reference for src/main/enterprise * #13309 - Changes in the Upsert Command for Postgres -9.4 (#13403) * #13309 - Changes in the Upsert Command for Postgres -9.4 * #13309 - Changes in the Upsert Command for Postgres -9.4 * Can't save new containers in a layout (#13377) * Can't save new containers in a layout * refactoring * refactoring * merge * doing constructor public again * refactoring * refactoring * #13196 (#13405) * Wrong type #13196 (#13406) * Issue 13352 dnd on workflow (#13382) * #13352 adding drag and drop to workflow builder * #13352 cool new hover trick * #13352 we didn't need api changed * #13352 * Add message key (#13412) * #12991 Need to add action of push publish to content types * #13236 Edit contentlets in page (#13400) js changes * bring back download data/assets changes (#13422) * #13395 CopyContentlet done (#13415) * Fix more jenkins tests (#13427) * Updating commit reference for src/main/enterprise * PermissionAPITest: converted from functional to integration RoleAjax: remove unused user. Can now be tested with server down UserAPITest: fix workflow issues FolderAPITest: fix workflow issues LinkFactoryTest: fix workflow issues ContainerFactoryImpl: Reading version info from api instead of only cache. * #13410 MSSQL Task 04315 Upgrade Fix (#13423) * #13410 MSSQL Task 04315 Upgrade Fix * #13410 MSSQL Task 04315 Upgrade Fix * #13321: Clearing cache to force DB search (#13431) * Remove permission tests from alltestsuite (#13434) * Updating commit reference for src/main/enterprise * PermissionAPITest: converted from functional to integration RoleAjax: remove unused user. Can now be tested with server down UserAPITest: fix workflow issues FolderAPITest: fix workflow issues LinkFactoryTest: fix workflow issues ContainerFactoryImpl: Reading version info from api instead of only cache. * Remove ITest from AllTestSuite. * #13424 fixes the mysql lockup issue (#13426) * #13424 fixes the mysql lockup issue * #13424 closes the preparedstatement * #13241 rethrow the original exception (#13416) * Updating commit reference for src/main/enterprise * Fix TreeTransformer for Oracle. (#13439) * #13433 bring back Backup Data/Assets functionality (#13442) * Added new starter * #13321: Avoiding factory method with API find call inside (#13443) * #13429 (#13432) * Updating commit reference for src/main/enterprise * Added new starter * Clean folderapitest rename (#13456) * Fix TreeTransformer for Oracle. * Dont mess with cache in the test. FolderAPITest.rename * #13384 - Delete Template dependencies popup should display Template Title (#13455) * Workflows tests fixes (#13460) * Workflows tests fixes * Workflows tests fixes * Workflows tests - Adding missing condition (#13461) * #13196 fixing ut for oracle (#13463) * #13196 fixes for upgrade task for msssql (#13462) * Issue 12991 need to add actions push publish content types (#13444) * issue #12991 push publish content types message keys * #12991 push publish content types actions message keys * #12991 push publish content types message keys * Issue 13457 (#13465) * #13457: Remove unused logic * #13457: Add copyTemplate integration test * #13419: Prevent NPE by avoiding Layout parsing when Template not drawn (#13458) * #13419: Prevent NPE by avoiding Layout parsing when Template not drawed * #13419: Adding Will's logic from no-code branch * #12999 - Added MultiTree Transformer (#13438) * #12999 - Added MultiTree Transformer * #12999 - MultiTree Transformer test and fixes * #12999 - MultiTree Transformer test and fixes * #12999 - MultiTree Transformer test and fixes * #12999 - MultiTree Transformer test and fixes * #12999 - MultiTree Transformer test and fixes * Fix condition check for user api test. More Logging. (#13473) * #13474 Include lang properties changes. (#13476) * Workflows tests - Fixing permissions (#13477) * error common label (#13467) * Include working:true in es query for reindexing content after updating user. Use isInodeIndex with live=false. (#13479) * #13390 cherry-pick the email fix (#13484) * Updating commit reference for src/main/enterprise * http://#13295 set sidebar width in edit layout - Message keys (#13480) * Include more logging for FolderAPITest.delete (#13488) * Issue rest multiple binaries (#13472) * #11620 * #11613 * #13466 - Fixes in Update System Folder when System folder has been re… (#13486) * #13466 - Fixes in Update System Folder when System folder has been renamed * #13466 - Fixes in Update System Folder when System folder has been renamed * Folderapitest rename logging (#13491) * Include more logging for FolderAPITest.delete * more logging. * Adding missing validation (#13489) * Adding missing validation * Fixing Typo * Logging for FolderAPITest.delete * UserAPITest.delete:Load Identifiers from db to avoid cache race conditions. * Issue 13336 (#13487) * #13336 remove CMIS * #13336 remove commented code * #13336 changes DBSearch * #13336 revert changes DBSearch * #13336 missing assignment * Updating commit reference for src/main/enterprise * Issue 13429 missing commit tika lowercase (#13501) * #13429 * missing lowercase * ESUtils: include case for text with whitespace (#13499) ESUtilsTest: test for all special chars and whitespace * Updating commit reference for src/main/enterprise * #13375 - Folder API - Incorrect Query causing cartesian product and o… (#13493) * #13375 - Folder API - Incorrect Query causing cartesian product and out of memory or closed resultsets errors * #13375 - Folder API - Incorrect Query causing cartesian product and out of memory or closed resultsets errors * #10604 add hover options for span tags in website browser (#13490) * #12991 push publish content types - Messages keys (#13500) * Issue 13502 npe on deleted bundle (#13503) * #13429 * fixes #13502 * Use new ami (#13511) * ContentResource: Pass value of REST_API_CONTENT_ALLOW_FRONT_END_SAVIN… (#13510) * ContentResource: Pass value of REST_API_CONTENT_ALLOW_FRONT_END_SAVING to methods to find cats by key or name ContentResourceTest: Added two tests for both cases (true/false) for REST_API_CONTENT_ALLOW_FRONT_END_SAVING when saving content via REST API with anonymous user * #12150 Correct test name. * #12150 Code review changes. * Update ami jenkins (#13512) * Use new ami * New AMI for jenkins continuous tests. * Include isInodeIndexed in test. * Issue 13469 workflow multi lang (#13509) * #13469 multi language support for workflow task * #13469 Adding the multi language step/action workflows * #13469 codacy feedback * Issue 11265 create 4 eyes workflow actionlet (#13366) * #11265 : Adding initial version of the 4-Eyes actionlet. * #11265 : Adding initial version of the 4-Eyes actionlet. * #11265 : - Wrapping up changes in the 4-eyes approval actionlet class. - Adding utility class for common-use methods in actionlets. * #11265 : Adding new type of actionlet parameter that includes validation of role keys. * #11265 : Codacy and Sonar code changes. * #11265 : More Codacy and Sonar code changes. * #11265 : First draft of integration test. Fixing exception throws where the original exception was being swallowed. * #11265 : Adding more tests to the four-eye sub-action integration test. * #13333 need to add action of add to bundle to content types - Adding message keus (#13516) * Missing import * Fix TreeTransformer and ContentletTransformer (#13518) TreeTransformer: Use conversion utils instead of a class for Oracle. TransformerLocator: create only TreeTransformer ContentletTransformer: Use conversion utils to avoid classCastException in oracle * #13375 fix starting up oracle, bc join never finds inode column (#13519) * Remove invalid import. * Fixing failing Jenkins tests. (#13517) * changes to build docker image from gradle file - still need to upgrade gradle wrapper version * cosmetic commit to build.gradle * changed docker tags and added blank line at end of file * upgraded gradle wrapper to 4.4.1 * 4.4.1 gradle wrapper * added reference comment * fixes #13527

* fixes #13435 - changed so rename only happens based on ARCHIVE_IMPORTED_LICENSE_PACKS being true. Also logs failure if appropriate. (#13464) * Issue 13527 build docker image from gradle build (#13529) * Updating commit reference for src/main/enterprise * #13309 - Changes in the Upsert Command for Postgres -9.4 (#13403) * #13309 - Changes in the Upsert Command for Postgres -9.4 * #13309 - Changes in the Upsert Command for Postgres -9.4 * Can't save new containers in a layout (#13377) * Can't save new containers in a layout * refactoring * refactoring * merge * doing constructor public again * refactoring * refactoring * #13196 (#13405) * Wrong type #13196 (#13406) * Issue 13352 dnd on workflow (#13382) * #13352 adding drag and drop to workflow builder * #13352 cool new hover trick * #13352 we didn't need api changed * #13352 * Add message key (#13412) * #12991 Need to add action of push publish to content types * #13236 Edit contentlets in page (#13400) js changes * bring back download data/assets changes (#13422) * #13395 CopyContentlet done (#13415) * Fix more jenkins tests (#13427) * Updating commit reference for src/main/enterprise * PermissionAPITest: converted from functional to integration RoleAjax: remove unused user. Can now be tested with server down UserAPITest: fix workflow issues FolderAPITest: fix workflow issues LinkFactoryTest: fix workflow issues ContainerFactoryImpl: Reading version info from api instead of only cache. * #13410 MSSQL Task 04315 Upgrade Fix (#13423) * #13410 MSSQL Task 04315 Upgrade Fix * #13410 MSSQL Task 04315 Upgrade Fix * #13321: Clearing cache to force DB search (#13431) * Remove permission tests from alltestsuite (#13434) * Updating commit reference for src/main/enterprise * PermissionAPITest: converted from functional to integration RoleAjax: remove unused user. Can now be tested with server down UserAPITest: fix workflow issues FolderAPITest: fix workflow issues LinkFactoryTest: fix workflow issues ContainerFactoryImpl: Reading version info from api instead of only cache. * Remove ITest from AllTestSuite. * #13424 fixes the mysql lockup issue (#13426) * #13424 fixes the mysql lockup issue * #13424 closes the preparedstatement * #13241 rethrow the original exception (#13416) * Updating commit reference for src/main/enterprise * Fix TreeTransformer for Oracle. (#13439) * #13433 bring back Backup Data/Assets functionality (#13442) * Added new starter * #13321: Avoiding factory method with API find call inside (#13443) * #13429 (#13432) * Updating commit reference for src/main/enterprise * Added new starter * Clean folderapitest rename (#13456) * Fix TreeTransformer for Oracle. * Dont mess with cache in the test. FolderAPITest.rename * #13384 - Delete Template dependencies popup should display Template Title (#13455) * Workflows tests fixes (#13460) * Workflows tests fixes * Workflows tests fixes * Workflows tests - Adding missing condition (#13461) * #13196 fixing ut for oracle (#13463) * #13196 fixes for upgrade task for msssql (#13462) * Issue 12991 need to add actions push publish content types (#13444) * issue #12991 push publish content types message keys * #12991 push publish content types actions message keys * #12991 push publish content types message keys * Issue 13457 (#13465) * #13457: Remove unused logic * #13457: Add copyTemplate integration test * #13419: Prevent NPE by avoiding Layout parsing when Template not drawn (#13458) * #13419: Prevent NPE by avoiding Layout parsing when Template not drawed * #13419: Adding Will's logic from no-code branch * #12999 - Added MultiTree Transformer (#13438) * #12999 - Added MultiTree Transformer * #12999 - MultiTree Transformer test and fixes * #12999 - MultiTree Transformer test and fixes * #12999 - MultiTree Transformer test and fixes * #12999 - MultiTree Transformer test and fixes * #12999 - MultiTree Transformer test and fixes * Fix condition check for user api test. More Logging. (#13473) * #13474 Include lang properties changes. (#13476) * Workflows tests - Fixing permissions (#13477) * error common label (#13467) * Include working:true in es query for reindexing content after updating user. Use isInodeIndex with live=false. (#13479) * #13390 cherry-pick the email fix (#13484) * Updating commit reference for src/main/enterprise * http://#13295 set sidebar width in edit layout - Message keys (#13480) * Include more logging for FolderAPITest.delete (#13488) * Issue rest multiple binaries (#13472) * #11620 * #11613 * #13466 - Fixes in Update System Folder when System folder has been re… (#13486) * #13466 - Fixes in Update System Folder when System folder has been renamed * #13466 - Fixes in Update System Folder when System folder has been renamed * Folderapitest rename logging (#13491) * Include more logging for FolderAPITest.delete * more logging. * Adding missing validation (#13489) * Adding missing validation * Fixing Typo * Logging for FolderAPITest.delete * UserAPITest.delete:Load Identifiers from db to avoid cache race conditions. * Issue 13336 (#13487) * #13336 remove CMIS * #13336 remove commented code * #13336 changes DBSearch * #13336 revert changes DBSearch * #13336 missing assignment * Updating commit reference for src/main/enterprise * Issue 13429 missing commit tika lowercase (#13501) * #13429 * missing lowercase * ESUtils: include case for text with whitespace (#13499) ESUtilsTest: test for all special chars and whitespace * Updating commit reference for src/main/enterprise * #13375 - Folder API - Incorrect Query causing cartesian product and o… (#13493) * #13375 - Folder API - Incorrect Query causing cartesian product and out of memory or closed resultsets errors * #13375 - Folder API - Incorrect Query causing cartesian product and out of memory or closed resultsets errors * #10604 add hover options for span tags in website browser (#13490) * #12991 push publish content types - Messages keys (#13500) * Issue 13502 npe on deleted bundle (#13503) * #13429 * fixes #13502 * Use new ami (#13511) * ContentResource: Pass value of REST_API_CONTENT_ALLOW_FRONT_END_SAVIN… (#13510) * ContentResource: Pass value of REST_API_CONTENT_ALLOW_FRONT_END_SAVING to methods to find cats by key or name ContentResourceTest: Added two tests for both cases (true/false) for REST_API_CONTENT_ALLOW_FRONT_END_SAVING when saving content via REST API with anonymous user * #12150 Correct test name. * #12150 Code review changes. * Update ami jenkins (#13512) * Use new ami * New AMI for jenkins continuous tests. * Include isInodeIndexed in test. * Issue 13469 workflow multi lang (#13509) * #13469 multi language support for workflow task * #13469 Adding the multi language step/action workflows * #13469 codacy feedback * Issue 11265 create 4 eyes workflow actionlet (#13366) * #11265 : Adding initial version of the 4-Eyes actionlet. * #11265 : Adding initial version of the 4-Eyes actionlet. * #11265 : - Wrapping up changes in the 4-eyes approval actionlet class. - Adding utility class for common-use methods in actionlets. * #11265 : Adding new type of actionlet parameter that includes validation of role keys. * #11265 : Codacy and Sonar code changes. * #11265 : More Codacy and Sonar code changes. * #11265 : First draft of integration test. Fixing exception throws where the original exception was being swallowed. * #11265 : Adding more tests to the four-eye sub-action integration test. * #13333 need to add action of add to bundle to content types - Adding message keus (#13516) * Missing import * Fix TreeTransformer and ContentletTransformer (#13518) TreeTransformer: Use conversion utils instead of a class for Oracle. TransformerLocator: create only TreeTransformer ContentletTransformer: Use conversion utils to avoid classCastException in oracle * #13375 fix starting up oracle, bc join never finds inode column (#13519) * Remove invalid import. * Fixing failing Jenkins tests. (#13517) * changes to build docker image from gradle file - still need to upgrade gradle wrapper version * cosmetic commit to build.gradle * changed docker tags and added blank line at end of file * upgraded gradle wrapper to 4.4.1 * 4.4.1 gradle wrapper * added reference comment * fixes #13527

bring back download data/assets changes

b0e77a3

dsilvam approved these changes Jan 17, 2018

View reviewed changes

dsilvam merged commit 1f43a57 into master Jan 17, 2018

dsilvam deleted the issue-download-data-assets branch January 17, 2018 21:47

dev-dotcms reviewed Jan 17, 2018

View reviewed changes

erickgonzalez mentioned this pull request Jan 18, 2018

Restore lost changes for download/restore #13433

Closed

		@@ -244,11 +277,46 @@ else if(cmd.equals("dropoldassets")){
		boolean dataOnly = Parameter.getBooleanFromString(req.getParameter("dataOnly"), true);

		if(cmd.equals("createZip")) {

bring back download data/assets changes #13422

bring back download data/assets changes #13422

Conversation

erickgonzalez commented Jan 17, 2018

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

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

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

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

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

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