[ofbiz-framework] branch release18.12 updated: Fixed: Webtools Service Logs ‘Service Name’ column always empty (OFBIZ-12625)

[jleroux]

This is an automated email from the ASF dual-hosted git repository.

jleroux pushed a commit to branch release18.12
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git


The following commit(s) were added to refs/heads/release18.12 by this push:
     new d8d1b03722 Fixed: Webtools Service Logs ‘Service Name’ column always 
empty (OFBIZ-12625)
d8d1b03722 is described below

commit d8d1b03722527cc42f67e245c00ceb6af6001d07
Author: Jacques Le Roux <jacques.le.r...@les7arts.com>
AuthorDate: Thu May 26 11:27:55 2022 +0200

    Fixed: Webtools Service Logs ‘Service Name’ column always empty 
(OFBIZ-12625)
    
    rs.getModelService().getName() should be used
    instead of
    rs.getModelService().name
    
    The rest of changes is only non functional formatting and such
    
    Thanks: Emad Radwan for reporting
---
 framework/webtools/groovyScripts/service/Services.groovy | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/framework/webtools/groovyScripts/service/Services.groovy 
b/framework/webtools/groovyScripts/service/Services.groovy
index df4084575b..6b6e53f33a 100644
--- a/framework/webtools/groovyScripts/service/Services.groovy
+++ b/framework/webtools/groovyScripts/service/Services.groovy
@@ -17,18 +17,10 @@
  * under the License.
  */
 
-import java.util.ArrayList
-import java.util.HashMap
-import java.util.Iterator
-import java.util.Map
-import java.sql.Timestamp
-
 import org.apache.ofbiz.base.util.UtilMisc
+import org.apache.ofbiz.base.util.UtilProperties
 import org.apache.ofbiz.service.ServiceDispatcher
-import org.apache.ofbiz.service.RunningService
 import org.apache.ofbiz.service.engine.GenericEngine
-import org.apache.ofbiz.base.util.UtilHttp
-import org.apache.ofbiz.base.util.UtilProperties
 
 uiLabelMap = UtilProperties.getResourceBundleMap("WebtoolsUiLabels", locale)
 uiLabelMap.addBottomResourceBundle("CommonUiLabels")
@@ -37,7 +29,7 @@ log = ServiceDispatcher.getServiceLogMap()
 serviceList = []
 log.each { rs, value ->
     service = [:]
-    service.serviceName = rs.getModelService().name
+    service.serviceName = rs.getModelService().getName()
     service.localName = rs.getLocalName()
     service.startTime = rs.getStartStamp()
     service.endTime = rs.getEndStamp()
@@ -46,7 +38,7 @@ log.each { rs, value ->
     serviceList.add(service)
 }
 sortField = parameters.sortField
-if (sortField) { 
+if (sortField) {
     context.services = UtilMisc.sortMaps(serviceList, 
UtilMisc.toList(sortField))
 } else {
     context.services = serviceList