Author: simoneg
Date: Mon Feb 15 23:26:54 2010
New Revision: 910361
URL: http://svn.apache.org/viewvc?rev=910361&view=rev
Log:
Place additional actions in SIDEC
Remove addition form if returned null
Modified:
labs/magma/trunk/website-administration/src/main/java/org/apache/magma/website/admin/AbstractListCrud.java
labs/magma/trunk/website-administration/src/main/java/org/apache/magma/website/admin/ListCrudComplete.java
labs/magma/trunk/website-administration/src/main/java/org/apache/magma/website/admin/ListCrudWithSelection.java
Modified:
labs/magma/trunk/website-administration/src/main/java/org/apache/magma/website/admin/AbstractListCrud.java
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/website-administration/src/main/java/org/apache/magma/website/admin/AbstractListCrud.java?rev=910361&r1=910360&r2=910361&view=diff
==============================================================================
---
labs/magma/trunk/website-administration/src/main/java/org/apache/magma/website/admin/AbstractListCrud.java
(original)
+++
labs/magma/trunk/website-administration/src/main/java/org/apache/magma/website/admin/AbstractListCrud.java
Mon Feb 15 23:26:54 2010
@@ -48,10 +48,13 @@
, CompoundType.HEAD);
sl.addAction(new FormAction(this, "Disconnect", "doDelete"));
if (isOverridden(AbstractListCrud.class, "handleNew")) {
- sl.compoundWith(handleNew().do_default(),
CompoundType.AFTER);
+ SmartForm handleNew = handleNew();
+ if (handleNew != null) {
+ sl.compoundWith(handleNew.do_default(),
CompoundType.AFTER);
+ }
}
if (isOverridden(AbstractListCrud.class, "doNewSub")) {
- sl.compoundWith(new StringHtmlProducer("<a
href=\"newSub\">" + new LocalizableString("Add new {0}",
property.getCollectionClass().getSimpleName()) + "</a>"), CompoundType.AFTER);
+ sl.compoundWith(new StringHtmlProducer("<a
href=\"newSub\">" + new LocalizableString("Add new {0}",
property.getCollectionClass().getSimpleName()) + "</a>"), CompoundType.SIDEC);
}
return sl;
}
Modified:
labs/magma/trunk/website-administration/src/main/java/org/apache/magma/website/admin/ListCrudComplete.java
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/website-administration/src/main/java/org/apache/magma/website/admin/ListCrudComplete.java?rev=910361&r1=910360&r2=910361&view=diff
==============================================================================
---
labs/magma/trunk/website-administration/src/main/java/org/apache/magma/website/admin/ListCrudComplete.java
(original)
+++
labs/magma/trunk/website-administration/src/main/java/org/apache/magma/website/admin/ListCrudComplete.java
Mon Feb 15 23:26:54 2010
@@ -31,7 +31,7 @@
@Override
public HtmlProducer doShow() {
HtmlProducer ret = super.doShow();
- ret.compoundWith(new StringHtmlProducer("<a
href=\"newSubComplete\">" + new LocalizableString("Add new {0}",
property.getCollectionClass().getSimpleName()) + "</a>"), CompoundType.AFTER);
+ ret.compoundWith(new StringHtmlProducer("<a
href=\"newSubComplete\">" + new LocalizableString("Add new {0}",
property.getCollectionClass().getSimpleName()) + "</a>"), CompoundType.SIDEC);
return ret;
}
@@ -42,7 +42,7 @@
, CompoundType.HEAD);
ret.compoundWith(
new StringHtmlProducer("<a href=\"" +
LinkHelper.makeLink("handleEdit", bean) + "\">" + new
LocalizableString("Modify").toString() + "</a>")
- , CompoundType.FOOT);
+ , CompoundType.SIDEC);
return ret;
};
Modified:
labs/magma/trunk/website-administration/src/main/java/org/apache/magma/website/admin/ListCrudWithSelection.java
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/website-administration/src/main/java/org/apache/magma/website/admin/ListCrudWithSelection.java?rev=910361&r1=910360&r2=910361&view=diff
==============================================================================
---
labs/magma/trunk/website-administration/src/main/java/org/apache/magma/website/admin/ListCrudWithSelection.java
(original)
+++
labs/magma/trunk/website-administration/src/main/java/org/apache/magma/website/admin/ListCrudWithSelection.java
Mon Feb 15 23:26:54 2010
@@ -20,11 +20,14 @@
}
public SmartForm handleNew() {
+ List<SubBean> list = null;
+ if (isOverridden(ListCrudWithSelection.class,
"getElementsList")) {
+ list = getElementsList();
+ if (list == null || list.size() == 0) return null;
+ }
ListCrudElementHolder<SubBean> eh = createElementHolder();
SmartForm sf = new SmartForm(eh, "hiddenAdd");
- if (isOverridden(ListCrudWithSelection.class,
"getElementsList")) {
- sf.addList("element", getElementsList());
- }
+ if (list != null) sf.addList("element", list);
return sf;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
