[HippoCMS-scm] [Git][cms-community/hippo-addon-crisp] Deleted branch feature/CRISP-32
Woonsan Ko deleted branch feature/CRISP-32 at cms-community / hippo-addon-crisp --- You're receiving this email because of your account on code.onehippo.org. ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-crisp] Pushed new branch feature/CRISP-32
Woonsan Ko pushed new branch feature/CRISP-32 at cms-community / hippo-addon-crisp --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-crisp/tree/feature/CRISP-32 You're receiving this email because of your account on code.onehippo.org. ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-site-toolkit] Deleted branch bugfix/HSTTWO-4178
Michael Metternich deleted branch bugfix/HSTTWO-4178 at cms-community / hippo-site-toolkit --- You're receiving this email because of your account on code.onehippo.org. ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms][feature/CMS-10864] CMS-10864 toggle icon and search term
Bert Leunis pushed to branch feature/CMS-10864 at cms-community / hippo-cms
Commits:
99fc343b by Bert Leunis at 2017-12-12T16:09:28+01:00
CMS-10864 toggle icon and search term
- - - - -
1 changed file:
-
perspectives/src/main/java/org/hippoecm/frontend/plugins/cms/admin/users/ListUsersPanel.java
Changes:
=
perspectives/src/main/java/org/hippoecm/frontend/plugins/cms/admin/users/ListUsersPanel.java
=
---
a/perspectives/src/main/java/org/hippoecm/frontend/plugins/cms/admin/users/ListUsersPanel.java
+++
b/perspectives/src/main/java/org/hippoecm/frontend/plugins/cms/admin/users/ListUsersPanel.java
@@ -21,6 +21,7 @@ import java.util.List;
import javax.jcr.RepositoryException;
+import org.apache.commons.lang.StringUtils;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.form.AjaxSubmitLink;
@@ -74,6 +75,7 @@ public class ListUsersPanel extends AdminBreadCrumbPanel
implements IObserver form) {
+if (searchActive) {
+
ListUsersPanel.this.userDataProvider.setSearchTerm(StringUtils.EMPTY);
+}
+searchActive = !searchActive;
target.add(table);
-
-/*if (hasSearchResult()) {
-collection.setSearchResult(NO_RESULTS);
-query = "";
-} else {
-updateSearch(true);
-}*/
+target.add(form);
}
};
-browseLink.add(createSearchIcon("search-icon", null));
+browseLink.add(createSearchIcon(ListUsersPanel.this.userDataProvider));
form.add(browseLink);
-
-// TODO: to be removed
-/*
-form.add(new AjaxButton("search-button", form) {
-@Override
-protected void onSubmit(final AjaxRequestTarget target, final Form
form) {
-target.add(table);
-}
-});
-*/
-
table = new AdminDataTable("table", columns, userDataProvider,
NUMBER_OF_ITEMS_PER_PAGE);
table.setOutputMarkupId(true);
add(table);
}
-private Component createSearchIcon(final String id, final
DocumentCollection collection) {
+private Component createSearchIcon(final UserDataProvider
userDataProvider) {
final IModel iconModel = new LoadableDetachableModel() {
@Override
protected Icon load() {
-//return collection.getType() ==
DocumentCollection.DocumentCollectionType.SEARCHRESULT ? Icon.TIMES :
Icon.SEARCH;
-return Icon.SEARCH;
+if (StringUtils.isNotBlank(userDataProvider.getSearchTerm())) {
+return Icon.TIMES;
+} else {
+return Icon.SEARCH;
+}
}
};
-return HippoIcon.fromSprite(id, iconModel);
+return HippoIcon.fromSprite("search-icon", iconModel);
}
private class DeleteUserActionLink extends AjaxLinkLabel {
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms/commit/99fc343b79d93ed6c44882c2e9433dff3fec6769
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms/commit/99fc343b79d93ed6c44882c2e9433dff3fec6769
You're receiving this email because of your account on code.onehippo.org.
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms-utilities][master] CMS-11014 Revert
Michiel Rop pushed to branch master at cms-community / hippo-cms-utilities
Commits:
87eaac78 by Michiel Rop at 2017-12-12T13:57:22+01:00
CMS-11014 Revert
Change introduces a vulnerability.
- - - - -
1 changed file:
- src/main/java/org/onehippo/cms7/utilities/servlet/ResourceServlet.java
Changes:
=
src/main/java/org/onehippo/cms7/utilities/servlet/ResourceServlet.java
=
--- a/src/main/java/org/onehippo/cms7/utilities/servlet/ResourceServlet.java
+++ b/src/main/java/org/onehippo/cms7/utilities/servlet/ResourceServlet.java
@@ -504,7 +504,7 @@ public class ResourceServlet extends HttpServlet {
* @return resource path, appended with index.html if needed.
*/
private static String addIndexHtmlIfNeeded(String resourcePath) {
-if (StringUtils.substringAfterLast(resourcePath, ".").isEmpty()) {
+if (!resourcePath.endsWith(".") &&
StringUtils.substringAfterLast(resourcePath, ".").isEmpty()) {
// The welcome-file-list is configurable, but we assume that
index.html is always present.
return StringUtils.substringBeforeLast(resourcePath, "/") +
"/index.html";
}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms-utilities/commit/87eaac7889e374cebecb5cfe463af7806bc31429
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms-utilities/commit/87eaac7889e374cebecb5cfe463af7806bc31429
You're receiving this email because of your account on code.onehippo.org.
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms] Pushed new branch feature/CMS-10864
Bert Leunis pushed new branch feature/CMS-10864 at cms-community / hippo-cms --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms/tree/feature/CMS-10864 You're receiving this email because of your account on code.onehippo.org. ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-essentials][feature/ESSENTIALS-1132] 5 commits: ESSENTIALS-1132 Delete PluginDescriptor interface to promote data bean
Tobias Jeger pushed to branch feature/ESSENTIALS-1132 at cms-community / hippo-essentials Commits: 624684b7 by Tobias Jeger at 2017-12-11T15:51:23+01:00 ESSENTIALS-1132 Delete PluginDescriptor interface to promote data bean - - - - - 19bfe701 by Tobias Jeger at 2017-12-11T15:53:14+01:00 ESSENTIALS-1132 Move PluginDescriptorRestful (impl) to PluginDescriptor (api) - - - - - 12539fc8 by Tobias Jeger at 2017-12-11T22:01:41+01:00 ESSENTIALS-1132 Fix EnterpriseUtils to avoid duplicate dependencies - - - - - d456134d by Tobias Jeger at 2017-12-11T22:04:28+01:00 ESSENTIALS-1132 Refactor PluginDescriptorRestful into PluginDescriptor - without dependencies on the SDK implementation module. - - - - - aa5b0177 by Tobias Jeger at 2017-12-12T11:59:00+01:00 ESSENTIALS-1132 Simplify loading of dynamic dashboard extensions The mechanism for loading the plugin-specific extensions to the dashboard AngularJS application contained a lot of unused (or no-longer- used) complexity. For better maintainability, I've simplified the mechanism to focus on the functionality in use. This leads to further simplification of the plugin descriptor structure. - - - - - 30 changed files: - dashboard/src/main/java/org/onehippo/cms7/essentials/filters/EssentialsContextListener.java - dashboard/src/main/java/org/onehippo/cms7/essentials/plugin/PluginStore.java - dashboard/src/main/java/org/onehippo/cms7/essentials/rest/DocumentResource.java - dashboard/src/main/java/org/onehippo/cms7/essentials/rest/PluginResource.java - dashboard/src/main/java/org/onehippo/cms7/essentials/rest/model/RestList.java - dashboard/src/main/webapp/js/loader.js - dashboard/src/test/java/org/onehippo/cms7/essentials/WebUtilsTest.java - dashboard/src/test/java/org/onehippo/cms7/essentials/rest/model/PluginDescriptorRestfulTest.java → dashboard/src/test/java/org/onehippo/cms7/essentials/rest/model/PluginDescriptorTest.java - dashboard/src/test/resources/external_list.json - plugin-sdk/api/src/main/java/org/onehippo/cms7/essentials/dashboard/model/PluginDescriptor.java - − plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/dashboard/model/PluginDescriptorRestful.java - plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/dashboard/rest/PluginModuleRestful.java - plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/dashboard/rest/RestfulList.java - plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/dashboard/utils/EnterpriseUtils.java - plugin-sdk/implementation/src/test/java/org/onehippo/cms7/essentials/dashboard/rest/BaseResourceTest.java - plugin-sdk/implementation/src/test/java/org/onehippo/cms7/essentials/dashboard/rest/PluginModuleRestfulTest.java - plugin-sdk/implementation/src/test/java/org/onehippo/cms7/essentials/dashboard/rest/RestfulListTest.java - plugins/banner-and-carousel/src/main/resources/plugin-descriptor.json - plugins/bean-writer/src/main/resources/plugin-descriptor.json - plugins/blog/src/main/resources/plugin-descriptor.json - plugins/bloomreach-connector/src/main/resources/plugin-descriptor.json - plugins/content-blocks/src/main/resources/plugin-descriptor.json - plugins/document-wizard/src/main/resources/plugin-descriptor.json - plugins/events/src/main/resources/plugin-descriptor.json - plugins/faq/src/main/resources/plugin-descriptor.json - plugins/gallery-manager/src/main/resources/plugin-descriptor.json - plugins/image-component/src/main/resources/plugin-descriptor.json - plugins/list/src/main/resources/plugin-descriptor.json - plugins/menu/src/main/resources/plugin-descriptor.json - plugins/news/src/main/resources/plugin-descriptor.json The diff was not included because it is too large. View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/compare/f59e21a5bb76e7168f6a5f446477c01122ee9f58...aa5b0177017a8cd0ec8dbada291c08e43cfe4768 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/compare/f59e21a5bb76e7168f6a5f446477c01122ee9f58...aa5b0177017a8cd0ec8dbada291c08e43cfe4768 You're receiving this email because of your account on code.onehippo.org. ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/CHANNELMGR-1537] CHANNELMGR-1537 update unit tests for new methods
Bert Leunis pushed to branch feature/CHANNELMGR-1537 at cms-community /
hippo-addon-channel-manager
Commits:
005b4c70 by Bert Leunis at 2017-12-12T09:21:44+01:00
CHANNELMGR-1537 update unit tests for new methods
- - - - -
1 changed file:
-
content-service/src/test/java/org/onehippo/cms/channelmanager/content/documenttype/DocumentTypesServiceImplTest.java
Changes:
=
content-service/src/test/java/org/onehippo/cms/channelmanager/content/documenttype/DocumentTypesServiceImplTest.java
=
---
a/content-service/src/test/java/org/onehippo/cms/channelmanager/content/documenttype/DocumentTypesServiceImplTest.java
+++
b/content-service/src/test/java/org/onehippo/cms/channelmanager/content/documenttype/DocumentTypesServiceImplTest.java
@@ -140,12 +140,14 @@ public class DocumentTypesServiceImplTest {
expectLastCall();
expect(docType.getFields()).andReturn(fields);
expect(FieldTypeUtils.populateFields(fields, context)).andReturn(true);
+
expect(FieldTypeUtils.getUnsupportedFieldTypes(context)).andReturn(null);
expect(context.getContentType()).andReturn(contentType);
expect(context.getResourceBundle()).andReturn(Optional.empty());
expect(contentType.isDocumentType()).andReturn(true);
docType.setAllFieldsIncluded(true);
+docType.setUnsupportedFieldTypes(null);
expectLastCall();
replayAll();
@@ -179,8 +181,10 @@ public class DocumentTypesServiceImplTest {
expect(docType.getFields()).andReturn(fields);
expect(FieldTypeUtils.populateFields(fields, context)).andReturn(true);
+
expect(FieldTypeUtils.getUnsupportedFieldTypes(context)).andReturn(null);
docType.setAllFieldsIncluded(true);
+docType.setUnsupportedFieldTypes(null);
expectLastCall();
expect(context.getContentType()).andReturn(contentType);
@@ -213,12 +217,14 @@ public class DocumentTypesServiceImplTest {
expectLastCall();
expect(docType.getFields()).andReturn(fields);
expect(FieldTypeUtils.populateFields(fields,
context)).andReturn(false);
+
expect(FieldTypeUtils.getUnsupportedFieldTypes(context)).andReturn(null);
expect(context.getContentType()).andReturn(contentType);
expect(context.getResourceBundle()).andReturn(Optional.empty());
expect(contentType.isDocumentType()).andReturn(true);
docType.setAllFieldsIncluded(false);
+docType.setUnsupportedFieldTypes(null);
expectLastCall();
replayAll();
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/005b4c702158c006310626b4da8d9215d394ffe8
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/005b4c702158c006310626b4da8d9215d394ffe8
You're receiving this email because of your account on code.onehippo.org.
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
