You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2019/01/08 07:25:54 UTC
[isis] 04/10: ISIS-2078: tidies up StandaloneCollectionPanel,
removes unused div for modal dialog
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit c6f822919eba51d9fe2152757d63b07132114356
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Jan 7 09:40:41 2019 +0000
ISIS-2078: tidies up StandaloneCollectionPanel, removes unused div for modal dialog
---
.../components/standalonecollection/StandaloneCollectionPanel.html | 2 --
.../components/standalonecollection/StandaloneCollectionPanel.java | 7 -------
2 files changed, 9 deletions(-)
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.html b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.html
index 0f407f5..7a9220e 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.html
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.html
@@ -27,8 +27,6 @@
<div wicket:id="standaloneCollection">
- <div wicket:id="actionPromptModalWindow"/>
-
<div class="standaloneCollectionPanel actionComponentType panel panel-default">
<div class="iconAndTitle panel-heading actionPanelHeaderNew">
<span wicket:id="actionName" class="actionName panel-title">[action name]</span>
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.java
index 3dff331..fa1b89d 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.java
@@ -41,7 +41,6 @@ import org.apache.isis.viewer.wicket.ui.ComponentFactory;
import org.apache.isis.viewer.wicket.ui.ComponentType;
import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistry;
import org.apache.isis.viewer.wicket.ui.components.actionmenu.entityactions.AdditionalLinksPanel;
-import org.apache.isis.viewer.wicket.ui.components.actionprompt.ActionPromptModalWindow;
import org.apache.isis.viewer.wicket.ui.components.collection.bulk.BulkActionsHelper;
import org.apache.isis.viewer.wicket.ui.components.collection.bulk.BulkActionsLinkFactory;
import org.apache.isis.viewer.wicket.ui.components.collection.bulk.BulkActionsProvider;
@@ -62,13 +61,11 @@ public class StandaloneCollectionPanel extends PanelAbstract<EntityCollectionMod
private static final String ID_STANDALONE_COLLECTION = "standaloneCollection";
private static final String ID_ACTION_NAME = "actionName";
- private static final String ID_ACTION_PROMPT_MODAL_WINDOW = "actionPromptModalWindow";
private static final String ID_ADDITIONAL_LINKS = "additionalLinks";
private static final String ID_ADDITIONAL_LINK = "additionalLink";
private static final String ID_SELECTOR_DROPDOWN = "selectorDropdown";
- private final ActionPromptModalWindow actionPromptModalWindow;
private final CollectionSelectorPanel selectorDropdownPanel;
private final BulkActionsHelper bulkActionsHelper;
@@ -95,10 +92,6 @@ public class StandaloneCollectionPanel extends PanelAbstract<EntityCollectionMod
CssClassAppender.appendCssClassTo(outerDiv,
CssClassAppender.asCssStyle("isis-" + entityCollectionModel.getTypeOfSpecification().getSpecId().asString().replace('.','-')));
- // action prompt
- this.actionPromptModalWindow = ActionPromptModalWindow.newModalWindow(ID_ACTION_PROMPT_MODAL_WINDOW);
- outerDiv.addOrReplace(actionPromptModalWindow);
-
// selector
final CollectionSelectorHelper selectorHelper = new CollectionSelectorHelper(entityCollectionModel, getComponentFactoryRegistry());