Re: svn commit: r1781366 [1/3] - in /ofbiz/trunk: applications/content/widget/compdoc/ applications/content/widget/content/ applications/product/template/ applications/product/template/store/ applicat

2017-02-02 Thread Pranay Pandey
Thanks Gil.

Best regards,

Pranay Pandey
HotWax Systems
http://www.hotwaxsystems.com/

On Thu, Feb 2, 2017 at 6:28 PM, gil portenseigne <
gil.portensei...@nereide.fr> wrote:

> Hello Pranay,
>
> Jacques reverted it just after, he did not commited it on purpose.
>
> Regards,
>
> Gil
>
>
>
> Le 02/02/2017 à 13:52, Pranay Pandey a écrit :
>
>> ??
>>
>> Log:
>> Implemented:
>> Improved:
>> Documented:
>> Completed:
>> Reverted:
>> Fixed:
>> (OFBIZ-)
>> Explanation
>> Thanks:
>>
>> Best regards,
>>
>> Pranay Pandey
>> HotWax Systems
>> http://www.hotwaxsystems.com/
>>
>> On Thu, Feb 2, 2017 at 4:03 PM,  wrote:
>>
>> Author: jleroux
>>> Date: Thu Feb  2 10:33:59 2017
>>> New Revision: 1781366
>>>
>>> URL: http://svn.apache.org/viewvc?rev=1781366=rev
>>> Log:
>>> Implemented:
>>> Improved:
>>> Documented:
>>> Completed:
>>> Reverted:
>>> Fixed:
>>> (OFBIZ-)
>>> Explanation
>>> Thanks:
>>>
>>> Added:
>>>  ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/
>>> Owasp.CsrfGuard.js
>>>   (with props)
>>>  ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/
>>> Owasp.CsrfGuard.properties
>>>   (with props)
>>>  ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller
>>> -
>>> Copie.xml   (with props)
>>>  ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/web -
>>> Copie.xml   (with props)
>>>  ofbiz/trunk/framework/webapp/config/requestHandler -
>>> Copie.properties   (with props)
>>>  ofbiz/trunk/themes/tomahawk/template/Header - Copie.ftl   (with
>>> props)
>>> Modified:
>>>  ofbiz/trunk/applications/content/widget/compdoc/
>>> CompDocTemplateTree.xml
>>>  ofbiz/trunk/applications/content/widget/content/ContentForms.xml
>>>  ofbiz/trunk/applications/product/template/Main.ftl
>>>  ofbiz/trunk/applications/product/template/store/
>>> EditProductStoreWebSites.ftl
>>>  ofbiz/trunk/framework/base/src/main/java/org/apache/
>>> ofbiz/base/util/template/FreeMarkerWorker.java
>>>  ofbiz/trunk/framework/minilang/src/main/java/org/
>>> apache/ofbiz/minilang/method/entityops/EntityOne.java
>>>  ofbiz/trunk/framework/widget/dtd/widget-common.xsd
>>>  ofbiz/trunk/framework/widget/src/main/java/org/apache/
>>> ofbiz/widget/renderer/macro/MacroFormRenderer.java
>>>
>>> Modified: ofbiz/trunk/applications/content/widget/compdoc/
>>> CompDocTemplateTree.xml
>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/
>>> content/widget/compdoc/CompDocTemplateTree.xml?rev=
>>> 1781366=1781365=1781366=diff
>>> 
>>> ==
>>> --- ofbiz/trunk/applications/content/widget/compdoc/CompDocTempl
>>> ateTree.xml
>>> (original)
>>> +++ ofbiz/trunk/applications/content/widget/compdoc/CompDocTempl
>>> ateTree.xml
>>> Thu Feb  2 10:33:59 2017
>>> @@ -22,7 +22,7 @@ under the License.
>>>   >> root-node-name="node-root"
>>>   default-render-style="simple" default-wrap-style="treeWrappe
>>> r">
>>>   
>>> -
>>> +>> use-cache="false">
>>>   >> from-field="rootContentId"/>
>>>   
>>>   >> location="component://content/widget/compdoc/CompDocScreens.xml"/>
>>> @@ -54,7 +54,7 @@ under the License.
>>>   
>>>   
>>>   >> entity-name="AssocRevisionItemView" wrap-style="treeWrapper">
>>> -
>>> +>> use-cache="false">
>>>   >> from-field="itemContentId"/>
>>>   
>>>   >> location="component://content/widget/compdoc/CompDocScreens.xml"/>
>>> @@ -90,7 +90,7 @@ under the License.
>>>   >> root-node-name="node-root"
>>>   default-render-style="simple" default-wrap-style="treeWrappe
>>> r">
>>>   
>>> -
>>> +>> use-cache="false">
>>>   >> from-field="instanceContent.instanceOfContentId"/>
>>>   
>>>   >> location="component://content/widget/compdoc/CompDocScreens.xml"/>
>>> @@ -122,7 +122,7 @@ under the License.
>>>   
>>>   
>>>   >> entity-name="AssocRevisionItemView">
>>> -
>>> +>> use-cache="false">
>>>   >> from-field="itemContentId"/>
>>>   
>>>   >> location="component://content/widget/compdoc/CompDocScreens.xml"/>
>>>
>>> Modified: ofbiz/trunk/applications/content/widget/content/ContentForms
>>> .xml
>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/
>>> content/widget/content/ContentForms.xml?rev=1781366&
>>> r1=1781365=1781366=diff
>>> 
>>> ==
>>> --- ofbiz/trunk/applications/content/widget/content/ContentForms.xml
>>> (original)
>>> +++ ofbiz/trunk/applications/content/widget/content/ContentForms.xml Thu
>>> Feb  2 10:33:59 2017
>>> @@ -230,9 +230,9 @@ under the License.
>>>   
>>>   
>>>   >> type="single"
>>> -

Re: svn commit: r1781366 [1/3] - in /ofbiz/trunk: applications/content/widget/compdoc/ applications/content/widget/content/ applications/product/template/ applications/product/template/store/ applicat

2017-02-02 Thread gil portenseigne

Hello Pranay,

Jacques reverted it just after, he did not commited it on purpose.

Regards,

Gil


Le 02/02/2017 à 13:52, Pranay Pandey a écrit :

??

Log:
Implemented:
Improved:
Documented:
Completed:
Reverted:
Fixed:
(OFBIZ-)
Explanation
Thanks:

Best regards,

Pranay Pandey
HotWax Systems
http://www.hotwaxsystems.com/

On Thu, Feb 2, 2017 at 4:03 PM,  wrote:


Author: jleroux
Date: Thu Feb  2 10:33:59 2017
New Revision: 1781366

URL: http://svn.apache.org/viewvc?rev=1781366=rev
Log:
Implemented:
Improved:
Documented:
Completed:
Reverted:
Fixed:
(OFBIZ-)
Explanation
Thanks:

Added:
 ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/Owasp.CsrfGuard.js
  (with props)
 
ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/Owasp.CsrfGuard.properties
  (with props)
 ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller -
Copie.xml   (with props)
 ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/web -
Copie.xml   (with props)
 ofbiz/trunk/framework/webapp/config/requestHandler -
Copie.properties   (with props)
 ofbiz/trunk/themes/tomahawk/template/Header - Copie.ftl   (with props)
Modified:
 ofbiz/trunk/applications/content/widget/compdoc/
CompDocTemplateTree.xml
 ofbiz/trunk/applications/content/widget/content/ContentForms.xml
 ofbiz/trunk/applications/product/template/Main.ftl
 ofbiz/trunk/applications/product/template/store/
EditProductStoreWebSites.ftl
 ofbiz/trunk/framework/base/src/main/java/org/apache/
ofbiz/base/util/template/FreeMarkerWorker.java
 ofbiz/trunk/framework/minilang/src/main/java/org/
apache/ofbiz/minilang/method/entityops/EntityOne.java
 ofbiz/trunk/framework/widget/dtd/widget-common.xsd
 ofbiz/trunk/framework/widget/src/main/java/org/apache/
ofbiz/widget/renderer/macro/MacroFormRenderer.java

Modified: ofbiz/trunk/applications/content/widget/compdoc/
CompDocTemplateTree.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/
content/widget/compdoc/CompDocTemplateTree.xml?rev=
1781366=1781365=1781366=diff

==
--- ofbiz/trunk/applications/content/widget/compdoc/CompDocTemplateTree.xml
(original)
+++ ofbiz/trunk/applications/content/widget/compdoc/CompDocTemplateTree.xml
Thu Feb  2 10:33:59 2017
@@ -22,7 +22,7 @@ under the License.
  
  
-
+
  
  
  
@@ -54,7 +54,7 @@ under the License.
  
  
  
-
+
  
  
  
@@ -90,7 +90,7 @@ under the License.
  
  
-
+
  
  
  
@@ -122,7 +122,7 @@ under the License.
  
  
  
-
+
  
  
  

Modified: ofbiz/trunk/applications/content/widget/content/ContentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/
content/widget/content/ContentForms.xml?rev=1781366&
r1=1781365=1781366=diff

==
--- ofbiz/trunk/applications/content/widget/content/ContentForms.xml
(original)
+++ ofbiz/trunk/applications/content/widget/content/ContentForms.xml Thu
Feb  2 10:33:59 2017
@@ -230,9 +230,9 @@ under the License.
  
  
  
+header-row-style="header-row" default-table-style="basic-table"
default-entity-name="contentAssocX">
  
-
+
  
  
  

Modified: ofbiz/trunk/applications/product/template/Main.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/
product/template/Main.ftl?rev=1781366=1781365=1781366=diff

==
--- ofbiz/trunk/applications/product/template/Main.ftl (original)
+++ ofbiz/trunk/applications/product/template/Main.ftl Thu Feb  2
10:33:59 2017
@@ -29,6 +29,8 @@ under the License.

${uiLabelMap.CommonOr}: ${uiLabelMap.ProductCreateNewCatalog}

+Output format: ${.output_format}
+Auto-escaping: ${.auto_esc?c}
${uiLabelMap.ProductEditCategoryWithCategor
yId}:

  <@htmlTemplate.lookupField name="productCategoryId"
id="productCategoryId" formName="EditCategoryForm" fieldFormName="
LookupProductCategory"/>

Modified: ofbiz/trunk/applications/product/template/store/
EditProductStoreWebSites.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/
product/template/store/EditProductStoreWebSites.ftl?
rev=1781366=1781365=1781366=diff

==
--- ofbiz/trunk/applications/product/template/store/EditProductStoreWebSites.ftl
(original)
+++ ofbiz/trunk/applications/product/template/store/EditProductStoreWebSites.ftl
Thu Feb  2 10:33:59 2017
@@ -37,12 +37,7 @@ under the License.
  

Re: svn commit: r1781366 [1/3] - in /ofbiz/trunk: applications/content/widget/compdoc/ applications/content/widget/content/ applications/product/template/ applications/product/template/store/ applicat

2017-02-02 Thread Pranay Pandey
??

Log:
Implemented:
Improved:
Documented:
Completed:
Reverted:
Fixed:
(OFBIZ-)
Explanation
Thanks:

Best regards,

Pranay Pandey
HotWax Systems
http://www.hotwaxsystems.com/

On Thu, Feb 2, 2017 at 4:03 PM,  wrote:

> Author: jleroux
> Date: Thu Feb  2 10:33:59 2017
> New Revision: 1781366
>
> URL: http://svn.apache.org/viewvc?rev=1781366=rev
> Log:
> Implemented:
> Improved:
> Documented:
> Completed:
> Reverted:
> Fixed:
> (OFBIZ-)
> Explanation
> Thanks:
>
> Added:
> ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/Owasp.CsrfGuard.js
>  (with props)
> 
> ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/Owasp.CsrfGuard.properties
>  (with props)
> ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller -
> Copie.xml   (with props)
> ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/web -
> Copie.xml   (with props)
> ofbiz/trunk/framework/webapp/config/requestHandler -
> Copie.properties   (with props)
> ofbiz/trunk/themes/tomahawk/template/Header - Copie.ftl   (with props)
> Modified:
> ofbiz/trunk/applications/content/widget/compdoc/
> CompDocTemplateTree.xml
> ofbiz/trunk/applications/content/widget/content/ContentForms.xml
> ofbiz/trunk/applications/product/template/Main.ftl
> ofbiz/trunk/applications/product/template/store/
> EditProductStoreWebSites.ftl
> ofbiz/trunk/framework/base/src/main/java/org/apache/
> ofbiz/base/util/template/FreeMarkerWorker.java
> ofbiz/trunk/framework/minilang/src/main/java/org/
> apache/ofbiz/minilang/method/entityops/EntityOne.java
> ofbiz/trunk/framework/widget/dtd/widget-common.xsd
> ofbiz/trunk/framework/widget/src/main/java/org/apache/
> ofbiz/widget/renderer/macro/MacroFormRenderer.java
>
> Modified: ofbiz/trunk/applications/content/widget/compdoc/
> CompDocTemplateTree.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/
> content/widget/compdoc/CompDocTemplateTree.xml?rev=
> 1781366=1781365=1781366=diff
> 
> ==
> --- ofbiz/trunk/applications/content/widget/compdoc/CompDocTemplateTree.xml
> (original)
> +++ ofbiz/trunk/applications/content/widget/compdoc/CompDocTemplateTree.xml
> Thu Feb  2 10:33:59 2017
> @@ -22,7 +22,7 @@ under the License.
>   root-node-name="node-root"
>  default-render-style="simple" default-wrap-style="treeWrapper">
>  
> -
> + use-cache="false">
>   from-field="rootContentId"/>
>  
>   location="component://content/widget/compdoc/CompDocScreens.xml"/>
> @@ -54,7 +54,7 @@ under the License.
>  
>  
>   entity-name="AssocRevisionItemView" wrap-style="treeWrapper">
> -
> + use-cache="false">
>   from-field="itemContentId"/>
>  
>   location="component://content/widget/compdoc/CompDocScreens.xml"/>
> @@ -90,7 +90,7 @@ under the License.
>   root-node-name="node-root"
>  default-render-style="simple" default-wrap-style="treeWrapper">
>  
> -
> + use-cache="false">
>   from-field="instanceContent.instanceOfContentId"/>
>  
>   location="component://content/widget/compdoc/CompDocScreens.xml"/>
> @@ -122,7 +122,7 @@ under the License.
>  
>  
>   entity-name="AssocRevisionItemView">
> -
> + use-cache="false">
>   from-field="itemContentId"/>
>  
>   location="component://content/widget/compdoc/CompDocScreens.xml"/>
>
> Modified: ofbiz/trunk/applications/content/widget/content/ContentForms.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/
> content/widget/content/ContentForms.xml?rev=1781366&
> r1=1781365=1781366=diff
> 
> ==
> --- ofbiz/trunk/applications/content/widget/content/ContentForms.xml
> (original)
> +++ ofbiz/trunk/applications/content/widget/content/ContentForms.xml Thu
> Feb  2 10:33:59 2017
> @@ -230,9 +230,9 @@ under the License.
>  
>  
>   type="single"
> -header-row-style="header-row" default-table-style="basic-table">
> +header-row-style="header-row" default-table-style="basic-table"
> default-entity-name="contentAssocX">
>  
> -
> + value-field="contentAssoc">
>  
>   from-field="contentIdTo"/>
>  
>
> Modified: ofbiz/trunk/applications/product/template/Main.ftl
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/
> product/template/Main.ftl?rev=1781366=1781365=1781366=diff
> 
> ==
> --- ofbiz/trunk/applications/product/template/Main.ftl (original)
> +++ ofbiz/trunk/applications/product/template/Main.ftl Thu