Buildbot success in on ofbizTrunkFramework
Build status: Build succeeded! Worker used: bb_worker4_ubuntu URL: https://ci2.apache.org/#builders/49/builds/745 Blamelist: Jacques Le Roux , Pierre Smits Build Text: build successful Status Detected: restored build Build Source Stamp: [branch trunk] e9dbb227a9c8fe4bdb84efc23ad3e07d2ea52145 Steps: worker_preparation: 0 git: 0 build: 0 loadAll: 0 testIntegration: 0 Copy tests results: 0 Rsync tests-results to nightlies.apache.org: 0 -- ASF Buildbot
(ofbiz-framework) branch trunk updated: Fixed: Improvement of the Check XML tag (OFBIZ-12821)
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 e9dbb227a9 Fixed: Improvement of the Check XML tag (OFBIZ-12821)
e9dbb227a9 is described below
commit e9dbb227a9c8fe4bdb84efc23ad3e07d2ea52145
Author: Jacques Le Roux
AuthorDate: Fri Feb 16 21:23:43 2024 +0100
Fixed: Improvement of the Check XML tag (OFBIZ-12821)
Like the 3 previous commits this fixes things rather than improve them.
During integration tests, the issue is in ***FormMacroLibrary.ftl files:
In a macro declaration, parameters without a default value must all occur
before
the parameters with default values.
---
themes/common-theme/template/macro/CsvFormMacroLibrary.ftl | 2 +-
themes/common-theme/template/macro/FoFormMacroLibrary.ftl | 2 +-
themes/common-theme/template/macro/HtmlFormMacroLibrary.ftl | 6 +++---
themes/common-theme/template/macro/TextFormMacroLibrary.ftl | 2 +-
themes/common-theme/template/macro/XlsFormMacroLibrary.ftl | 2 +-
themes/common-theme/template/macro/XmlFormMacroLibrary.ftl | 2 +-
6 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/themes/common-theme/template/macro/CsvFormMacroLibrary.ftl
b/themes/common-theme/template/macro/CsvFormMacroLibrary.ftl
index 2890c4ba60..07bbb4466d 100644
--- a/themes/common-theme/template/macro/CsvFormMacroLibrary.ftl
+++ b/themes/common-theme/template/macro/CsvFormMacroLibrary.ftl
@@ -41,7 +41,7 @@ under the License.
<#macro renderTooltip tooltip tooltipStyle>
-<#macro renderCheckField items className alert id allChecked="" currentValue
name event action conditionGroup tabindex disabled>
+<#macro renderCheckField items className alert id currentValue name event
action conditionGroup tabindex disabled allChecked="">
<#macro renderRadioField items className alert currentValue
noCurrentSelectedKey name event action conditionGroup tabindex
disabled>
<#macro renderSubmitField buttonType className alert formName action imgSrc
ajaxUrl id title="" name="" event="" confirmation="" containerId="" tabindex=""
disabled=false>
diff --git a/themes/common-theme/template/macro/FoFormMacroLibrary.ftl
b/themes/common-theme/template/macro/FoFormMacroLibrary.ftl
index 6dd20f6342..2d71b358a8 100644
--- a/themes/common-theme/template/macro/FoFormMacroLibrary.ftl
+++ b/themes/common-theme/template/macro/FoFormMacroLibrary.ftl
@@ -67,7 +67,7 @@ under the License.
-<#macro renderCheckField items className alert id allChecked="" currentValue
name event action conditionGroup tabindex disabled><@makeBlock "" "" />
+<#macro renderCheckField items className alert id currentValue name event
action conditionGroup tabindex disabled allChecked=""><@makeBlock "" ""
/>
<#macro renderRadioField items className alert currentValue
noCurrentSelectedKey name event action conditionGroup tabindex
disabled><@makeBlock "" "" />
<#macro renderSubmitField buttonType className alert formName action imgSrc
ajaxUrl id title="" name="" event="" confirmation="" containerId="" tabindex=""
disabled=false><@makeBlock "" "" />
diff --git a/themes/common-theme/template/macro/HtmlFormMacroLibrary.ftl
b/themes/common-theme/template/macro/HtmlFormMacroLibrary.ftl
index 8d5b2b8169..0bf3d23a5c 100644
--- a/themes/common-theme/template/macro/HtmlFormMacroLibrary.ftl
+++ b/themes/common-theme/template/macro/HtmlFormMacroLibrary.ftl
@@ -687,8 +687,8 @@ Parameter: delegatorName, String, optional - name of the
delegator in context.
data-lookup-ajax-url="${ajaxUrl}" <#rt>
/><#rt/>
<#if readonly?has_content && readonly>
-
<#if
clearText?has_content>${clearText}<#else>${uiLabelMap.CommonClear}
@@ -698,7 +698,7 @@ Parameter: delegatorName, String, optional - name of the
delegator in context.
<#macro renderNextPrev paginateStyle paginateFirstStyle viewIndex highIndex
listSize viewSize ajaxEnabled javaScriptEnabled ajaxFirstUrl firstUrl
paginateFirstLabel paginatePreviousStyle ajaxPreviousUrl previousUrl
paginatePreviousLabel pageLabel ajaxSelectUrl selectUrl ajaxSelectSizeUrl
selectSizeUrl commonDisplaying paginateNextStyle ajaxNextUrl nextUrl
paginateNextLabel paginateLastStyle ajaxLastUrl lastUrl paginateLastLabel
paginateViewSizeLabel>
<#if listSize gt viewSize>
-
+
${paginateFirstLabel}<#else>-disabled">${paginateFirstLabel}
${paginatePreviousLabel}<#else>-disabled">${paginatePreviousLabel}
diff --git a/themes/common-theme/template/macro/TextFormMacroLibrary.ftl
b/themes/common-theme/template/macro/TextFormMacroLibrary.ftl
index bb5ae18f67..26115cd0f3 100644
--- a/themes/common-theme/template/macro/TextFormMacroLibrary.ftl
+++ b/themes/common-theme/template/macro/TextFormMacroLibrary.ftl
@@ -41,7 +41,7 @@ under the License.
<#macro renderTooltip tooltip
(ofbiz-framework) branch trunk updated: Fixed: Improvement of the Check XML tag (OFBIZ-12821)
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 50ee4f972a Fixed: Improvement of the Check XML tag (OFBIZ-12821) 50ee4f972a is described below commit 50ee4f972a7067361ce1fd7e7b99e159591e6f91 Author: Jacques Le Roux AuthorDate: Fri Feb 16 20:52:51 2024 +0100 Fixed: Improvement of the Check XML tag (OFBIZ-12821) Like the 2 previous commits this fixes things rather than improve them. During integration tests, the issue is in ***FormMacroLibrary.ftl files: When calling macro "renderCheckField", required parameter "allChecked" (parameter #5) was not specified --- themes/common-theme/template/macro/CsvFormMacroLibrary.ftl | 2 +- themes/common-theme/template/macro/FoFormMacroLibrary.ftl | 2 +- themes/common-theme/template/macro/TextFormMacroLibrary.ftl | 2 +- themes/common-theme/template/macro/XlsFormMacroLibrary.ftl | 2 +- themes/common-theme/template/macro/XmlFormMacroLibrary.ftl | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/themes/common-theme/template/macro/CsvFormMacroLibrary.ftl b/themes/common-theme/template/macro/CsvFormMacroLibrary.ftl index 406e4ac9ec..2890c4ba60 100644 --- a/themes/common-theme/template/macro/CsvFormMacroLibrary.ftl +++ b/themes/common-theme/template/macro/CsvFormMacroLibrary.ftl @@ -41,7 +41,7 @@ under the License. <#macro renderTooltip tooltip tooltipStyle> -<#macro renderCheckField items className alert id allChecked currentValue name event action conditionGroup tabindex disabled> +<#macro renderCheckField items className alert id allChecked="" currentValue name event action conditionGroup tabindex disabled> <#macro renderRadioField items className alert currentValue noCurrentSelectedKey name event action conditionGroup tabindex disabled> <#macro renderSubmitField buttonType className alert formName action imgSrc ajaxUrl id title="" name="" event="" confirmation="" containerId="" tabindex="" disabled=false> diff --git a/themes/common-theme/template/macro/FoFormMacroLibrary.ftl b/themes/common-theme/template/macro/FoFormMacroLibrary.ftl index f011833d59..6dd20f6342 100644 --- a/themes/common-theme/template/macro/FoFormMacroLibrary.ftl +++ b/themes/common-theme/template/macro/FoFormMacroLibrary.ftl @@ -67,7 +67,7 @@ under the License. -<#macro renderCheckField items className alert id allChecked currentValue name event action conditionGroup tabindex disabled><@makeBlock "" "" /> +<#macro renderCheckField items className alert id allChecked="" currentValue name event action conditionGroup tabindex disabled><@makeBlock "" "" /> <#macro renderRadioField items className alert currentValue noCurrentSelectedKey name event action conditionGroup tabindex disabled><@makeBlock "" "" /> <#macro renderSubmitField buttonType className alert formName action imgSrc ajaxUrl id title="" name="" event="" confirmation="" containerId="" tabindex="" disabled=false><@makeBlock "" "" /> diff --git a/themes/common-theme/template/macro/TextFormMacroLibrary.ftl b/themes/common-theme/template/macro/TextFormMacroLibrary.ftl index bb7370def5..bb5ae18f67 100644 --- a/themes/common-theme/template/macro/TextFormMacroLibrary.ftl +++ b/themes/common-theme/template/macro/TextFormMacroLibrary.ftl @@ -41,7 +41,7 @@ under the License. <#macro renderTooltip tooltip tooltipStyle> -<#macro renderCheckField items className alert id allChecked currentValue name event action conditionGroup tabindex disabled> +<#macro renderCheckField items className alert id allChecked="" currentValue name event action conditionGroup tabindex disabled> <#macro renderRadioField items className alert currentValue noCurrentSelectedKey name event action conditionGroup tabindex disabled> <#macro renderSubmitField buttonType className alert formName action imgSrc ajaxUrl id title="" name="" event="" confirmation="" containerId="" tabindex="" disabled=false> diff --git a/themes/common-theme/template/macro/XlsFormMacroLibrary.ftl b/themes/common-theme/template/macro/XlsFormMacroLibrary.ftl index a7f307c801..4bb98a692c 100644 --- a/themes/common-theme/template/macro/XlsFormMacroLibrary.ftl +++ b/themes/common-theme/template/macro/XlsFormMacroLibrary.ftl @@ -42,7 +42,7 @@ under the License. <#macro renderDropDownField name className alert id multiple formName otherFieldName event action size firstInList currentValue explicitDescription allowEmpty options fieldName otherFieldName otherValue otherFieldSize dDFCurrent ajaxEnabled noCurrentSelectedKey ajaxOptions frequency minChars choices autoSelect partialSearch partialChars ignoreCase fullSearch conditionGroup tabindex disabled><@renderItemField explicitDescription "txf" className/> -<#macro renderCheckField items className alert id allChecked currentValue name event
(ofbiz-framework) branch trunk updated: Improved: Improvement of the Check XML tag (OFBIZ-12821)
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 a8b9de444a Improved: Improvement of the Check XML tag (OFBIZ-12821)
a8b9de444a is described below
commit a8b9de444a026b083f5dbaa06fd08f7fa7845307
Author: Jacques Le Roux
AuthorDate: Fri Feb 16 18:32:33 2024 +0100
Improved: Improvement of the Check XML tag (OFBIZ-12821)
This should fix the integration tests and the WebtoolsLayoutDemo page
---
.../apache/ofbiz/widget/renderer/macro/MacroFormRenderer.java | 10 +++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git
a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRenderer.java
b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRenderer.java
index 8cdb63779c..fafdfd4821 100644
---
a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRenderer.java
+++
b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRenderer.java
@@ -23,6 +23,7 @@ import java.io.StringWriter;
import java.io.UnsupportedEncodingException;
import java.net.URI;
import java.net.URLEncoder;
+import java.util.ArrayList;
import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedList;
@@ -530,9 +531,12 @@ public final class MacroFormRenderer implements
FormStringRenderer {
String event = modelFormField.getEvent();
String action = modelFormField.getAction(context);
StringBuilder items = new StringBuilder();
-List checkedByDefault =
context.containsKey(checkField.getModelFormField().getAttributeName())
-?
StringUtil.toList(context.get(checkField.getModelFormField().getAttributeName()).toString())
-: List.of();
+String checkBox = checkField.getModelFormField().getAttributeName();
+List checkedByDefault = new ArrayList();
+if (context.containsKey(checkBox) &&
!context.get(checkBox).getClass().equals(String.class)) {
+checkedByDefault = context.containsKey(checkBox) ?
StringUtil.toList(context.get(checkBox).toString())
+: List.of();
+}
if (UtilValidate.isNotEmpty(modelFormField.getWidgetStyle())) {
className = modelFormField.getWidgetStyle();
if (modelFormField.shouldBeRed(context)) {
(ofbiz-framework) branch trunk updated: Improved: Have screen ImportExport show Party MainActionMenu (OFBIZ-12903) (#696)
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 3b160d349f Improved: Have screen ImportExport show Party MainActionMenu (OFBIZ-12903) (#696) 3b160d349f is described below commit 3b160d349f9cad32ec4c6ecfcaa2f5c673e23923 Author: Pierre Smits AuthorDate: Fri Feb 16 17:23:00 2024 +0100 Improved: Have screen ImportExport show Party MainActionMenu (OFBIZ-12903) (#696) Currently the ImportExport screen in PartyScreens.xml does not show the MainActionMenu of the party component. For a consistent user experience this should be. modified: PartyScreens.xml - added decorator-section 'pre-body' having include-menu for MainActionMenu --- applications/party/widget/partymgr/PartyScreens.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/applications/party/widget/partymgr/PartyScreens.xml b/applications/party/widget/partymgr/PartyScreens.xml index d419e2088b..7d39873af6 100644 --- a/applications/party/widget/partymgr/PartyScreens.xml +++ b/applications/party/widget/partymgr/PartyScreens.xml @@ -1394,6 +1394,9 @@ under the License. + + +
(ofbiz-framework) branch trunk updated: Improved: Improvement of the Check xml tag (OFBIZ-12821)
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 afbe2437c8 Improved: Improvement of the Check xml tag (OFBIZ-12821)
afbe2437c8 is described below
commit afbe2437c8b622d85acda63d0d9e257579ae
Author: Jacques Le Roux
AuthorDate: Fri Feb 16 15:59:20 2024 +0100
Improved: Improvement of the Check xml tag (OFBIZ-12821)
Cleans MacroFormRendererTest.java for test check to pass
+ removes useless things
---
.../renderer/macro/MacroFormRendererTest.java | 32 +-
1 file changed, 7 insertions(+), 25 deletions(-)
diff --git
a/framework/widget/src/test/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRendererTest.java
b/framework/widget/src/test/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRendererTest.java
index e2d7801b72..44fa5e3802 100644
---
a/framework/widget/src/test/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRendererTest.java
+++
b/framework/widget/src/test/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRendererTest.java
@@ -26,7 +26,12 @@ import static org.hamcrest.Matchers.startsWith;
import java.io.IOException;
import java.io.StringWriter;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
import java.util.stream.Collectors;
import javax.servlet.http.HttpServletRequest;
@@ -126,7 +131,6 @@ public class MacroFormRendererTest {
new UtilPropertiesMockUp();
}
-@SuppressWarnings("checkstyle:InnerAssignment")
@Test
public void labelRenderedAsSingleMacro(@Mocked ModelScreenWidget.Label
label) {
new Expectations() {
@@ -325,7 +329,6 @@ public class MacroFormRendererTest {
e.printStackTrace();
}
-String renderedString = writer.toString();
assertAndGetMacroString("renderCheckField", ImmutableMap.of(
"items", ImmutableList.of(
"{'value':'KEY1', 'description':'DESC1',
'checked':'true'}",
@@ -334,7 +337,7 @@ public class MacroFormRendererTest {
"{'value':'KEY4', 'description':'DESC4',
'checked':'false'}")));
}
-@Test
+@Test
public void radioFieldMacroRendered(@Mocked ModelFormField.RadioField
radioField) throws IOException {
final List optionValues = ImmutableList.of(
new ModelFormField.OptionValue("KEY1", "DESC1"),
@@ -1019,27 +1022,6 @@ public class MacroFormRendererTest {
};
}
-private void genericSubHyperlinkRenderedExpectation(final
ModelFormField.SubHyperlink subHyperlink) {
-new Expectations() {
-{
-subHyperlink.shouldUse(withNotNull());
-result = true;
-
-subHyperlink.getStyle(withNotNull());
-result = "buttontext";
-
-subHyperlink.getUrlMode();
-result = "inter-app";
-
-subHyperlink.getTarget(withNotNull());
-result = "/path/to/target";
-
-subHyperlink.getDescription(withNotNull());
-result = "LinkDescription";
-}
-};
-}
-
private void genericSubHyperlinkRenderedVerification() {
new Verifications() {
{
Buildbot failure in on ofbizTrunkFramework
Build status: BUILD FAILED: './gradlew --no-daemon ...' (failure) Worker used: bb_worker4_ubuntu URL: https://ci2.apache.org/#builders/49/builds/739 Blamelist: Jacques Le Roux , Pierre Smits Build Text: './gradlew --no-daemon ...' (failure) Status Detected: new failure Build Source Stamp: [branch trunk] 3b923ad9231dfa799440ba5507b0abe0246c8c86 Steps: worker_preparation: 0 git: 0 build: 0 loadAll: 0 testIntegration: 2 -- ASF Buildbot
(ofbiz-framework) branch trunk updated: Improved: Improvement of the Check xml tag (OFBIZ-12821)
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 e200ed30df Improved: Improvement of the Check xml tag (OFBIZ-12821)
e200ed30df is described below
commit e200ed30dfb6e7e4a3fe44b5f2be21c0a6e7b185
Author: Jacques Le Roux
AuthorDate: Fri Feb 16 14:06:37 2024 +0100
Improved: Improvement of the Check xml tag (OFBIZ-12821)
Did not spot this useless line, removed.
---
.../java/org/apache/ofbiz/widget/renderer/macro/MacroFormRenderer.java | 1 -
1 file changed, 1 deletion(-)
diff --git
a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRenderer.java
b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRenderer.java
index 477101cbb7..8cdb63779c 100644
---
a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRenderer.java
+++
b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRenderer.java
@@ -551,7 +551,6 @@ public final class MacroFormRenderer implements
FormStringRenderer {
}
List allOptionValues =
checkField.getAllOptionValues(context, WidgetWorker.getDelegator(context));
-//String stringCheckedByDefault = String.join(",", checkedByDefault);
items.append("[");
for (ModelFormField.OptionValue optionValue : allOptionValues) {
boolean checked;
(ofbiz-framework) branch trunk updated: Improved: Improvement of the Check xml tag (OFBIZ-12821)
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 3b923ad923 Improved: Improvement of the Check xml tag (OFBIZ-12821) 3b923ad923 is described below commit 3b923ad9231dfa799440ba5507b0abe0246c8c86 Author: Jacques Le Roux AuthorDate: Fri Feb 16 13:54:11 2024 +0100 Improved: Improvement of the Check xml tag (OFBIZ-12821) The approach for pre-checking variables is as follows: if a variable with the same name as the field exists, its value will be used to determine the pre-check status. There is an example in QuoteForms.xml Thanks: Maxime Flammang and Nereide team --- applications/order/widget/ordermgr/QuoteForms.xml | 14 +++-- .../widget/catalog/ImageManagementForms.xml| 66 +++--- framework/widget/dtd/widget-form.xsd | 9 ++- .../apache/ofbiz/widget/model/ModelFormField.java | 1 + .../widget/renderer/macro/MacroFormRenderer.java | 35 .../renderer/macro/MacroFormRendererTest.java | 53 + .../template/macro/HtmlFormMacroLibrary.ftl| 8 +-- 7 files changed, 121 insertions(+), 65 deletions(-) diff --git a/applications/order/widget/ordermgr/QuoteForms.xml b/applications/order/widget/ordermgr/QuoteForms.xml index 075a8e7688..89c76b48eb 100644 --- a/applications/order/widget/ordermgr/QuoteForms.xml +++ b/applications/order/widget/ordermgr/QuoteForms.xml @@ -17,17 +17,21 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> -http://www.w3.org/2001/XMLSchema-instance; +http://www.w3.org/2001/XMLSchema-instance; xmlns="http://ofbiz.apache.org/Widget-Form; xsi:schemaLocation="http://ofbiz.apache.org/Widget-Form http://ofbiz.apache.org/dtds/widget-form.xsd;> + + + + - + - + @@ -134,7 +138,7 @@ under the License. - + @@ -545,7 +549,7 @@ under the License. - + diff --git a/applications/product/widget/catalog/ImageManagementForms.xml b/applications/product/widget/catalog/ImageManagementForms.xml index 4285f3b007..568363c50c 100644 --- a/applications/product/widget/catalog/ImageManagementForms.xml +++ b/applications/product/widget/catalog/ImageManagementForms.xml @@ -62,13 +62,13 @@ under the License. - - + + - - @@ -123,8 +123,8 @@ under the License. - - @@ -162,8 +162,8 @@ under the License. - - @@ -192,7 +192,7 @@ under the License. - + @@ -212,8 +212,8 @@ under the License. - - @@ -261,12 +261,12 @@ under the License. - - + + - + @@ -306,7 +306,7 @@ under the License. @@ -359,8 +359,8 @@ under the License. - - + + @@ -381,7 +381,7 @@ under the License. - + @@ -394,7 +394,7 @@ under the License. - + @@ -427,7 +427,7 @@ under the License. - + @@ -445,7 +445,7 @@ under the License. - + @@ -475,7 +475,7 @@ under the License. - + @@ -508,7 +508,7 @@ under the License. - + @@ -531,7 +531,7 @@ under the License. - + @@ -568,7 +568,7 @@ under the License. - + @@ -607,12 +607,12 @@ under the License. - - + + - + @@ -656,7 +656,7 @@ under the License. - + @@ -697,7 +697,7 @@ under the License. - +
(ofbiz-framework) branch trunk updated: Improved: Screen Classifications in Party should not show create trigger to user with only VIEW permission (OFBIZ-12892 (#695)
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 96bf0094ee Improved: Screen Classifications in Party should not show create trigger to user with only VIEW permission (OFBIZ-12892 (#695) 96bf0094ee is described below commit 96bf0094eea925e335301713f1c3293e15cd7dd8 Author: Pierre Smits AuthorDate: Fri Feb 16 13:58:47 2024 +0100 Improved: Screen Classifications in Party should not show create trigger to user with only VIEW permission (OFBIZ-12892 (#695) When accessing https://demo-trunk.ofbiz.apache.org/partymgr/control/showclassgroups as a user with only VIEW permissions (e.g. userId = auditor) the action trigger to create a new Party Classification Group is shown. This should not be visible to such a user as it leads to an undesired effect and diminished user experience. modified: PartyClassificationScreens.xml - removed container having action trigger PartyMenus.xml - added menu-item newPartyClassificationGroup having permission condition --- .../party/widget/partymgr/PartyClassificationScreens.xml | 1 - applications/party/widget/partymgr/PartyMenus.xml | 10 ++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/applications/party/widget/partymgr/PartyClassificationScreens.xml b/applications/party/widget/partymgr/PartyClassificationScreens.xml index 18d815ec22..c2e38dd798 100644 --- a/applications/party/widget/partymgr/PartyClassificationScreens.xml +++ b/applications/party/widget/partymgr/PartyClassificationScreens.xml @@ -109,7 +109,6 @@ under the License. - diff --git a/applications/party/widget/partymgr/PartyMenus.xml b/applications/party/widget/partymgr/PartyMenus.xml index d6de61c66d..ac344b27b3 100644 --- a/applications/party/widget/partymgr/PartyMenus.xml +++ b/applications/party/widget/partymgr/PartyMenus.xml @@ -58,6 +58,16 @@ + + + + + + + + + +
Buildbot success in on ofbizBranch18Framework
Build status: Build succeeded! Worker used: bb_worker4_ubuntu URL: https://ci2.apache.org/#builders/48/builds/159 Blamelist: Florian Motteau , Jacques Le Roux Build Text: build successful Status Detected: restored build Build Source Stamp: [branch release18.12] 16481383c3e37f41a308245ff5d5b7289fe691ac Steps: worker_preparation: 0 git: 0 build: 0 loadAll: 0 testIntegration: 0 Copy tests results: 0 Rsync tests-results to nightlies.apache.org: 0 -- ASF Buildbot
(ofbiz-framework) branch release18.12 updated: Fixed: pagination, jump to page with AJAX enabled is broken (OFBIZ-12817 - #637)
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 16481383c3 Fixed: pagination, jump to page with AJAX enabled is broken
(OFBIZ-12817 - #637)
16481383c3 is described below
commit 16481383c3e37f41a308245ff5d5b7289fe691ac
Author: Jacques Le Roux
AuthorDate: Fri Feb 16 11:54:23 2024 +0100
Fixed: pagination, jump to page with AJAX enabled is broken (OFBIZ-12817 -
#637)
Last conflict handled by hand was not well done :/ This is OK (and tested)
---
.../widget/renderer/macro/MacroFormRenderer.java | 65 --
1 file changed, 59 insertions(+), 6 deletions(-)
diff --git
a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRenderer.java
b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRenderer.java
index 6f7ce8026a..c7fc63f442 100644
---
a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRenderer.java
+++
b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRenderer.java
@@ -23,12 +23,9 @@ import java.io.Reader;
import java.io.StringReader;
import java.io.StringWriter;
import java.io.UnsupportedEncodingException;
-import java.net.URI;
-import java.rmi.server.UID;
-import java.net.URLDecoder;
import java.net.URLEncoder;
+import java.rmi.server.UID;
import java.sql.Timestamp;
-import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedList;
@@ -203,6 +200,7 @@ public final class MacroFormRenderer implements
FormStringRenderer {
executeMacro(writer, sr.toString());
}
+@Override
public void renderDisplayField(Appendable writer, Map
context, DisplayField displayField) throws IOException {
ModelFormField modelFormField = displayField.getModelFormField();
String idName = modelFormField.getCurrentContainerId(context);
@@ -322,6 +320,7 @@ public final class MacroFormRenderer implements
FormStringRenderer {
this.appendTooltip(writer, context, modelFormField);
}
+@Override
public void renderHyperlinkField(Appendable writer, Map
context, HyperlinkField hyperlinkField) throws IOException {
this.request.setAttribute("image",
hyperlinkField.getImageLocation(context));
ModelFormField modelFormField = hyperlinkField.getModelFormField();
@@ -342,10 +341,12 @@ public final class MacroFormRenderer implements
FormStringRenderer {
this.request.removeAttribute("descriptionSize");
}
+@Override
public void renderMenuField(Appendable writer, Map
context, MenuField menuField) throws IOException {
menuField.renderFieldString(writer, context, null);
}
+@Override
public void renderTextField(Appendable writer, Map
context, TextField textField) throws IOException {
ModelFormField modelFormField = textField.getModelFormField();
String name = modelFormField.getParameterName(context);
@@ -445,6 +446,7 @@ public final class MacroFormRenderer implements
FormStringRenderer {
this.appendTooltip(writer, context, modelFormField);
}
+@Override
public void renderTextareaField(Appendable writer, Map
context, TextareaField textareaField) throws IOException {
ModelFormField modelFormField = textareaField.getModelFormField();
String name = modelFormField.getParameterName(context);
@@ -782,6 +784,7 @@ public final class MacroFormRenderer implements
FormStringRenderer {
this.appendTooltip(writer, context, modelFormField);
}
+@Override
public void renderDropDownField(Appendable writer, Map
context, DropDownField dropDownField) throws IOException {
ModelFormField modelFormField = dropDownField.getModelFormField();
ModelForm modelForm = modelFormField.getModelForm();
@@ -1026,6 +1029,7 @@ public final class MacroFormRenderer implements
FormStringRenderer {
this.appendTooltip(writer, context, modelFormField);
}
+@Override
public void renderCheckField(Appendable writer, Map
context, CheckField checkField) throws IOException {
ModelFormField modelFormField = checkField.getModelFormField();
String currentValue = modelFormField.getEntry(context);
@@ -1093,6 +1097,7 @@ public final class MacroFormRenderer implements
FormStringRenderer {
this.appendTooltip(writer, context, modelFormField);
}
+@Override
public void renderRadioField(Appendable writer, Map
context, RadioField radioField) throws IOException {
ModelFormField modelFormField = radioField.getModelFormField();
List allOptionValues =
radioField.getAllOptionValues(context, WidgetWorker.getDelegator(context));
@@ -1154,6 +1159,7 @@ public final class
(ofbiz-framework) branch release22.01 updated: Fixed: Jgrowl label are not well retrieved (OFBIZ-12875)
This is an automated email from the ASF dual-hosted git repository.
mleila pushed a commit to branch release22.01
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/release22.01 by this push:
new 768d0780af Fixed: Jgrowl label are not well retrieved (OFBIZ-12875)
768d0780af is described below
commit 768d0780afb2e8a70acb9017a7ded9d4e72dfa30
Author: MLeila
AuthorDate: Fri Feb 16 10:52:09 2024 +0100
Fixed: Jgrowl label are not well retrieved (OFBIZ-12875)
Fix a jGrowlLabelObject undefined error when calling showjGrowlMessage
---
themes/common-theme/webapp/common/js/util/OfbizUtil.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/themes/common-theme/webapp/common/js/util/OfbizUtil.js
b/themes/common-theme/webapp/common/js/util/OfbizUtil.js
index ba84c70a70..7ce594d2e8 100644
--- a/themes/common-theme/webapp/common/js/util/OfbizUtil.js
+++ b/themes/common-theme/webapp/common/js/util/OfbizUtil.js
@@ -1283,7 +1283,7 @@ function showjGrowlMessage(errMessage, classEvent,
stickyValue, showAllLabel, co
if (!showAllLabel || !collapseLabel || !hideAllLabel) {
var jGrowlLabelObject = ["CommonHideAllNotifications",
"CommonShowAll", "CommonCollapse"];
getJSONuiLabels(jGrowlLabelObject, function (result) {
-jGrowlLabelObject = result.responseJSON.CommonUiLabels;
+jGrowlLabelObject = result.responseJSON;
});
if (!showAllLabel) showAllLabel = jGrowlLabelObject[2];
(ofbiz-framework) branch trunk updated: Fixed: Jgrowl label are not well retrieved (OFBIZ-12875)
This is an automated email from the ASF dual-hosted git repository.
mleila 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 8813c75986 Fixed: Jgrowl label are not well retrieved (OFBIZ-12875)
8813c75986 is described below
commit 8813c759866b2201bc87b8f20ad655f1bb036d00
Author: MLeila
AuthorDate: Fri Feb 16 10:30:19 2024 +0100
Fixed: Jgrowl label are not well retrieved (OFBIZ-12875)
Fix a jGrowlLabelObject undefined error when calling showjGrowlMessage
---
themes/common-theme/webapp/common-theme/js/util/OfbizUtil.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/themes/common-theme/webapp/common-theme/js/util/OfbizUtil.js
b/themes/common-theme/webapp/common-theme/js/util/OfbizUtil.js
index 765eb7f5cb..e4fb3dab21 100644
--- a/themes/common-theme/webapp/common-theme/js/util/OfbizUtil.js
+++ b/themes/common-theme/webapp/common-theme/js/util/OfbizUtil.js
@@ -1299,7 +1299,7 @@ function showjGrowlMessage(errMessage, classEvent,
stickyValue, showAllLabel, co
if (!showAllLabel || !collapseLabel || !hideAllLabel) {
var jGrowlLabelObject = ["CommonHideAllNotifications",
"CommonShowAll", "CommonCollapse"];
getJSONuiLabels(jGrowlLabelObject, function (result) {
-jGrowlLabelObject = result.responseJSON.CommonUiLabels;
+jGrowlLabelObject = result.responseJSON;
});
if (!showAllLabel) showAllLabel = jGrowlLabelObject[2];
Buildbot failure in on ofbizBranch18Framework
Build status: BUILD FAILED: failed './gradlew --no-daemon ...' (failure) Worker used: bb_worker4_ubuntu URL: https://ci2.apache.org/#builders/48/builds/158 Blamelist: Florian Motteau Build Text: failed './gradlew --no-daemon ...' (failure) Status Detected: new failure Build Source Stamp: [branch release18.12] 362538d18fa456a7d5565410cb1c2c47b35bcaf2 Steps: worker_preparation: 0 git: 0 build: 2 -- ASF Buildbot
(ofbiz-framework) branch release18.12 updated: Fixed: pagination, jump to page with AJAX enabled is broken (OFBIZ-12817 - #637)
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 362538d18f Fixed: pagination, jump to page with AJAX enabled is broken
(OFBIZ-12817 - #637)
362538d18f is described below
commit 362538d18fa456a7d5565410cb1c2c47b35bcaf2
Author: Florian Motteau
AuthorDate: Fri Feb 16 08:44:12 2024 +0100
Fixed: pagination, jump to page with AJAX enabled is broken (OFBIZ-12817 -
#637)
Jump to page with AJAX enabled fetches the wrong page.
We need to decrement the value entered by the user by one (page numbers are
zero-indexed)
Thanks: Néréide Team :)
Conflict handled by hand
---
.../java/org/apache/ofbiz/widget/renderer/macro/MacroFormRenderer.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git
a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRenderer.java
b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRenderer.java
index 0884a5324a..6f7ce8026a 100644
---
a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRenderer.java
+++
b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRenderer.java
@@ -2452,7 +2452,8 @@ public final class MacroFormRenderer implements
FormStringRenderer {
// Page select dropdown
if (listSize > 0 && this.javaScriptEnabled) {
if (ajaxEnabled) {
-ajaxSelectUrl = createAjaxParamsFromUpdateAreas(updateAreas,
prepLinkText + "' + this.value + '", context);
+ajaxSelectUrl =
MacroCommonRenderer.createAjaxParamsFromUpdateAreas(updateAreas, null,
modelForm,
+prepLinkText + "' + (this.value - 1) + '", context);
} else {
linkText = prepLinkText;
if (linkText.startsWith("/")) {
(ofbiz-framework) branch release22.01 updated: Fixed: pagination, jump to page with AJAX enabled is broken (OFBIZ-12817 - #637)
This is an automated email from the ASF dual-hosted git repository.
jleroux pushed a commit to branch release22.01
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/release22.01 by this push:
new 770643ae73 Fixed: pagination, jump to page with AJAX enabled is broken
(OFBIZ-12817 - #637)
770643ae73 is described below
commit 770643ae73f388cef17b2e4d354532865c31bf9e
Author: Florian Motteau
AuthorDate: Fri Feb 16 08:44:12 2024 +0100
Fixed: pagination, jump to page with AJAX enabled is broken (OFBIZ-12817 -
#637)
Jump to page with AJAX enabled fetches the wrong page.
We need to decrement the value entered by the user by one (page numbers are
zero-indexed)
Thanks: Néréide Team :)
---
.../java/org/apache/ofbiz/widget/renderer/macro/MacroFormRenderer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRenderer.java
b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRenderer.java
index 5e5f4f4276..bd8b3fb5cd 100644
---
a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRenderer.java
+++
b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRenderer.java
@@ -2380,7 +2380,7 @@ public final class MacroFormRenderer implements
FormStringRenderer {
if (listSize > 0 && this.javaScriptEnabled) {
if (ajaxEnabled) {
ajaxSelectUrl =
MacroCommonRenderer.createAjaxParamsFromUpdateAreas(updateAreas, null,
modelForm,
-prepLinkText + "' + this.value + '", context);
+prepLinkText + "' + (this.value - 1) + '", context);
} else {
linkText = prepLinkText;
if (linkText.startsWith("/")) {
(ofbiz-framework) annotated tag release18.12.12 created (now 74139288c4)
This is an automated email from the ASF dual-hosted git repository. jacopoc pushed a change to annotated tag release18.12.12 in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git at 74139288c4 (tag) tagging 43fd8328bc3dcff24e29b839c09cd632e90cb5c8 (commit) replaces release18.12.05 by Jacopo Cappellato on Fri Feb 16 09:00:19 2024 +0100 - Log - Tagged release 18.12.12. --- No new revisions were added by this update.
(ofbiz-plugins) annotated tag release18.12.12 created (now 9671c6120)
This is an automated email from the ASF dual-hosted git repository. jacopoc pushed a change to annotated tag release18.12.12 in repository https://gitbox.apache.org/repos/asf/ofbiz-plugins.git at 9671c6120 (tag) tagging 2b1205883ff95b78bf632e96ac8246910d9cba56 (commit) replaces release18.12.05 by Jacopo Cappellato on Fri Feb 16 09:02:10 2024 +0100 - Log - Tagged release 18.12.12. --- No new revisions were added by this update.
