Skip to content

Commit 94218b8

Browse files
Fixes BroadleafCommerce#1274 - Change the ordering of when extension points in the admin abstract controller are invoked for main actions, enhance some docs
1 parent ab2f85a commit 94218b8

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

admin/broadleaf-open-admin-platform/src/main/java/org/broadleafcommerce/openadmin/web/controller/entity/AdminBasicEntityController.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -144,14 +144,14 @@ public String viewEntityList(HttpServletRequest request, HttpServletResponse res
144144
ListGrid listGrid = formService.buildMainListGrid(drs, cmd, sectionKey, crumbs);
145145
List<EntityFormAction> mainActions = new ArrayList<EntityFormAction>();
146146
addAddActionIfAllowed(sectionClassName, cmd, mainActions);
147+
extensionManager.getProxy().addAdditionalMainActions(sectionClassName, mainActions);
148+
extensionManager.getProxy().modifyMainActions(cmd, mainActions);
147149

148150
Field firstField = listGrid.getHeaderFields().iterator().next();
149151
if (requestParams.containsKey(firstField.getName())) {
150152
model.addAttribute("mainSearchTerm", requestParams.get(firstField.getName()).get(0));
151153
}
152154

153-
extensionManager.getProxy().addAdditionalMainActions(sectionClassName, mainActions);
154-
155155
// If this came from a delete save, we'll have a headerFlash request parameter to take care of
156156
if (requestParams.containsKey("headerFlash")) {
157157
model.addAttribute("headerFlash", requestParams.get("headerFlash").get(0));
@@ -181,7 +181,6 @@ protected void addAddActionIfAllowed(String sectionClassName, ClassMetadata cmd,
181181
}
182182

183183
mainEntityActionsExtensionManager.getProxy().modifyMainActions(cmd, mainActions);
184-
extensionManager.getProxy().modifyMainActions(cmd, mainActions);
185184
}
186185

187186
protected boolean isAddActionAllowed(String sectionClassName, ClassMetadata cmd) {

admin/broadleaf-open-admin-platform/src/main/java/org/broadleafcommerce/openadmin/web/service/FormBuilderExtensionHandler.java

+5
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,13 @@ public interface FormBuilderExtensionHandler extends ExtensionHandler {
116116
public ExtensionResultStatusType modifyListGridRecord(String className, ListGridRecord record, Entity entity);
117117

118118
/**
119+
* <p>
119120
* Provides a hook to add additional actions to all entity forms.
120121
*
122+
* <p>
123+
* For order of operation purposes, this is the last thing that is run when building an entity form, which means
124+
* that it occurs after {@link #modifyDetailEntityForm(EntityForm)}.
125+
*
121126
* @param entityForm
122127
* @return whether or not it was handled
123128
*/

0 commit comments

Comments
 (0)