#13429 #13432
Merged
#13429 #13432
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dev-dotcms
reviewed
Jan 18, 2018
| @@ -7,11 +7,14 @@ | |||
| import com.dotcms.repackage.org.apache.tika.io.TikaInputStream; | |||
| import com.dotcms.repackage.org.apache.tika.metadata.Metadata; | |||
| import com.dotmarketing.business.APILocator; | |||
| import com.dotmarketing.exception.DotDataException; | |||
| import com.dotmarketing.exception.DotSecurityException; | |||
There was a problem hiding this comment.
dev-dotcms
reviewed
Jan 18, 2018
|
|
||
| Map<String, Object> additionProps = new HashMap<>(); | ||
| try { | ||
| additionProps = com.dotmarketing.portlets.contentlet.util.ContentletUtil.getContentPrintableMap(systemUser, APILocator.getContentletAPI().find(inode,systemUser,true)); |
There was a problem hiding this comment.
|
SonarQube analysis reported 3 issues
Watch the comments in this conversation to review them. |
dev-dotcms
reviewed
Jan 18, 2018
| Map<String, Object> additionProps = new HashMap<>(); | ||
| try { | ||
| additionProps = com.dotmarketing.portlets.contentlet.util.ContentletUtil.getContentPrintableMap(systemUser, APILocator.getContentletAPI().find(inode,systemUser,true)); | ||
| } catch (Exception e) { |
There was a problem hiding this comment.
dsilvam
approved these changes
Jan 18, 2018
jgambarios
approved these changes
Jan 19, 2018
wezell
pushed a commit
that referenced
this pull request
Jan 19, 2018
* #13292 Contentlet search filter and add contentlet to a page * Make work forms and widgets * 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 * Adding new content from edit-mode * merge * removing TODO
brentgriffin
pushed a commit
that referenced
this pull request
Jan 30, 2018
* 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
dsilvam
pushed a commit
that referenced
this pull request
Jan 30, 2018
* 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
jgambarios
pushed a commit
that referenced
this pull request
Feb 2, 2018
* #12619 Update edit content to match the rows and columns from content types * fixing messages * #13315 fixed * #13315 sonarcube * #13315 mas sonarcube * fixing broken ContentTypeUtilTest * Return PageView object after saving layout * #13270 fixes layout manager, but we still need to copy themes * Can't save new containers in a layout * refactoring * refactoring * merge * #13352 adding drag and drop to workflow builder * #13352 cool new hover trick * #13352 we didn't need api changed * #13352 * #13325 development branch * doing constructor public again * #13325 added toString methods to template designer * #13325 blow up page if template has bad data * #13325 throw error if template does not have a drawed body * #13325 moving the velocity mode renderer to the VelocityModeHandler * creating neew fields type: RowField and ColumnField * adding ColumnField into JsonSubTypes * #13325 fixes null container in getContainersInTemplate * #13325 fixes widget and form written out in loop * #13325 fixes double // duplication * #13325 invalidate container by object and not string * #13325 reverted edit_contentlet changes * #13325 showing template image if exists * #13325 fixes content drag and drop for new content * #13325 fixing template picker * #13395 CopyContentlet done * #13424 fixes the mysql lockup issue * #13425 fixes container invalidation * #13424 fixes the mysql lockup issue * #13425 containers now invalidating * #13424 closes the preparedstatement * #13425 cache key corrected for files * #13425 reverting log4j and others * Issue 13440 drawed templates (#13441) * Fix TreeTransformer for Oracle. (#13439) * #13440 draw your templates * #nocode allow columns to be accesses by int * #nocode workflow steps still needs love * #Added the work to create the system workflow on UT * #13174 fixing a log * Issue 13292 add contentlet search (#13448) * #13292 Contentlet search filter and add contentlet to a page * Make work forms and widgets * 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 * Adding new content from edit-mode * merge * removing TODO * #13449 adds libsass support * #13449 adds libsass support * #13449 adds libsass support * #13449 adds libsass support * #13174 feedback fixes * #13449 fixed if condition * #13449 reverting sass * #13449 velocity cache invalidation * #13452 added content can be moved from container to container * #13452 save contentlet to container, allow content selection * #13452 auto-add who can use and actionlet when selected * #13452 hide row/column fields from ui * #13452 contentlet velocity cache not invalidating * saving sidebar's width property * Fixing error when try to add a form content * fixed sidebar not saving * fixing error when saving the template's sidebar * saving the sidebar width in lowercase * saving the sidebar's width in lowercase * #13475 cache invalidations again * #13482 * #13452 allows you to select content type to add * #13390 cherry-pick the email fix * #13390 removing all the old velocity files * #13482 * #13452 container velocity cache * merge y saving uuid * merge and saving uuid * #13452 respect tree order * Removing tika jar #13482 * #13452 ng-content-select * #13452 ng-content-select * #13452 fixed an npe on content versions and made minor changes to workflow list * Add CategoryAjax * #13482 * Add edit contentlet toolbar lang * #13504 uses outputstream rather than writer * #13452 adds basetype to content search * fixing nocode tests * Fix error with extra call to _fillStructures in Firefox * Adding base type to the ContentEvent when a content is add * revert context.xml change * Adding page fields to renderHTML end point * #13482 * #13482 * cleaned up the page resource return * cleaned up the page resource return * more page resource cleanup * more page resource cleanup * hopefully final renderHTML result * Adding messages * added CopyActionlet to imports * Cleaning imports * Missing javassist #13482 * Updating repackaged cactus.integration.ant jar #13482 * Missing dependency #13482 * Adding hibernate back #13482 * #13482 * #13482 * Updating aws repackaged jars #13482 * Changing jar version #13482 * Updating milton repackaged jars #13482 * Changing jar version #13482 * Updating daisydiff repackaged jar #13482 * Adding tika bundle and related osgi bundles as system bundles in order to exclude them from the OSGI portlet #13482 * Changing back ee version #13482
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.