Fixed: Improve ViewHandler interface (OFBIZ-13179)

After the migration on new interface to use the function prepareViewContext for FreeMarkerViewHandler, some calls present on groovy class weren't migrate and called the older function FreeMarkerViewHandler.prepOfbizRoot.

Thanks Jacques Leroux for the detection

Author: nmalin

applications/content/src/main/groovy/org/apache/ofbiz/content/cms/CmsEditAddPrep.groovy

@@ -67,8 +67,7 @@ if (dataResourceId) {
     dataResource = from('DataResource').where('dataResourceId', dataResourceId).cache(true).queryOne()
     SimpleMapProcessor.runSimpleMapProcessor('component://content/minilang/ContentManagementMapProcessors.xml',
             'dataResourceOut', dataResource, contentAssocDataResourceViewFrom, [], Locale.getDefault())
-    templateRoot = [:]
-    FreeMarkerViewHandler.prepOfbizRoot(templateRoot, request, response)
+    templateRoot = new FreeMarkerViewHandler().prepareViewContext(request, response, null)
     txt = DataResourceWorker.getDataResourceText(dataResource, 'text/html', Locale.getDefault(), templateRoot, delegator, true)
 
     if (txt) {

applications/content/src/main/groovy/org/apache/ofbiz/content/layout/EditSubContent.groovy

@@ -34,8 +34,7 @@ if (currentValue) {
         rootDir = request.getSession().getServletContext().getRealPath('/')
         wrapper = FreeMarkerWorker.getDefaultOfbizWrapper()
         WrappingTemplateModel.setDefaultObjectWrapper(wrapper)
-        templateRoot = [:]
-        FreeMarkerViewHandler.prepOfbizRoot(templateRoot, request, response)
+        templateRoot = new FreeMarkerViewHandler().prepareViewContext(request, response, null)
         ctx = [:]
         ctx.rootDir = rootDir
         // webSiteId and https need to go here, too

framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/FreeMarkerViewHandler.java

@@ -86,7 +86,7 @@ public Map<String, Object> prepareViewContext(HttpServletRequest request, HttpSe
 
         // add the request parameters -- this now uses a Map from UtilHttp
         Map<String, Object> requestParameters = UtilHttp.getParameterMap(request);
-        if (viewMap.isSecureContext()) {
+        if (viewMap != null && viewMap.isSecureContext()) {
             requestParameters = SecuredFreemarker.sanitizeParameterMap(requestParameters);
         }
         root.put("requestParameters", requestParameters);