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 2012/09/12 11:17:52 UTC

svn commit: r1383861 - in /incubator/isis/trunk/framework: applib/src/main/java/org/apache/isis/applib/AbstractService.java viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/EntityLink.java

Author: danhaywood
Date: Wed Sep 12 09:17:52 2012
New Revision: 1383861

URL: http://svn.apache.org/viewvc?rev=1383861&view=rev
Log:
ISIS-232: entity link enhancement

* suppress find using for drop-downs

Modified:
    incubator/isis/trunk/framework/applib/src/main/java/org/apache/isis/applib/AbstractService.java
    incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/EntityLink.java

Modified: incubator/isis/trunk/framework/applib/src/main/java/org/apache/isis/applib/AbstractService.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/applib/src/main/java/org/apache/isis/applib/AbstractService.java?rev=1383861&r1=1383860&r2=1383861&view=diff
==============================================================================
--- incubator/isis/trunk/framework/applib/src/main/java/org/apache/isis/applib/AbstractService.java (original)
+++ incubator/isis/trunk/framework/applib/src/main/java/org/apache/isis/applib/AbstractService.java Wed Sep 12 09:17:52 2012
@@ -19,8 +19,11 @@
 
 package org.apache.isis.applib;
 
+import org.apache.isis.applib.annotation.Hidden;
+
 public abstract class AbstractService extends AbstractContainedObject {
 
+    @Hidden
     public String getId() {
         return getClassName();
     }

Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/EntityLink.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/EntityLink.java?rev=1383861&r1=1383860&r2=1383861&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/EntityLink.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/EntityLink.java Wed Sep 12 09:17:52 2012
@@ -257,6 +257,9 @@ public class EntityLink extends FormComp
             // no need for the 'null' title, since if there is no object yet
             // can represent this fact in the drop-down
             permanentlyHide(ID_ENTITY_TITLE_NULL);
+            
+            // hide links
+            permanentlyHide(ID_FIND_USING, ID_ENTITY_CLEAR_LINK);
         } else {
 
             // choices drop-down