You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by rm...@apache.org on 2011/01/08 21:42:28 UTC
svn commit: r1056795 -
/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/RemoveElement.java
Author: rmatthews
Date: Sat Jan 8 20:42:28 2011
New Revision: 1056795
URL: http://svn.apache.org/viewvc?rev=1056795&view=rev
Log:
Removing elements now will only be available if its property is not disabled.
Modified:
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/RemoveElement.java
Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/RemoveElement.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/RemoveElement.java?rev=1056795&r1=1056794&r2=1056795&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/RemoveElement.java (original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/simple/RemoveElement.java Sat Jan 8 20:42:28 2011
@@ -82,33 +82,41 @@ public class RemoveElement extends Abstr
}
IsisContext.getPersistenceSession().resolveField(adapter, field);
- if (valid(request, adapter)) {
- String classSegment = " class=\"" + cssClass + "\"";
-
- String objectId = request.getContext().mapObject(adapter, Scope.INTERACTION);
- String elementId = request.getContext().mapObject(element, Scope.INTERACTION);
- String action = RemoveAction.ACTION + Dispatcher.COMMAND_ROOT;
- request.appendHtml("<form" + classSegment + " method=\"post\" action=\"" + action + "\" >");
- request.appendHtml("<input type=\"hidden\" name=\"" + OBJECT + "\" value=\"" + objectId + "\" />");
- request.appendHtml("<input type=\"hidden\" name=\"" + FIELD + "\" value=\"" + fieldName + "\" />");
- request.appendHtml("<input type=\"hidden\" name=\"" + ELEMENT + "\" value=\"" + elementId + "\" />");
- if (resultOverride != null) {
- request.appendHtml("<input type=\"hidden\" name=\"" + RESULT_OVERRIDE + "\" value=\"" + resultOverride + "\" />");
- }
- request.appendHtml("<input type=\"hidden\" name=\"" + VIEW + "\" value=\"" + view + "\" />");
- request.appendHtml("<input type=\"hidden\" name=\"" + ERRORS + "\" value=\"" + error + "\" />");
- request.appendHtml(request.getContext().interactionFields());
- request.appendHtml("<input class=\"button\" type=\"submit\" value=\"" + title + "\" />");
- request.appendHtml("</form>");
- }
+ if (field.isUsable(IsisContext.getAuthenticationSession(), adapter).isAllowed()) {
+ if (valid(request, adapter)) {
+ String classSegment = " class=\"" + cssClass + "\"";
+
+ String objectId = request.getContext().mapObject(adapter, Scope.INTERACTION);
+ String elementId = request.getContext().mapObject(element, Scope.INTERACTION);
+ String action = RemoveAction.ACTION + Dispatcher.COMMAND_ROOT;
+ request.appendHtml("<form" + classSegment + " method=\"post\" action=\"" + action + "\" >");
+ request.appendHtml("<input type=\"hidden\" name=\"" + OBJECT + "\" value=\"" + objectId + "\" />");
+ request.appendHtml("<input type=\"hidden\" name=\"" + FIELD + "\" value=\"" + fieldName + "\" />");
+ request.appendHtml("<input type=\"hidden\" name=\"" + ELEMENT + "\" value=\"" + elementId + "\" />");
+ if (resultOverride != null) {
+ request.appendHtml("<input type=\"hidden\" name=\"" + RESULT_OVERRIDE + "\" value=\"" + resultOverride + "\" />");
+ }
+ request.appendHtml("<input type=\"hidden\" name=\"" + VIEW + "\" value=\"" + view + "\" />");
+ request.appendHtml("<input type=\"hidden\" name=\"" + ERRORS + "\" value=\"" + error + "\" />");
+ request.appendHtml(request.getContext().interactionFields());
+ request.appendHtml("<input class=\"button\" type=\"submit\" value=\"" + title + "\" />");
+ request.appendHtml("</form>");
+ }
+ }
}
private static boolean valid(Request request, ObjectAdapter adapter) {
+ // TODO is this check valid/necessary?
+
// TODO check is valid to remove element
AuthenticationSession session = IsisContext.getAuthenticationSession();
Filter<ObjectAssociation> filter = ObjectAssociationFilters.dynamicallyVisible(session, adapter);
List<ObjectAssociation> visibleFields = adapter.getSpecification().getAssociations(filter);
- return visibleFields.size() > 0;
+ if (visibleFields.size() == 0) {
+ return false;
+ }
+
+ return true;
}
}