11 Commits
Author SHA1 Message Date
Jacques Le Roux 32d4f793fa Improved: Unable to upload a file through ecommerce (OFBIZ-12636)
Allows to check for only CSV files. This is not used OOTB in OFBiz.

Thanks: Sachin for report and confirmation it's OK
2022-07-20 17:22:28 +02:00
Jacques Le Roux e4b383cd88 Fixed: Integration tests fail with Postgres DB (OFBIZ-12666)
This fixes testUpdateFixedAssetMaintAndWorkEffort. It works in both Derby and
Postgres

Thanks: Johannes Schreiber for report
2022-07-18 08:37:50 +02:00
Jacques Le Roux 1052d9a983 Fixed: Update Solr and Lucene from 8.11.1 to 8.11.2 for security reason (OFBIZ-12656)
There was fixed security issues in Solr:
https://lists.apache.org/thread/wn9wkmx1ogbf00hj78y2xt3l0bo15ob9
Not in Lucene, but we need sync between them:
https://lists.apache.org/thread/olf2bhqy1ws9f0kp9nb8zs6g5dcl89l5
2022-06-22 11:55:12 +02:00
Pierre Smits 60f2664441 Fixed: AssetMaint not accessible by user with 'VIEW' permission (OFBIZ-12485) (#71)
Currently the AssetMaint application is not accessible by a user with the VIEW permission, as demonstrated with userLoginId = 'auditor'.

Modfied: AssetMaintSecurityGroupDemoData.xml: added SecurityGroupPermission record
2022-05-12 20:09:10 +02:00
Nicolas Malin 0a635267e5 Fixed: Request createWorkEffortPartyAssign generates an error (OFBIZ-12556)
The request createWorkEffortPartyAssign is called after submitting the form AddWorkEffortPartyAssign, when the user wants to add a party to a project. This raise an error because it removed from workeffort component after the screen dynamising
Thanks to Pierre Smith for raise this issue and Martin Naumann for the fix patch
2022-04-22 11:59:22 +02:00
Jacques Le Roux 68c7a4107d Improved: projectView doesn't show the newly created project after creation ( (OFBIZ-12601)
"Previously" the project creation directly lead to the ProjectView screen within
the context of the newly created project. In this way users were able to
directly add e.g. resources to the newly created project without selecting it
again within the FindProject screen. Within the patch provided I just copied the
success handling from the updateProject request mapping which seems to restore
the initial functionality again.

jleroux: Even if I don't know to what to compare in past, I indeed see no
reasons to not do so.

Thanks: Sixty One for the patch
2022-04-20 09:38:06 +02:00
Jacques Le Roux 2f2a448d71 Fixed: Solr requires application/x-www-form-urlencoded (OFBIZ-12600)
Solr plugin fires exception on create/update of a product.

1.) enable eca in solrconfig.properties: solr.eca.enabled=true
2.)  enable all eca in eecas.xml
3.) start ofbiz
4.) update or create a product (go to product and save it)
the error is fired.

Thanks: Ingo Wolfmayr for report
2022-04-14 15:46:17 +02:00
Jacques Le Roux 656b9c20c7 Fixed: Test run was unsuccessful because of failing solr tests (OFBIZ-12595)
The previous commit for OFBIZ-12594 was only working on Windows. On *nix OSs
there is no way to reliably get "--test" String from java.class.path property.

Also the previous fix was brittle because relying only on 1 space separating
words.

This fix puts in the SolrDispatchFilter system property at the beginning of the
4 Solr tests and removes it at end of them. That presence can reliably be tested
in ControlFilter that is called before SolrDispatchFilter. It allows to bypass
SecurityUtil::containsFreemarkerInterpolation that would else change the
parameters content type that must be application/x-www-form-urlencoded.
content

Thanks: Tom Pietsch for report and Mart Naum for confirmation
2022-04-13 14:47:03 +02:00
Jacques Le Roux f29c84c052 Improved: Remove deprecation warning by removing direct call to Class::newInstance
Class.newInstance() has a flaw, in which any Throwable from the constructor is
thrown unchecked. It was deprecated in Java 9, but not marked for removal.
It shows as a deprecation warning when compiling OfBiz with Java 11.

Thanks: Heinz Kabutz for reporting and initially committing 0e6732b. This
completes in plugins and all will we backported
2022-04-01 11:07:33 +02:00
Benjamin Jugl bef13b56ef Fixed: Setting VIEW_INDEX to 0 in ForumScreens.xml when not initialized (OFBIZ-11429) 2022-02-22 23:19:21 +01:00
Jacques Le Roux 1edb5f71ed Fixed: placeholder text has been implemented but seems to do nothing (OFBIZ-12548)
Adding this to a form in a widget/somethingForms.xml file:

<field name="description" title="${uiLabelMap.CommonDescription}"
required-field="true"><text placeholder="This is placeholder text"/></field>

Does not throw a error, but when the form is displayed, no placeholder text
appears.  I've checked the html code in the browser to confirm that it wasn't
white placeholder text on a white background, and it does not define the
placeholder property in the generated html.

Are there any cases where placeholder text does work?  If so, it would be nice
if a working example could be added somewhere (like someone in ofbiz,
or maybe in the "example" plugin)

Thanks: ddev for report and spotting the missed commit of
OFBIZ-5341-Example.patch in OFBIZ-5341
2022-02-01 08:49:49 +01:00
14 changed files with 49 additions and 34 deletions
@@ -28,4 +28,5 @@ under the License.
<SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="ASSETMAINTTECH" permissionId="ASSETMAINT_UPDATE"/>
<SecurityGroupPermission fromDate="2001-05-13 12:00:00.0" groupId="FULLADMIN" permissionId="ASSETMAINT_ADMIN"/>
<SecurityGroupPermission fromDate="2001-01-01 00:00:00.0" groupId="VIEWADMIN" permissionId="ASSETMAINT_VIEW"/>
</entity-engine-xml>
@@ -20,6 +20,7 @@ package org.apache.ofbiz.assetmaint.test
import java.sql.Timestamp
import java.text.SimpleDateFormat
import org.apache.ofbiz.base.util.UtilDateTime
import org.apache.ofbiz.entity.GenericValue
import org.apache.ofbiz.service.testtools.OFBizTestCase
@@ -38,9 +39,9 @@ class FixedAssetMaintTests extends OFBizTestCase {
serviceCtx.productMaintSeqId = "seq03" // product maintenance
serviceCtx.intervalMeterTypeId = "ODOMETER"
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS")
String estimatedStartDate = "2009-12-18 00:00:00.000"
serviceCtx.estimatedStartDate = new Timestamp(sdf.parse(estimatedStartDate).getTime());
serviceCtx.estimatedStartDate = new Timestamp(sdf.parse(estimatedStartDate).getTime())
String estimatedCompletionDate = "2009-12-18 01:00:00.000"
serviceCtx.estimatedCompletionDate = new Timestamp(sdf.parse(estimatedCompletionDate).getTime())
@@ -71,9 +72,9 @@ class FixedAssetMaintTests extends OFBizTestCase {
serviceCtx.productMaintTypeId = "OIL_CHANGE"
serviceCtx.intervalMeterTypeId = "ODOMETER"
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS")
String estimatedStartDate = "2009-12-18 00:00:00.000"
serviceCtx.estimatedStartDate = new Timestamp(sdf.parse(estimatedStartDate).getTime());
serviceCtx.estimatedStartDate = new Timestamp(sdf.parse(estimatedStartDate).getTime())
String estimatedCompletionDate = "2009-12-18 01:00:00.000"
serviceCtx.estimatedCompletionDate = new Timestamp(sdf.parse(estimatedCompletionDate).getTime())
@@ -107,7 +108,7 @@ class FixedAssetMaintTests extends OFBizTestCase {
serviceCtx.productMaintTypeId = "OIL_CHANGE"
serviceCtx.intervalMeterTypeId = "ODOMETER"
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS")
String estimatedCompletionDate = "2009-12-22 01:00:00.000" // Changed estimatedCompletionDate to test update service
serviceCtx.estimatedCompletionDate = new Timestamp(sdf.parse(estimatedCompletionDate).getTime())
@@ -117,8 +118,6 @@ class FixedAssetMaintTests extends OFBizTestCase {
serviceCtx.userLogin = userLogin
Map serviceResult = dispatcher.runSync('updateFixedAssetMaintAndWorkEffort', serviceCtx)
fixedAssetMaint.clear()
fixedAssetMaint = from("FixedAssetMaint").where("fixedAssetId", fixedAssetId).queryFirst()
GenericValue workEffort = from("WorkEffort").where("workEffortId", fixedAssetMaint.scheduleWorkEffortId).queryOne()
assert fixedAssetMaint
@@ -145,4 +144,4 @@ class FixedAssetMaintTests extends OFBizTestCase {
assert workEffort.currentStatusId == "CAL_COMPLETED"
assert workEffort.actualCompletionDate == serviceCtx.actualCompletionDate
}
}
}
+2 -2
View File
@@ -60,7 +60,7 @@ under the License.
</entity-one>
<!-- parameters for the performFind service -->
<set field="parameters.forumId" from-field="parameters.forumId" default-value="${parameters.contentId}"/>
<set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
<set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0" />
<set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/>
<set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/>
<entity-condition entity-name="ContentAssocViewTo" list="forumMessages" >
@@ -95,7 +95,7 @@ under the License.
<parameter param-name="forumId" from-field="parameters.forumId"/>
<parameter param-name="forumMessageIdTo" value=""/>
<parameter param-name="threadView" from-field="parameters.threadView"/>
<parameter param-name="VIEW_INDEX" from-field="parameters.VIEW_INDEX"/>
<parameter param-name="VIEW_INDEX" from-field="viewIndex"/>
</link>
</widgets>
</section>
+1
View File
@@ -206,6 +206,7 @@ under the License.
</drop-down>
</field>
<field name="exampleName" title="${uiLabelMap.FormFieldTitle_exampleName}" required-field="true"><text /></field>
<field name="exampleName" title="${uiLabelMap.FormFieldTitle_exampleName}" required-field="true" widget-style="required"><text placeholder="${uiLabelMap.FormFieldTitle_exampleName}"/></field>
<field name="description" title="${uiLabelMap.CommonDescription}"/>
<field name="longDescription" title="${uiLabelMap.ExampleLongDescription}"/>
<field name="anotherText">
+3 -3
View File
@@ -20,7 +20,7 @@ dependencies {
// 1. Remember to change the version LUCENE_VERSION in SearchWorker class when upgrading.
// 2. luceneMatchVersion should be updated in solrconfig.xml
// 3. Also Solr et Lucene should use the same version,
pluginLibsCompile 'org.apache.lucene:lucene-core:8.11.1'
pluginLibsCompile 'org.apache.lucene:lucene-queryparser:8.11.1'
pluginLibsCompile 'org.apache.lucene:lucene-analyzers-common:8.11.1'
pluginLibsCompile 'org.apache.lucene:lucene-core:8.11.2'
pluginLibsCompile 'org.apache.lucene:lucene-queryparser:8.11.2'
pluginLibsCompile 'org.apache.lucene:lucene-analyzers-common:8.11.2'
}
@@ -41,7 +41,7 @@ public final class SearchWorker {
private static final String MODULE = SearchWorker.class.getName();
private static final Version LUCENE_VERSION = Version.LUCENE_8_11_1;
private static final Version LUCENE_VERSION = Version.LUCENE_8_11_2;
private SearchWorker() { }
@@ -82,7 +82,7 @@
<request-map uri="createProject">
<security https="true" auth="true"/>
<event type="service" invoke="createProject"/>
<response name="success" type="request-redirect-noparam" value="projectView"/>
<response name="success" type="view" value="projectView"/>
<response name="error" type="view" value="EditProject"/>
</request-map>
<request-map uri="updateProject">
@@ -569,8 +569,14 @@
<request-map uri="addWorkEffortPartyAssign">
<security https="true" auth="true"/>
<event type="service" invoke="assignPartyToWorkEffort"/>
<response name="success" type="view" value="listResourcesProject"/>
<response name="error" type="view" value="listResourcesProject"/>
<response name="success" type="view" value="ListWorkEffortPartyAssigns"/>
<response name="error" type="view" value="ListWorkEffortPartyAssigns"/>
</request-map>
<request-map uri="deleteWorkEffortPartyAssign">
<security https="true" auth="true"/>
<event type="service" invoke="deletePartyToWorkEffortAssignment"/>
<response name="success" type="view" value="ListWorkEffortPartyAssigns"/>
<response name="error" type="view" value="ListWorkEffortPartyAssigns"/>
</request-map>
<request-map uri="addTaskPartyAssign">
<security https="true" auth="true"/>
@@ -679,7 +685,7 @@
<response name="success" type="view" value="EditWorkEffortSurveyAppls"/>
<response name="error" type="view" value="EditWorkEffortSurveyAppls"/>
</request-map>
<!-- end of request mappings -->
<!-- View Mappings -->
+1 -1
View File
@@ -579,7 +579,7 @@
<field name="thruDate" title="${uiLabelMap.CommonThruDate}"><display type="date-time"/></field>
<field name="expireButton" widget-style="smallSubmit" use-when="${thruDate==null || (thruDate &gt; nowTimestamp)}"><submit button-type="button"/></field>
</form>
<form name="AddWorkEffortPartyAssign" target="createWorkEffortPartyAssign" title="" type="single"
<form name="AddWorkEffortPartyAssign" target="addWorkEffortPartyAssign" title="" type="single"
header-row-style="header-row" default-table-style="basic-table">
<actions>
<entity-condition entity-name="PartyRoleAndPartyDetail" distinct="true" list="projectResources">
@@ -18,6 +18,7 @@
*******************************************************************************/
package org.apache.ofbiz.ws.rs.util;
import java.lang.reflect.InvocationTargetException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -298,8 +299,9 @@ public final class OpenApiUtil {
return null;
}
try {
schema = (Schema<?>) schemaClass.newInstance();
} catch (InstantiationException | IllegalAccessException e) {
schema = (Schema<?>) schemaClass.getDeclaredConstructor().newInstance();
} catch (InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException | NoSuchMethodException
| SecurityException e) {
e.printStackTrace();
}
@@ -377,8 +379,9 @@ public final class OpenApiUtil {
continue;
}
try {
schema = (Schema<?>) schemaClass.newInstance();
} catch (InstantiationException | IllegalAccessException e) {
schema = (Schema<?>) schemaClass.getDeclaredConstructor().newInstance();
} catch (InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException | NoSuchMethodException
| SecurityException e) {
e.printStackTrace();
}
if (schemaClass != null) {
+1 -1
View File
@@ -20,7 +20,7 @@ dependencies {
// 1. Remember to change the version LUCENE_VERSION in SearchWorker class when upgrading.
// 2. luceneMatchVersion should be updated in solrconfig.xml
// 3. Also Solr et Lucene should use the same version,
pluginLibsCompile 'org.apache.solr:solr-core:8.11.1'
pluginLibsCompile 'org.apache.solr:solr-core:8.11.2'
pluginLibsCompile 'com.google.guava:guava:28.0-jre'
}
+1 -1
View File
@@ -35,7 +35,7 @@
that you fully re-index after changing this setting as it can
affect both how text is indexed and queried.
-->
<luceneMatchVersion>8.11.1</luceneMatchVersion>
<luceneMatchVersion>8.11.2</luceneMatchVersion>
<!-- <lib/> directives can be used to instruct Solr to load any Jars
identified and use them to resolve any "plugins" specified in
@@ -76,6 +76,7 @@ public abstract class SolrProductSearch {
String solrIndexName = (String) context.get("indexName");
if (SolrUtil.isSolrEcaEnabled()) {
System.setProperty("SolrDispatchFilter", "runsAfterControlFilter");
// Debug.logVerbose("Solr: addToSolr: Running indexing for productId '" + productId + "'", MODULE);
try {
GenericValue product = EntityQuery.use(delegator).from("Product").where("productId", productId).queryOne();
@@ -98,6 +99,7 @@ public abstract class SolrProductSearch {
Debug.logError(gse, gse.getMessage(), MODULE);
result = ServiceUtil.returnError(gse.toString());
}
System.clearProperty("SolrDispatchFilter");
} else {
final String statusMsg = "Solr ECA indexing disabled; skipping indexing for productId '" + productId + "'";
if (Debug.verboseOn()) {
@@ -20,10 +20,10 @@
package org.apache.ofbiz.solr.test;
import java.util.HashMap;
import java.util.Map;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.apache.ofbiz.entity.GenericValue;
import org.apache.ofbiz.entity.util.EntityQuery;
@@ -73,8 +73,6 @@ public class SolrTests extends OFBizTestCase {
throw new Exception(errorMessage);
}
assertTrue("Could not query search index", ServiceUtil.isSuccess(sresp));
}
/**
@@ -82,6 +80,7 @@ public class SolrTests extends OFBizTestCase {
* @throws Exception the exception
*/
public void testAddToSolrIndex() throws Exception {
System.setProperty("SolrDispatchFilter", "runsAfterControlFilter");
context = new HashMap<>();
context.put("productId", validTestProductId);
response = getDispatcher().runSync("addToSolrIndex", context);
@@ -91,6 +90,7 @@ public class SolrTests extends OFBizTestCase {
}
assertTrue("Could not add Product to Index", ServiceUtil.isSuccess(
response));
System.clearProperty("SolrDispatchFilter");
}
/**
@@ -98,6 +98,7 @@ public class SolrTests extends OFBizTestCase {
* @throws Exception the exception
*/
public void testAddToSolrIndexInvalidProduct() throws Exception {
System.setProperty("SolrDispatchFilter", "runsAfterControlFilter");
context = new HashMap<>();
context.put("productId", invalidTestProductId);
response = getDispatcher().runSync("addToSolrIndex", context);
@@ -107,6 +108,7 @@ public class SolrTests extends OFBizTestCase {
}
assertTrue("Could not test the addition of an invalid product to the Solr index", ServiceUtil.isSuccess(
response));
System.clearProperty("SolrDispatchFilter");
}
/**
@@ -114,6 +116,7 @@ public class SolrTests extends OFBizTestCase {
* @throws Exception the exception
*/
public void testAddListToSolrIndex() throws Exception {
System.setProperty("SolrDispatchFilter", "runsAfterControlFilter");
List<Map<String, Object>> products = new ArrayList<>();
Map<String, Object> product1 = new HashMap<>();
Map<String, Object> product2 = new HashMap<>();
@@ -134,7 +137,7 @@ public class SolrTests extends OFBizTestCase {
throw new Exception(errorMessage);
}
assertTrue("Could not add products to index", ServiceUtil.isSuccess(response));
System.clearProperty("SolrDispatchFilter");
}
/**
@@ -142,6 +145,7 @@ public class SolrTests extends OFBizTestCase {
* @throws Exception the exception
*/
public void testAddListToSolrIndexInvalidProducts() throws Exception {
System.setProperty("SolrDispatchFilter", "runsAfterControlFilter");
List<Map<String, Object>> products = new ArrayList<>();
Map<String, Object> product1 = new HashMap<>();
Map<String, Object> product2 = new HashMap<>();
@@ -165,7 +169,7 @@ public class SolrTests extends OFBizTestCase {
throw new Exception(errorMessage);
}
assertTrue("Could not test adding invalid products to index", ServiceUtil.isSuccess(response));
System.clearProperty("SolrDispatchFilter");
}
}
@@ -94,9 +94,8 @@ public class OFBizSolrContextFilter extends SolrDispatchFilter {
@Override
public void init(FilterConfig config) throws ServletException {
Properties props = System.getProperties();
props.setProperty("solr.log.dir", UtilProperties.getPropertyValue("solrconfig", "solr.log.dir", "runtime/logs/solr"));
props.setProperty("solr.log.level", UtilProperties.getPropertyValue("solrconfig", "solr.log.level", "INFO"));
props.setProperty("solr/home", UtilProperties.getPropertyValue("solrconfig", "solr/home"));
String ofbizHome = (String) props.get("ofbiz.home");
config.getServletContext().setAttribute(SOLRHOME_ATTRIBUTE, ofbizHome + props.getProperty("solr/home"));
super.init(config);
}
/** Do filter */