svn commit: r1858540 - in /ofbiz/ofbiz-framework/branches/release18.12: ./ applications/content/servicedef/services.xml

[jacopoc]

Author: jacopoc
Date: Thu May  2 13:42:19 2019
New Revision: 1858540

URL: http://svn.apache.org/viewvc?rev=1858540&view=rev
Log:
Applied fix from trunk for revision: 1858539
===

Improved: Replaced permission-service with required-permissions in order to
perform permission checks in a way that is more consistent with the screen
permissions set in the ecommerce blog/forum screens.



Modified:
    ofbiz/ofbiz-framework/branches/release18.12/   (props changed)
    ofbiz/ofbiz-framework/branches/release18.12/applications/content/servicedef/services.xml

Propchange: ofbiz/ofbiz-framework/branches/release18.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May  2 13:42:19 2019
@@ -10,4 +10,4 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/ofbiz-framework/trunk:1849931,1850015,1850023,1850530,1850647,1850685,1850694,1850711,1850914,1850918,1850921,1850948,1850953,1851006,1851013,1851068,1851074,1851130,1851158,1851200,1851224,1851247,1851254,1851315,1851319,1851350,1851353,1851433,1851500,1851805,1851885,1851998,1852503,1852587,1852818,1852882,1853070,1853109,1853691,1853745,1853750,1854306,1854457,1854683,1855078,1855083,1855287,1855371,1855403,1855488,1855492,1855497,1855501,1855898,1856212,1856405,1856455,1856459-1856460,1856484,1856598,1856610,1856613,1856617,1856667,1857099,1857152,1857154,1857173,1857180,1857213,1857392,1857617,1857692,1857813,1858035,1858092,1858180,1858250,1858256,1858275,1858319,1858347,1858432,1858444,1858523
+/ofbiz/ofbiz-framework/trunk:1849931,1850015,1850023,1850530,1850647,1850685,1850694,1850711,1850914,1850918,1850921,1850948,1850953,1851006,1851013,1851068,1851074,1851130,1851158,1851200,1851224,1851247,1851254,1851315,1851319,1851350,1851353,1851433,1851500,1851805,1851885,1851998,1852503,1852587,1852818,1852882,1853070,1853109,1853691,1853745,1853750,1854306,1854457,1854683,1855078,1855083,1855287,1855371,1855403,1855488,1855492,1855497,1855501,1855898,1856212,1856405,1856455,1856459-1856460,1856484,1856598,1856610,1856613,1856617,1856667,1857099,1857152,1857154,1857173,1857180,1857213,1857392,1857617,1857692,1857813,1858035,1858092,1858180,1858250,1858256,1858275,1858319,1858347,1858432,1858444,1858523,1858539

Modified: ofbiz/ofbiz-framework/branches/release18.12/applications/content/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/applications/content/servicedef/services.xml?rev=1858540&r1=1858539&r2=1858540&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release18.12/applications/content/servicedef/services.xml (original)
+++ ofbiz/ofbiz-framework/branches/release18.12/applications/content/servicedef/services.xml Thu May  2 13:42:19 2019
@@ -478,7 +478,9 @@
     <service name="createArticleContent" engine="simple" transaction-timeout="300" auth="true"
             location="component://content/minilang/content/ContentServices.xml" invoke="createArticleContent">
         <description>Creates content records for a blog entry</description>
-        <permission-service service-name="genericContentPermission" main-action="CREATE"/>
+        <required-permissions join-type="AND">
+            <check-permission permission="CONTENTMGR" action="_CREATE"/>
+        </required-permissions>
         <implements service="createContentFromUploadedFile" optional="true"/>
         <implements service="createTextContent" optional="true"/>
         <attribute name="contentIdFrom" type="String" mode="IN" optional="false">
@@ -1081,7 +1083,9 @@
     <service name="createBlogEntry" engine="simple" auth="true"
         location="component://content/minilang/blog/BlogServices.xml" invoke="createBlogEntry">
         <description>Creates content records for a blog entry</description>
-        <permission-service service-name="genericContentPermission" main-action="CREATE"/>
+        <required-permissions join-type="AND">
+            <check-permission permission="CONTENTMGR" action="_CREATE"/>
+        </required-permissions>
         <implements service="uploadFileInterface" optional="true"/>
         <attribute name="blogContentId" type="String" mode="INOUT" optional="false">
             <type-validate>
@@ -1099,7 +1103,9 @@
     <service name="updateBlogEntry" engine="simple" auth="true"
         location="component://content/minilang/blog/BlogServices.xml" invoke="updateBlogEntry">
         <description>Updates content records for a blog entry</description>
-        <permission-service service-name="genericContentPermission" main-action="CREATE"/>
+        <required-permissions join-type="AND">
+            <check-permission permission="CONTENTMGR" action="_UPDATE"/>
+        </required-permissions>
         <implements service="uploadFileInterface" optional="true"/>
         <attribute name="blogContentId" type="String" mode="INOUT" optional="false">
             <type-validate>