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 2013/02/14 19:30:40 UTC

git commit: ISIS-341: fixing stack trace when hit ok after empty search...

Updated Branches:
  refs/heads/master 9e9765fe1 -> 2bbc2a885


ISIS-341: fixing stack trace when hit ok after empty search...

... decided to simply remove the OK button; it isn't needed.


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/2bbc2a88
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/2bbc2a88
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/2bbc2a88

Branch: refs/heads/master
Commit: 2bbc2a88565d9fdbcc0fb75f073065c5cfab3fb0
Parents: 9e9765f
Author: Dan Haywood <da...@apache.org>
Authored: Thu Feb 14 18:29:48 2013 +0000
Committer: Dan Haywood <da...@apache.org>
Committed: Thu Feb 14 18:29:48 2013 +0000

----------------------------------------------------------------------
 .../ui/components/empty/EmptyCollectionPanel.css   |    3 ---
 .../ui/components/empty/EmptyCollectionPanel.html  |    3 ---
 .../ui/components/empty/EmptyCollectionPanel.java  |   14 +-------------
 3 files changed, 1 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/2bbc2a88/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/empty/EmptyCollectionPanel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/empty/EmptyCollectionPanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/empty/EmptyCollectionPanel.css
index 03c1cbb..eaeea17 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/empty/EmptyCollectionPanel.css
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/empty/EmptyCollectionPanel.css
@@ -16,6 +16,3 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-.emptyCollectionPanel .buttons {
-	margin-top: 1.5em;
-}

http://git-wip-us.apache.org/repos/asf/isis/blob/2bbc2a88/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/empty/EmptyCollectionPanel.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/empty/EmptyCollectionPanel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/empty/EmptyCollectionPanel.html
index 7c2ee07..f835c98 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/empty/EmptyCollectionPanel.html
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/empty/EmptyCollectionPanel.html
@@ -28,9 +28,6 @@
 			<div class="emptyCollectionPanel">
 				<form>
 					<p>No objects returned</p>
-					<div class="buttons">
-						<button type="submit" wicket:id="ok" class="ok" value="OK">OK</button>
-					</div>
 				</form>
 			</div>
 		</wicket:panel>

http://git-wip-us.apache.org/repos/asf/isis/blob/2bbc2a88/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/empty/EmptyCollectionPanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/empty/EmptyCollectionPanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/empty/EmptyCollectionPanel.java
index d20d34c..0bc44f3 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/empty/EmptyCollectionPanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/empty/EmptyCollectionPanel.java
@@ -19,9 +19,6 @@
 
 package org.apache.isis.viewer.wicket.ui.components.empty;
 
-import org.apache.wicket.markup.html.form.Button;
-import org.apache.wicket.model.Model;
-
 import org.apache.isis.viewer.wicket.model.models.ActionModel;
 import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
 
@@ -35,16 +32,7 @@ public class EmptyCollectionPanel extends PanelAbstract<ActionModel> {
     }
 
     private void buildGui(final String id) {
-        final ActionModel model = getModel();
-        addOrReplace(new Button("ok", Model.of("OK")) { // TODO: i18n
-
-            private static final long serialVersionUID = 1L;
-
-            @Override
-            public void onSubmit() {
-                model.getNoResultsHandler().onNoResults(this);
-            }
-        });
+        // nothing to do...
     }
 
 }