[ofbiz-framework] branch trunk updated: Improved: Convert updateSingleContentPurpose service from mini-lang to groovy DSL(OFBIZ-11367)
This is an automated email from the ASF dual-hosted git repository.
pawan pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new 568fa2c Improved: Convert updateSingleContentPurpose service from
mini-lang to groovy DSL(OFBIZ-11367)
568fa2c is described below
commit 568fa2c1738334cdb3d4c184d9ad49ba0c1b79ca
Author: Pawan Verma
AuthorDate: Sat Aug 22 10:44:02 2020 +0530
Improved: Convert updateSingleContentPurpose service from mini-lang to
groovy DSL(OFBIZ-11367)
Thanks: Devanshu for report and Sourabh for the patch.
---
applications/content/groovyScripts/content/ContentServices.groovy | 5 +
applications/content/minilang/content/ContentServices.xml | 8
applications/content/servicedef/services_content.xml | 4 ++--
3 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/applications/content/groovyScripts/content/ContentServices.groovy
b/applications/content/groovyScripts/content/ContentServices.groovy
index 75e2d8f..cb53aa5 100644
--- a/applications/content/groovyScripts/content/ContentServices.groovy
+++ b/applications/content/groovyScripts/content/ContentServices.groovy
@@ -52,6 +52,11 @@ def createTextAndUploadedContent(){
return result
}
+def updateSingleContentPurpose() {
+delegator.removeByAnd("ContentPurpose", ["contentId":
parameters.contentId])
+run service : "createContentPurpose", with: parameters
+}
+
def createEmailContent() {
Map result = success()
Map createContentMap = dispatcher.getDispatchContext()
diff --git a/applications/content/minilang/content/ContentServices.xml
b/applications/content/minilang/content/ContentServices.xml
index 61e528f..68d6a47 100644
--- a/applications/content/minilang/content/ContentServices.xml
+++ b/applications/content/minilang/content/ContentServices.xml
@@ -136,14 +136,6 @@
-
-
-
-
-
-
-
-
diff --git a/applications/content/servicedef/services_content.xml
b/applications/content/servicedef/services_content.xml
index 6f12c3b..2719d11 100644
--- a/applications/content/servicedef/services_content.xml
+++ b/applications/content/servicedef/services_content.xml
@@ -412,8 +412,8 @@
-
+
Removes content purposes and creates a new
one
buildbot success in on ofbizTrunkFrameworkPlugins
The Buildbot has detected a restored build on builder ofbizTrunkFrameworkPlugins while building ofbiz-plugins. Full details are available at: https://ci.apache.org/builders/ofbizTrunkFrameworkPlugins/builds/1655 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf945_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'onTrunkPluginsCommit' triggered this build Build Source Stamp: [branch trunk] ad4bb6ec861bb64221d43149394b70c97907e795 Blamelist: Girish Vasmatkar Build succeeded! Sincerely, -The Buildbot
buildbot failure in on ofbizTrunkFrameworkPlugins
The Buildbot has detected a new failure on builder ofbizTrunkFrameworkPlugins while building ofbiz-framework. Full details are available at: https://ci.apache.org/builders/ofbizTrunkFrameworkPlugins/builds/1654 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf947_ubuntu Build Reason: downstream Build Source Stamp: [branch trunk] d014dfa4ed3fe8fe252b97c168fbfa19520fb484 Blamelist: Jacques Le Roux BUILD FAILED: failed testIntegration Sincerely, -The Buildbot
[ofbiz-plugins] branch trunk updated: Fixed: OpenApi mapping for Integer. Improved: Added missing OpenApi mapping for BigInteger.(OFBIZ-11328)
This is an automated email from the ASF dual-hosted git repository.
grv pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-plugins.git
The following commit(s) were added to refs/heads/trunk by this push:
new 2841acf Fixed: OpenApi mapping for Integer. Improved: Added missing
OpenApi mapping for BigInteger.(OFBIZ-11328)
2841acf is described below
commit 2841acfb81212ad4668fe191bb3e4556f682dd3d
Author: Girish Vasmatkar
AuthorDate: Fri Aug 21 16:06:32 2020 +0530
Fixed: OpenApi mapping for Integer.
Improved: Added missing OpenApi mapping for BigInteger.(OFBIZ-11328)
---
.../src/main/java/org/apache/ofbiz/ws/rs/util/OpenApiUtil.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git
a/ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/util/OpenApiUtil.java
b/ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/util/OpenApiUtil.java
index 0856581..7e32226 100644
--- a/ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/util/OpenApiUtil.java
+++ b/ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/util/OpenApiUtil.java
@@ -49,7 +49,7 @@ public final class OpenApiUtil {
CLASS_ALIAS.put("java.sql.Time", "String");
CLASS_ALIAS.put("Timestamp", "Timestamp");
CLASS_ALIAS.put("java.sql.Timestamp", "Timestamp");
-CLASS_ALIAS.put("Integer", "Int");
+CLASS_ALIAS.put("Integer", "Integer");
CLASS_ALIAS.put("java.lang.Integer", "Int");
CLASS_ALIAS.put("Long", "Long");
CLASS_ALIAS.put("java.lang.Long", "Long");
@@ -95,6 +95,7 @@ public final class OpenApiUtil {
JAVA_OPEN_API_MAP.put("Float", NumberSchema.class);
JAVA_OPEN_API_MAP.put("Double", NumberSchema.class);
JAVA_OPEN_API_MAP.put("BigDecimal", NumberSchema.class);
+JAVA_OPEN_API_MAP.put("BigInteger", IntegerSchema.class);
JAVA_OPEN_API_MAP.put("Timestamp", DateSchema.class);
}
[ofbiz-plugins] branch trunk updated: Improved: Added missing OpenApi mapping for Boolean and Java Collection types(OFBIZ-11328)
This is an automated email from the ASF dual-hosted git repository.
grv pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-plugins.git
The following commit(s) were added to refs/heads/trunk by this push:
new ad4bb6e Improved: Added missing OpenApi mapping for Boolean and Java
Collection types(OFBIZ-11328)
ad4bb6e is described below
commit ad4bb6ec861bb64221d43149394b70c97907e795
Author: Girish Vasmatkar
AuthorDate: Fri Aug 21 15:44:03 2020 +0530
Improved: Added missing OpenApi mapping for Boolean and Java Collection
types(OFBIZ-11328)
---
.../src/main/java/org/apache/ofbiz/ws/rs/util/OpenApiUtil.java| 4
1 file changed, 4 insertions(+)
diff --git
a/ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/util/OpenApiUtil.java
b/ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/util/OpenApiUtil.java
index 0920109..0856581 100644
--- a/ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/util/OpenApiUtil.java
+++ b/ofbiz-rest-impl/src/main/java/org/apache/ofbiz/ws/rs/util/OpenApiUtil.java
@@ -22,6 +22,7 @@ import java.util.HashMap;
import java.util.Map;
import io.swagger.v3.oas.models.media.ArraySchema;
+import io.swagger.v3.oas.models.media.BooleanSchema;
import io.swagger.v3.oas.models.media.DateSchema;
import io.swagger.v3.oas.models.media.IntegerSchema;
import io.swagger.v3.oas.models.media.MapSchema;
@@ -82,12 +83,15 @@ public final class OpenApiUtil {
JAVA_OPEN_API_MAP.put("String", StringSchema.class);
JAVA_OPEN_API_MAP.put("Integer", IntegerSchema.class);
JAVA_OPEN_API_MAP.put("Long", IntegerSchema.class);
+JAVA_OPEN_API_MAP.put("Boolean", BooleanSchema.class);
JAVA_OPEN_API_MAP.put("Map", MapSchema.class);
JAVA_OPEN_API_MAP.put("GenericEntity", MapSchema.class);
JAVA_OPEN_API_MAP.put("GenericPK", MapSchema.class);
JAVA_OPEN_API_MAP.put("GenericValue", MapSchema.class);
JAVA_OPEN_API_MAP.put("HashMap", MapSchema.class);
JAVA_OPEN_API_MAP.put("List", ArraySchema.class);
+JAVA_OPEN_API_MAP.put("Set", ArraySchema.class);
+JAVA_OPEN_API_MAP.put("Collection", ArraySchema.class);
JAVA_OPEN_API_MAP.put("Float", NumberSchema.class);
JAVA_OPEN_API_MAP.put("Double", NumberSchema.class);
JAVA_OPEN_API_MAP.put("BigDecimal", NumberSchema.class);
[ofbiz-framework] branch trunk updated: Improved: multi-block attribute for html-template tag (OFBIZ-11686)
This is an automated email from the ASF dual-hosted git repository. jamesyong pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git The following commit(s) were added to refs/heads/trunk by this push: new c3c41b2 Improved: multi-block attribute for html-template tag (OFBIZ-11686) c3c41b2 is described below commit c3c41b28b44050f6f76f1f2a6756444c6e7f500e Author: James Yong AuthorDate: Fri Aug 21 17:59:00 2020 +0800 Improved: multi-block attribute for html-template tag (OFBIZ-11686) Moved <@scriptTagsFooter/> within the body tag. --- themes/common-theme/template/includes/CloseHtmlBody.ftl | 2 +- themes/common-theme/template/includes/LookupFooter.ftl | 4 ++-- themes/flatgrey/template/Footer.ftl | 2 +- themes/rainbowstone/template/includes/Footer.ftl| 2 +- themes/tomahawk/template/Footer.ftl | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/themes/common-theme/template/includes/CloseHtmlBody.ftl b/themes/common-theme/template/includes/CloseHtmlBody.ftl index 9ad25cb..fef39b4 100644 --- a/themes/common-theme/template/includes/CloseHtmlBody.ftl +++ b/themes/common-theme/template/includes/CloseHtmlBody.ftl @@ -16,6 +16,6 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - <@scriptTagsFooter/> + diff --git a/themes/common-theme/template/includes/LookupFooter.ftl b/themes/common-theme/template/includes/LookupFooter.ftl index e00660c..fef39b4 100644 --- a/themes/common-theme/template/includes/LookupFooter.ftl +++ b/themes/common-theme/template/includes/LookupFooter.ftl @@ -16,6 +16,6 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - - <@scriptTagsFooter/> +<@scriptTagsFooter/> + diff --git a/themes/flatgrey/template/Footer.ftl b/themes/flatgrey/template/Footer.ftl index 67d70f9..64df1b3 100644 --- a/themes/flatgrey/template/Footer.ftl +++ b/themes/flatgrey/template/Footer.ftl @@ -41,6 +41,6 @@ under the License. - <@scriptTagsFooter/> + diff --git a/themes/rainbowstone/template/includes/Footer.ftl b/themes/rainbowstone/template/includes/Footer.ftl index 2741617..795ace3 100644 --- a/themes/rainbowstone/template/includes/Footer.ftl +++ b/themes/rainbowstone/template/includes/Footer.ftl @@ -33,6 +33,6 @@ under the License. - <@scriptTagsFooter/> + diff --git a/themes/tomahawk/template/Footer.ftl b/themes/tomahawk/template/Footer.ftl index 1f27daa..a2d78a7 100644 --- a/themes/tomahawk/template/Footer.ftl +++ b/themes/tomahawk/template/Footer.ftl @@ -41,6 +41,6 @@ under the License. - <@scriptTagsFooter/> +
[ofbiz-framework] branch release18.12 updated: Revert "Fixed: Expiring Daemon because JVM heap space is exhausted (OFBIZ-11954)"
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 a8821c7 Revert "Fixed: Expiring Daemon because JVM heap space is exhausted (OFBIZ-11954)" a8821c7 is described below commit a8821c7a7887f872271d47cf8f6961d9beaf88db Author: Jacques Le Roux AuthorDate: Fri Aug 21 11:36:17 2020 +0200 Revert "Fixed: Expiring Daemon because JVM heap space is exhausted (OFBIZ-11954)" This reverts commit 547abb70d6be1fd717639be6c7a9913d8a61d93f. --- gradle.properties | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 43a3a88..a08ddcf 100644 --- a/gradle.properties +++ b/gradle.properties @@ -17,5 +17,4 @@ # under the License. ### -org.gradle.console=plain -org.gradle.jvmargs=-Xmx2g -XX\:MaxHeapSize\=4g +org.gradle.console=plain \ No newline at end of file
[ofbiz-framework] branch trunk updated: Fixed: wrong maxheapsize (OFBIZ-11967)
This is an automated email from the ASF dual-hosted git repository. jleroux pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git The following commit(s) were added to refs/heads/trunk by this push: new d014dfa Fixed: wrong maxheapsize (OFBIZ-11967) d014dfa is described below commit d014dfa4ed3fe8fe252b97c168fbfa19520fb484 Author: Jacques Le Roux AuthorDate: Fri Aug 21 11:32:01 2020 +0200 Fixed: wrong maxheapsize (OFBIZ-11967) Reverts: Expiring Daemon because JVM heap space is exhausted (OFBIZ-11954) Most likely a local error on my machine because nobody else complained and my machine did not reboot for weeks Or an issue with Gradle 6.5.1, but I doubt. Anyway I still got the "Expiring Daemon because JVM heap space is exhausted" error with "org.gradle.jvmargs=-Xmx2g -XX\:MaxHeapSize\=4g" --- gradle.properties | 1 - 1 file changed, 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 43a3a88..c6259f4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -18,4 +18,3 @@ ### org.gradle.console=plain -org.gradle.jvmargs=-Xmx2g -XX\:MaxHeapSize\=4g
buildbot success in on ofbizTrunkFrameworkPlugins
The Buildbot has detected a restored build on builder ofbizTrunkFrameworkPlugins while building ofbiz-framework. Full details are available at: https://ci.apache.org/builders/ofbizTrunkFrameworkPlugins/builds/1653 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf945_ubuntu Build Reason: downstream Build Source Stamp: [branch trunk] 796e0d94ee96d537713855a98cda38345dc40d28 Blamelist: James Yong Build succeeded! Sincerely, -The Buildbot
buildbot failure in on ofbizTrunkFrameworkPlugins
The Buildbot has detected a new failure on builder ofbizTrunkFrameworkPlugins while building ofbiz-framework. Full details are available at: https://ci.apache.org/builders/ofbizTrunkFrameworkPlugins/builds/1652 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf947_ubuntu Build Reason: downstream Build Source Stamp: [branch trunk] b480426e1087492c93d048a8f09f7e6808333e0f Blamelist: James Yong BUILD FAILED: failed testIntegration Sincerely, -The Buildbot
[ofbiz-framework] branch trunk updated: Fixed: Error when rendering renderSubmitField macro (OFBIZ-11968)
This is an automated email from the ASF dual-hosted git repository.
jamesyong pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new 796e0d9 Fixed: Error when rendering renderSubmitField macro
(OFBIZ-11968)
796e0d9 is described below
commit 796e0d94ee96d537713855a98cda38345dc40d28
Author: James Yong
AuthorDate: Fri Aug 21 15:44:39 2020 +0800
Fixed: Error when rendering renderSubmitField macro (OFBIZ-11968)
Fixed error rendering renderSubmitField when accessing
/humanres/control/FindPartySkills page
---
themes/common-theme/template/macro/HtmlFormMacroLibrary.ftl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/themes/common-theme/template/macro/HtmlFormMacroLibrary.ftl
b/themes/common-theme/template/macro/HtmlFormMacroLibrary.ftl
index b174450..9b0f31a 100644
--- a/themes/common-theme/template/macro/HtmlFormMacroLibrary.ftl
+++ b/themes/common-theme/template/macro/HtmlFormMacroLibrary.ftl
@@ -205,7 +205,7 @@ under the License.
-<#macro renderSubmitField buttonType className alert formName action imgSrc
ajaxUrl id title="" name="" event="" confirmation="" containerId="" tabindex="">
+<#macro renderSubmitField buttonType className alert formName action imgSrc
ajaxUrl id="" title="" name="" event="" confirmation="" containerId=""
tabindex="">
<#if buttonType=="text-link">
href="javascript:document.${formName}.submit()" <#if
confirmation?has_content>onclick="return
confirm('${confirmation?js_string}');"><#if
title?has_content>${title}
<#elseif buttonType=="image">
[ofbiz-framework] branch trunk updated: Improved: Move page-specific script links to html template (OFBIZ-11799)
This is an automated email from the ASF dual-hosted git repository.
jamesyong pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new b480426 Improved: Move page-specific script links to html template
(OFBIZ-11799)
b480426 is described below
commit b480426e1087492c93d048a8f09f7e6808333e0f
Author: James Yong
AuthorDate: Fri Aug 21 15:13:35 2020 +0800
Improved: Move page-specific script links to html template (OFBIZ-11799)
use importLibrary js function to load impersonate.css
---
themes/common-theme/template/ImpersonateBanner.ftl | 26 +++---
themes/common-theme/template/Impersonated.ftl | 23 ---
themes/common-theme/widget/CommonScreens.xml | 3 +--
3 files changed, 34 insertions(+), 18 deletions(-)
diff --git a/themes/common-theme/template/ImpersonateBanner.ftl
b/themes/common-theme/template/ImpersonateBanner.ftl
index de1b550..900e49b 100644
--- a/themes/common-theme/template/ImpersonateBanner.ftl
+++ b/themes/common-theme/template/ImpersonateBanner.ftl
@@ -18,13 +18,23 @@ under the License.
-->
<#if parameters.originUserLogin??>
-
-
-
-×
-${uiLabelMap.CommonImpersonateTitle}
-${uiLabelMap.CommonImpersonateUserLogin} :
${context.userLogin.userLoginId!}
-${uiLabelMap.CommonImpersonateStop}
-
+
+
+
+
+
+×
+${uiLabelMap.CommonImpersonateTitle}
+${uiLabelMap.CommonImpersonateUserLogin} :
${context.userLogin.userLoginId!}
+${uiLabelMap.CommonImpersonateStop}
+
+
+
+
+importLibrary(["/common/css/impersonate.css"], function(){
+var content =
jQuery.parseHTML($('#impersonateContent-template').html());
+$("#impersonateContentBody").append(content);
+});
+
diff --git a/themes/common-theme/template/Impersonated.ftl
b/themes/common-theme/template/Impersonated.ftl
index b6117ce..abf78cb 100644
--- a/themes/common-theme/template/Impersonated.ftl
+++ b/themes/common-theme/template/Impersonated.ftl
@@ -16,18 +16,25 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-
<#assign messageMap =
Static["org.apache.ofbiz.base.util.UtilMisc"].toMap("originUserLoginId",
impersonator)/>
<#assign impersonationMessage=
Static["org.apache.ofbiz.base.util.UtilProperties"].getMessage("SecurityextUiLabels",
"loginevents.impersonation_in_process", messageMap, locale)/>
<#assign fromDate =
Static["org.apache.ofbiz.base.util.UtilFormatOut"].formatDateTime(impersonationFromDate,
"", locale, timeZone)/>
-
-
- ${impersonationMessage!}
- ${uiLabelMap.CommonSince} ${fromDate!}
- ${uiLabelMap.CommonLogout}
-
+
+
+
-setInterval('window.location.reload()', 3);
+importLibrary(["/common/css/impersonate.css"], function(){
+var parsedContent =
jQuery.parseHTML($('#impersonateMode-template').html());
+$("#impersonateMode").append(parsedContent);
+});
+setInterval(function (){
+window.location.reload();
+}, 3);
diff --git a/themes/common-theme/widget/CommonScreens.xml
b/themes/common-theme/widget/CommonScreens.xml
index 292a50b..2a65c1a 100644
--- a/themes/common-theme/widget/CommonScreens.xml
+++ b/themes/common-theme/widget/CommonScreens.xml
@@ -150,7 +150,6 @@ under the License.
-
@@ -576,7 +575,7 @@ under the License.
-
+
