Changed attribute modification process to check first if the model contains the entityForm. This avoids a NPE that was happening when the entity type was not selected (before the entityForm exists). Fixes BroadleafCommerce/QA#1291.

Author: danielcolgrove

admin/broadleaf-admin-module/src/main/java/org/broadleafcommerce/admin/web/controller/entity/AdminOfferController.java

@@ -99,8 +99,10 @@ public String addEntity(HttpServletRequest request, HttpServletResponse response
      */
     protected void modifyModelAttributes(Model model) {
         model.addAttribute("additionalControllerClasses", "offer-form");
-        EntityForm form = (EntityForm) model.asMap().get("entityForm");
-        form.findField("targetItemCriteria").setRequired(true);
+        if (model.asMap().containsKey("entityForm")) {
+            EntityForm form = (EntityForm) model.asMap().get("entityForm");
+            form.findField("targetItemCriteria").setRequired(true);
+        }
     }
 
 }