Re: svn commit: r1805548 - in /ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts: datafile/ViewDataFile.groovy service/AvailableServices.groovy

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
7 messages Options
Reply | Threaded
Open this post in threaded view
|

Re: svn commit: r1805548 - in /ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts: datafile/ViewDataFile.groovy service/AvailableServices.groovy

Renuka Srishti-2
In this commit <http://markmail.org/message/ghaso2snobssoo74>
*outParamMap.title = uiLabelMap.**WebtoolsOutParameters) *, there is a typo
mistake of a closing bracket which is leading for screen
<https://demo-trunk.ofbiz.apache.org/webtools/control/ServiceList> broken.

It should be *outParamMap.title = uiLabelMap.*

*WebtoolsOutParameters*
Thanks
Renuka Srishti

On Sun, Aug 20, 2017 at 5:41 PM, <[hidden email]> wrote:

> Author: jleroux
> Date: Sun Aug 20 12:11:39 2017
> New Revision: 1805548
>
> URL: http://svn.apache.org/viewvc?rev=1805548&view=rev
> Log:
> No functional change,
>
> In 3 places we use uiLabelMap.get("xxxxx") instead of uiLabelMap.xxxxx
> which
> does essentially the same when there is no default parameter passed to
> get()
> http://mrhaki.blogspot.fr/2009/11/groovy-goodness-get-
> value-from-map-or.html
>
> Modified:
>     ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts/datafile/
> ViewDataFile.groovy
>     ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts/service/
> AvailableServices.groovy
>
> Modified: ofbiz/ofbiz-framework/trunk/framework/webtools/
> groovyScripts/datafile/ViewDataFile.groovy
> URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/
> framework/webtools/groovyScripts/datafile/ViewDataFile.groovy?rev=
> 1805548&r1=1805547&r2=1805548&view=diff
> ============================================================
> ==================
> --- ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts/datafile/ViewDataFile.groovy
> (original)
> +++ ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts/datafile/ViewDataFile.groovy
> Sun Aug 20 12:11:39 2017
> @@ -83,7 +83,7 @@ if (dataFile) {
>  if (dataFile && dataFileSave) {
>      try {
>          dataFile.writeDataFile(dataFileSave)
> -        messages.add(uiLabelMap.get("WebtoolsDataFileSavedTo") +
> dataFileSave)
> +        messages.add(uiLabelMap.WebtoolsDataFileSavedTo) + dataFileSave)
>      }
>      catch (Exception e) {
>          messages.add(e.getMessage())
> @@ -94,7 +94,7 @@ if (dataFile && entityXmlFileSave) {
>      try {
>          //dataFile.writeDataFile(entityXmlFileSave)
>          DataFile2EntityXml.writeToEntityXml(entityXmlFileSave, dataFile)
> -        messages.add(uiLabelMap.get("WebtoolsDataEntityFileSavedTo") +
> entityXmlFileSave)
> +        messages.add(uiLabelMap.WebtoolsDataEntityFileSavedTo) +
> entityXmlFileSave)
>      }
>      catch (Exception e) {
>          messages.add(e.getMessage())
>
> Modified: ofbiz/ofbiz-framework/trunk/framework/webtools/
> groovyScripts/service/AvailableServices.groovy
> URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/
> framework/webtools/groovyScripts/service/AvailableServices.groovy?rev=
> 1805548&r1=1805547&r2=1805548&view=diff
> ============================================================
> ==================
> --- ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts/service/AvailableServices.groovy
> (original)
> +++ ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts/service/AvailableServices.groovy
> Sun Aug 20 12:11:39 2017
> @@ -450,7 +450,7 @@ if (selectedService) {
>              outParamsList.add(curOutParam)
>          }
>          outParamMap = [:]
> -        outParamMap.title = uiLabelMap.get("WebtoolsOutParameters")
> +        outParamMap.title = uiLabelMap.WebtoolsOutParameters)
>          outParamMap.paramList = outParamsList
>          allParamsList.add(outParamMap)
>
>
>
>
Reply | Threaded
Open this post in threaded view
|

Re: svn commit: r1805548 - in /ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts: datafile/ViewDataFile.groovy service/AvailableServices.groovy

Renuka Srishti-2
Mail is not showing the code in the correct way:
So the correct line of code is outParamMap.title =
uiLabelMap.WebtoolsOutParameters

Thanks
Renuka Srishti

On Tue, Aug 22, 2017 at 7:48 PM, Renuka Srishti <[hidden email]>
wrote:

> In this commit <http://markmail.org/message/ghaso2snobssoo74>
> *outParamMap.title = uiLabelMap.**WebtoolsOutParameters) *, there is a
> typo mistake of a closing bracket which is leading for screen
> <https://demo-trunk.ofbiz.apache.org/webtools/control/ServiceList> broken.
>
> It should be *outParamMap.title = uiLabelMap.*
>
> *WebtoolsOutParameters*
> Thanks
> Renuka Srishti
>
> On Sun, Aug 20, 2017 at 5:41 PM, <[hidden email]> wrote:
>
>> Author: jleroux
>> Date: Sun Aug 20 12:11:39 2017
>> New Revision: 1805548
>>
>> URL: http://svn.apache.org/viewvc?rev=1805548&view=rev
>> Log:
>> No functional change,
>>
>> In 3 places we use uiLabelMap.get("xxxxx") instead of uiLabelMap.xxxxx
>> which
>> does essentially the same when there is no default parameter passed to
>> get()
>> http://mrhaki.blogspot.fr/2009/11/groovy-goodness-get-value-
>> from-map-or.html
>>
>> Modified:
>>     ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts
>> /datafile/ViewDataFile.groovy
>>     ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts
>> /service/AvailableServices.groovy
>>
>> Modified: ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts
>> /datafile/ViewDataFile.groovy
>> URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/fra
>> mework/webtools/groovyScripts/datafile/ViewDataFile.groovy?
>> rev=1805548&r1=1805547&r2=1805548&view=diff
>> ============================================================
>> ==================
>> --- ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts/datafile/ViewDataFile.groovy
>> (original)
>> +++ ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts/datafile/ViewDataFile.groovy
>> Sun Aug 20 12:11:39 2017
>> @@ -83,7 +83,7 @@ if (dataFile) {
>>  if (dataFile && dataFileSave) {
>>      try {
>>          dataFile.writeDataFile(dataFileSave)
>> -        messages.add(uiLabelMap.get("WebtoolsDataFileSavedTo") +
>> dataFileSave)
>> +        messages.add(uiLabelMap.WebtoolsDataFileSavedTo) + dataFileSave)
>>      }
>>      catch (Exception e) {
>>          messages.add(e.getMessage())
>> @@ -94,7 +94,7 @@ if (dataFile && entityXmlFileSave) {
>>      try {
>>          //dataFile.writeDataFile(entityXmlFileSave)
>>          DataFile2EntityXml.writeToEntityXml(entityXmlFileSave, dataFile)
>> -        messages.add(uiLabelMap.get("WebtoolsDataEntityFileSavedTo") +
>> entityXmlFileSave)
>> +        messages.add(uiLabelMap.WebtoolsDataEntityFileSavedTo) +
>> entityXmlFileSave)
>>      }
>>      catch (Exception e) {
>>          messages.add(e.getMessage())
>>
>> Modified: ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts
>> /service/AvailableServices.groovy
>> URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/fra
>> mework/webtools/groovyScripts/service/AvailableServices.
>> groovy?rev=1805548&r1=1805547&r2=1805548&view=diff
>> ============================================================
>> ==================
>> --- ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts
>> /service/AvailableServices.groovy (original)
>> +++ ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts
>> /service/AvailableServices.groovy Sun Aug 20 12:11:39 2017
>> @@ -450,7 +450,7 @@ if (selectedService) {
>>              outParamsList.add(curOutParam)
>>          }
>>          outParamMap = [:]
>> -        outParamMap.title = uiLabelMap.get("WebtoolsOutParameters")
>> +        outParamMap.title = uiLabelMap.WebtoolsOutParameters)
>>          outParamMap.paramList = outParamsList
>>          allParamsList.add(outParamMap)
>>
>>
>>
>>
>
Reply | Threaded
Open this post in threaded view
|

Re: svn commit: r1805548 - in /ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts: datafile/ViewDataFile.groovy service/AvailableServices.groovy

Jacques Le Roux
Administrator
Thanks Renuka,

Typo fixed at r1805775

Jacques


Le 22/08/2017 à 16:26, Renuka Srishti a écrit :

> Mail is not showing the code in the correct way:
> So the correct line of code is outParamMap.title =
> uiLabelMap.WebtoolsOutParameters
>
> Thanks
> Renuka Srishti
>
> On Tue, Aug 22, 2017 at 7:48 PM, Renuka Srishti <[hidden email]>
> wrote:
>
>> In this commit <http://markmail.org/message/ghaso2snobssoo74>
>> *outParamMap.title = uiLabelMap.**WebtoolsOutParameters) *, there is a
>> typo mistake of a closing bracket which is leading for screen
>> <https://demo-trunk.ofbiz.apache.org/webtools/control/ServiceList> broken.
>>
>> It should be *outParamMap.title = uiLabelMap.*
>>
>> *WebtoolsOutParameters*
>> Thanks
>> Renuka Srishti
>>
>> On Sun, Aug 20, 2017 at 5:41 PM, <[hidden email]> wrote:
>>
>>> Author: jleroux
>>> Date: Sun Aug 20 12:11:39 2017
>>> New Revision: 1805548
>>>
>>> URL: http://svn.apache.org/viewvc?rev=1805548&view=rev
>>> Log:
>>> No functional change,
>>>
>>> In 3 places we use uiLabelMap.get("xxxxx") instead of uiLabelMap.xxxxx
>>> which
>>> does essentially the same when there is no default parameter passed to
>>> get()
>>> http://mrhaki.blogspot.fr/2009/11/groovy-goodness-get-value-
>>> from-map-or.html
>>>
>>> Modified:
>>>      ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts
>>> /datafile/ViewDataFile.groovy
>>>      ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts
>>> /service/AvailableServices.groovy
>>>
>>> Modified: ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts
>>> /datafile/ViewDataFile.groovy
>>> URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/fra
>>> mework/webtools/groovyScripts/datafile/ViewDataFile.groovy?
>>> rev=1805548&r1=1805547&r2=1805548&view=diff
>>> ============================================================
>>> ==================
>>> --- ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts/datafile/ViewDataFile.groovy
>>> (original)
>>> +++ ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts/datafile/ViewDataFile.groovy
>>> Sun Aug 20 12:11:39 2017
>>> @@ -83,7 +83,7 @@ if (dataFile) {
>>>   if (dataFile && dataFileSave) {
>>>       try {
>>>           dataFile.writeDataFile(dataFileSave)
>>> -        messages.add(uiLabelMap.get("WebtoolsDataFileSavedTo") +
>>> dataFileSave)
>>> +        messages.add(uiLabelMap.WebtoolsDataFileSavedTo) + dataFileSave)
>>>       }
>>>       catch (Exception e) {
>>>           messages.add(e.getMessage())
>>> @@ -94,7 +94,7 @@ if (dataFile && entityXmlFileSave) {
>>>       try {
>>>           //dataFile.writeDataFile(entityXmlFileSave)
>>>           DataFile2EntityXml.writeToEntityXml(entityXmlFileSave, dataFile)
>>> -        messages.add(uiLabelMap.get("WebtoolsDataEntityFileSavedTo") +
>>> entityXmlFileSave)
>>> +        messages.add(uiLabelMap.WebtoolsDataEntityFileSavedTo) +
>>> entityXmlFileSave)
>>>       }
>>>       catch (Exception e) {
>>>           messages.add(e.getMessage())
>>>
>>> Modified: ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts
>>> /service/AvailableServices.groovy
>>> URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/fra
>>> mework/webtools/groovyScripts/service/AvailableServices.
>>> groovy?rev=1805548&r1=1805547&r2=1805548&view=diff
>>> ============================================================
>>> ==================
>>> --- ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts
>>> /service/AvailableServices.groovy (original)
>>> +++ ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts
>>> /service/AvailableServices.groovy Sun Aug 20 12:11:39 2017
>>> @@ -450,7 +450,7 @@ if (selectedService) {
>>>               outParamsList.add(curOutParam)
>>>           }
>>>           outParamMap = [:]
>>> -        outParamMap.title = uiLabelMap.get("WebtoolsOutParameters")
>>> +        outParamMap.title = uiLabelMap.WebtoolsOutParameters)
>>>           outParamMap.paramList = outParamsList
>>>           allParamsList.add(outParamMap)
>>>
>>>
>>>
>>>

Reply | Threaded
Open this post in threaded view
|

Re: svn commit: r1805548 - in /ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts: datafile/ViewDataFile.groovy service/AvailableServices.groovy

Renuka Srishti-2
Thanks Jacques

On Tue, Aug 22, 2017 at 8:35 PM, Jacques Le Roux <
[hidden email]> wrote:

> Thanks Renuka,
>
> Typo fixed at r1805775
>
> Jacques
>
>
> Le 22/08/2017 à 16:26, Renuka Srishti a écrit :
>
>> Mail is not showing the code in the correct way:
>> So the correct line of code is outParamMap.title =
>> uiLabelMap.WebtoolsOutParameters
>>
>> Thanks
>> Renuka Srishti
>>
>> On Tue, Aug 22, 2017 at 7:48 PM, Renuka Srishti <
>> [hidden email]>
>> wrote:
>>
>> In this commit <http://markmail.org/message/ghaso2snobssoo74>
>>> *outParamMap.title = uiLabelMap.**WebtoolsOutParameters) *, there is a
>>> typo mistake of a closing bracket which is leading for screen
>>> <https://demo-trunk.ofbiz.apache.org/webtools/control/ServiceList>
>>> broken.
>>>
>>> It should be *outParamMap.title = uiLabelMap.*
>>>
>>> *WebtoolsOutParameters*
>>> Thanks
>>> Renuka Srishti
>>>
>>> On Sun, Aug 20, 2017 at 5:41 PM, <[hidden email]> wrote:
>>>
>>> Author: jleroux
>>>> Date: Sun Aug 20 12:11:39 2017
>>>> New Revision: 1805548
>>>>
>>>> URL: http://svn.apache.org/viewvc?rev=1805548&view=rev
>>>> Log:
>>>> No functional change,
>>>>
>>>> In 3 places we use uiLabelMap.get("xxxxx") instead of uiLabelMap.xxxxx
>>>> which
>>>> does essentially the same when there is no default parameter passed to
>>>> get()
>>>> http://mrhaki.blogspot.fr/2009/11/groovy-goodness-get-value-
>>>> from-map-or.html
>>>>
>>>> Modified:
>>>>      ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts
>>>> /datafile/ViewDataFile.groovy
>>>>      ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts
>>>> /service/AvailableServices.groovy
>>>>
>>>> Modified: ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts
>>>> /datafile/ViewDataFile.groovy
>>>> URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/fra
>>>> mework/webtools/groovyScripts/datafile/ViewDataFile.groovy?
>>>> rev=1805548&r1=1805547&r2=1805548&view=diff
>>>> ============================================================
>>>> ==================
>>>> --- ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts
>>>> /datafile/ViewDataFile.groovy
>>>> (original)
>>>> +++ ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts
>>>> /datafile/ViewDataFile.groovy
>>>> Sun Aug 20 12:11:39 2017
>>>> @@ -83,7 +83,7 @@ if (dataFile) {
>>>>   if (dataFile && dataFileSave) {
>>>>       try {
>>>>           dataFile.writeDataFile(dataFileSave)
>>>> -        messages.add(uiLabelMap.get("WebtoolsDataFileSavedTo") +
>>>> dataFileSave)
>>>> +        messages.add(uiLabelMap.WebtoolsDataFileSavedTo) +
>>>> dataFileSave)
>>>>       }
>>>>       catch (Exception e) {
>>>>           messages.add(e.getMessage())
>>>> @@ -94,7 +94,7 @@ if (dataFile && entityXmlFileSave) {
>>>>       try {
>>>>           //dataFile.writeDataFile(entityXmlFileSave)
>>>>           DataFile2EntityXml.writeToEntityXml(entityXmlFileSave,
>>>> dataFile)
>>>> -        messages.add(uiLabelMap.get("WebtoolsDataEntityFileSavedTo") +
>>>> entityXmlFileSave)
>>>> +        messages.add(uiLabelMap.WebtoolsDataEntityFileSavedTo) +
>>>> entityXmlFileSave)
>>>>       }
>>>>       catch (Exception e) {
>>>>           messages.add(e.getMessage())
>>>>
>>>> Modified: ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts
>>>> /service/AvailableServices.groovy
>>>> URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/fra
>>>> mework/webtools/groovyScripts/service/AvailableServices.
>>>> groovy?rev=1805548&r1=1805547&r2=1805548&view=diff
>>>> ============================================================
>>>> ==================
>>>> --- ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts
>>>> /service/AvailableServices.groovy (original)
>>>> +++ ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts
>>>> /service/AvailableServices.groovy Sun Aug 20 12:11:39 2017
>>>> @@ -450,7 +450,7 @@ if (selectedService) {
>>>>               outParamsList.add(curOutParam)
>>>>           }
>>>>           outParamMap = [:]
>>>> -        outParamMap.title = uiLabelMap.get("WebtoolsOutParameters")
>>>> +        outParamMap.title = uiLabelMap.WebtoolsOutParameters)
>>>>           outParamMap.paramList = outParamsList
>>>>           allParamsList.add(outParamMap)
>>>>
>>>>
>>>>
>>>>
>>>>
>
Reply | Threaded
Open this post in threaded view
|

Re: svn commit: r1805548 - in /ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts: datafile/ViewDataFile.groovy service/AvailableServices.groovy

Renuka Srishti-2
In reply to this post by Renuka Srishti-2
In this commit, there is two typo mistake in ViewDataFile.groovy. Extra
closing bracket after dataFileSave and entityXmlFileSave which leads to
screen <https://demo-trunk.ofbiz.apache.org/webtools/control/viewdatafile>
broken.

Thanks
Renuka Srishti

On Sun, Aug 20, 2017 at 5:41 PM, <[hidden email]> wrote:

> Author: jleroux
> Date: Sun Aug 20 12:11:39 2017
> New Revision: 1805548
>
> URL: http://svn.apache.org/viewvc?rev=1805548&view=rev
> Log:
> No functional change,
>
> In 3 places we use uiLabelMap.get("xxxxx") instead of uiLabelMap.xxxxx
> which
> does essentially the same when there is no default parameter passed to
> get()
> http://mrhaki.blogspot.fr/2009/11/groovy-goodness-get-
> value-from-map-or.html
>
> Modified:
>     ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts/datafile/
> ViewDataFile.groovy
>     ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts/service/
> AvailableServices.groovy
>
> Modified: ofbiz/ofbiz-framework/trunk/framework/webtools/
> groovyScripts/datafile/ViewDataFile.groovy
> URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/
> framework/webtools/groovyScripts/datafile/ViewDataFile.groovy?rev=
> 1805548&r1=1805547&r2=1805548&view=diff
> ============================================================
> ==================
> --- ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts/datafile/ViewDataFile.groovy
> (original)
> +++ ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts/datafile/ViewDataFile.groovy
> Sun Aug 20 12:11:39 2017
> @@ -83,7 +83,7 @@ if (dataFile) {
>  if (dataFile && dataFileSave) {
>      try {
>          dataFile.writeDataFile(dataFileSave)
> -        messages.add(uiLabelMap.get("WebtoolsDataFileSavedTo") +
> dataFileSave)
> +        messages.add(uiLabelMap.WebtoolsDataFileSavedTo) + dataFileSave)
>      }
>      catch (Exception e) {
>          messages.add(e.getMessage())
> @@ -94,7 +94,7 @@ if (dataFile && entityXmlFileSave) {
>      try {
>          //dataFile.writeDataFile(entityXmlFileSave)
>          DataFile2EntityXml.writeToEntityXml(entityXmlFileSave, dataFile)
> -        messages.add(uiLabelMap.get("WebtoolsDataEntityFileSavedTo") +
> entityXmlFileSave)
> +        messages.add(uiLabelMap.WebtoolsDataEntityFileSavedTo) +
> entityXmlFileSave)
>      }
>      catch (Exception e) {
>          messages.add(e.getMessage())
>
> Modified: ofbiz/ofbiz-framework/trunk/framework/webtools/
> groovyScripts/service/AvailableServices.groovy
> URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/
> framework/webtools/groovyScripts/service/AvailableServices.groovy?rev=
> 1805548&r1=1805547&r2=1805548&view=diff
> ============================================================
> ==================
> --- ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts/service/AvailableServices.groovy
> (original)
> +++ ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts/service/AvailableServices.groovy
> Sun Aug 20 12:11:39 2017
> @@ -450,7 +450,7 @@ if (selectedService) {
>              outParamsList.add(curOutParam)
>          }
>          outParamMap = [:]
> -        outParamMap.title = uiLabelMap.get("WebtoolsOutParameters")
> +        outParamMap.title = uiLabelMap.WebtoolsOutParameters)
>          outParamMap.paramList = outParamsList
>          allParamsList.add(outParamMap)
>
>
>
>
Reply | Threaded
Open this post in threaded view
|

Re: svn commit: r1805548 - in /ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts: datafile/ViewDataFile.groovy service/AvailableServices.groovy

Jacques Le Roux
Administrator
Thanks again Renuka,

I should have taken care of it more the 1st time. It was not a typo but my S/R regexp which was wrong :/

Jacques


Le 23/08/2017 à 17:19, Renuka Srishti a écrit :

> In this commit, there is two typo mistake in ViewDataFile.groovy. Extra
> closing bracket after dataFileSave and entityXmlFileSave which leads to
> screen <https://demo-trunk.ofbiz.apache.org/webtools/control/viewdatafile>
> broken.
>
> Thanks
> Renuka Srishti
>
> On Sun, Aug 20, 2017 at 5:41 PM, <[hidden email]> wrote:
>
>> Author: jleroux
>> Date: Sun Aug 20 12:11:39 2017
>> New Revision: 1805548
>>
>> URL: http://svn.apache.org/viewvc?rev=1805548&view=rev
>> Log:
>> No functional change,
>>
>> In 3 places we use uiLabelMap.get("xxxxx") instead of uiLabelMap.xxxxx
>> which
>> does essentially the same when there is no default parameter passed to
>> get()
>> http://mrhaki.blogspot.fr/2009/11/groovy-goodness-get-
>> value-from-map-or.html
>>
>> Modified:
>>      ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts/datafile/
>> ViewDataFile.groovy
>>      ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts/service/
>> AvailableServices.groovy
>>
>> Modified: ofbiz/ofbiz-framework/trunk/framework/webtools/
>> groovyScripts/datafile/ViewDataFile.groovy
>> URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/
>> framework/webtools/groovyScripts/datafile/ViewDataFile.groovy?rev=
>> 1805548&r1=1805547&r2=1805548&view=diff
>> ============================================================
>> ==================
>> --- ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts/datafile/ViewDataFile.groovy
>> (original)
>> +++ ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts/datafile/ViewDataFile.groovy
>> Sun Aug 20 12:11:39 2017
>> @@ -83,7 +83,7 @@ if (dataFile) {
>>   if (dataFile && dataFileSave) {
>>       try {
>>           dataFile.writeDataFile(dataFileSave)
>> -        messages.add(uiLabelMap.get("WebtoolsDataFileSavedTo") +
>> dataFileSave)
>> +        messages.add(uiLabelMap.WebtoolsDataFileSavedTo) + dataFileSave)
>>       }
>>       catch (Exception e) {
>>           messages.add(e.getMessage())
>> @@ -94,7 +94,7 @@ if (dataFile && entityXmlFileSave) {
>>       try {
>>           //dataFile.writeDataFile(entityXmlFileSave)
>>           DataFile2EntityXml.writeToEntityXml(entityXmlFileSave, dataFile)
>> -        messages.add(uiLabelMap.get("WebtoolsDataEntityFileSavedTo") +
>> entityXmlFileSave)
>> +        messages.add(uiLabelMap.WebtoolsDataEntityFileSavedTo) +
>> entityXmlFileSave)
>>       }
>>       catch (Exception e) {
>>           messages.add(e.getMessage())
>>
>> Modified: ofbiz/ofbiz-framework/trunk/framework/webtools/
>> groovyScripts/service/AvailableServices.groovy
>> URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/
>> framework/webtools/groovyScripts/service/AvailableServices.groovy?rev=
>> 1805548&r1=1805547&r2=1805548&view=diff
>> ============================================================
>> ==================
>> --- ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts/service/AvailableServices.groovy
>> (original)
>> +++ ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts/service/AvailableServices.groovy
>> Sun Aug 20 12:11:39 2017
>> @@ -450,7 +450,7 @@ if (selectedService) {
>>               outParamsList.add(curOutParam)
>>           }
>>           outParamMap = [:]
>> -        outParamMap.title = uiLabelMap.get("WebtoolsOutParameters")
>> +        outParamMap.title = uiLabelMap.WebtoolsOutParameters)
>>           outParamMap.paramList = outParamsList
>>           allParamsList.add(outParamMap)
>>
>>
>>
>>

Reply | Threaded
Open this post in threaded view
|

Re: svn commit: r1805548 - in /ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts: datafile/ViewDataFile.groovy service/AvailableServices.groovy

Jacques Le Roux
Administrator
Le 23/08/2017 à 18:29, Jacques Le Roux a écrit :
> Thanks again Renuka,
>
> I should have taken care of it more the 1st time. It was not a typo but my S/R regexp which was wrong :/
Forgot: fixed at r1805936

>
> Jacques
>
>
> Le 23/08/2017 à 17:19, Renuka Srishti a écrit :
>> In this commit, there is two typo mistake in ViewDataFile.groovy. Extra
>> closing bracket after dataFileSave and entityXmlFileSave which leads to
>> screen <https://demo-trunk.ofbiz.apache.org/webtools/control/viewdatafile>
>> broken.
>>
>> Thanks
>> Renuka Srishti
>>
>> On Sun, Aug 20, 2017 at 5:41 PM, <[hidden email]> wrote:
>>
>>> Author: jleroux
>>> Date: Sun Aug 20 12:11:39 2017
>>> New Revision: 1805548
>>>
>>> URL: http://svn.apache.org/viewvc?rev=1805548&view=rev
>>> Log:
>>> No functional change,
>>>
>>> In 3 places we use uiLabelMap.get("xxxxx") instead of uiLabelMap.xxxxx
>>> which
>>> does essentially the same when there is no default parameter passed to
>>> get()
>>> http://mrhaki.blogspot.fr/2009/11/groovy-goodness-get-
>>> value-from-map-or.html
>>>
>>> Modified:
>>> ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts/datafile/
>>> ViewDataFile.groovy
>>> ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts/service/
>>> AvailableServices.groovy
>>>
>>> Modified: ofbiz/ofbiz-framework/trunk/framework/webtools/
>>> groovyScripts/datafile/ViewDataFile.groovy
>>> URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/
>>> framework/webtools/groovyScripts/datafile/ViewDataFile.groovy?rev=
>>> 1805548&r1=1805547&r2=1805548&view=diff
>>> ============================================================
>>> ==================
>>> --- ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts/datafile/ViewDataFile.groovy
>>> (original)
>>> +++ ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts/datafile/ViewDataFile.groovy
>>> Sun Aug 20 12:11:39 2017
>>> @@ -83,7 +83,7 @@ if (dataFile) {
>>>   if (dataFile && dataFileSave) {
>>>       try {
>>>           dataFile.writeDataFile(dataFileSave)
>>> - messages.add(uiLabelMap.get("WebtoolsDataFileSavedTo") +
>>> dataFileSave)
>>> +        messages.add(uiLabelMap.WebtoolsDataFileSavedTo) + dataFileSave)
>>>       }
>>>       catch (Exception e) {
>>>           messages.add(e.getMessage())
>>> @@ -94,7 +94,7 @@ if (dataFile && entityXmlFileSave) {
>>>       try {
>>>           //dataFile.writeDataFile(entityXmlFileSave)
>>> DataFile2EntityXml.writeToEntityXml(entityXmlFileSave, dataFile)
>>> - messages.add(uiLabelMap.get("WebtoolsDataEntityFileSavedTo") +
>>> entityXmlFileSave)
>>> + messages.add(uiLabelMap.WebtoolsDataEntityFileSavedTo) +
>>> entityXmlFileSave)
>>>       }
>>>       catch (Exception e) {
>>>           messages.add(e.getMessage())
>>>
>>> Modified: ofbiz/ofbiz-framework/trunk/framework/webtools/
>>> groovyScripts/service/AvailableServices.groovy
>>> URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/
>>> framework/webtools/groovyScripts/service/AvailableServices.groovy?rev=
>>> 1805548&r1=1805547&r2=1805548&view=diff
>>> ============================================================
>>> ==================
>>> --- ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts/service/AvailableServices.groovy
>>> (original)
>>> +++ ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts/service/AvailableServices.groovy
>>> Sun Aug 20 12:11:39 2017
>>> @@ -450,7 +450,7 @@ if (selectedService) {
>>>               outParamsList.add(curOutParam)
>>>           }
>>>           outParamMap = [:]
>>> -        outParamMap.title = uiLabelMap.get("WebtoolsOutParameters")
>>> +        outParamMap.title = uiLabelMap.WebtoolsOutParameters)
>>>           outParamMap.paramList = outParamsList
>>>           allParamsList.add(outParamMap)
>>>
>>>
>>>
>>>
>
>