22 Commits
Author SHA1 Message Date
Jacques Le Roux 21860f7192 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:36:31 +02:00
Jacques Le Roux f7c583a1a1 Improved: Update build.gradle to the latest dependencies (OFBIZ-12658)
I handled <<addProperties(String,Schema) in Schema has been deprecated>>
Just needed to replace by addProperty(String,Schema) for each case
2022-06-27 15:40:17 +02:00
Jacques Le Roux 7f8ec07b53 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:46:47 +02:00
Jacques Le Roux 67cbf35e83 Improved: Sorl external logging is not working, but a bit in console (OFBIZ-12646)
After removing useless system properties used to handle logging in
OFBizSolrContextFilter.java with commit 102eb51153
that had a wrong commit title
<<Improved: Unable to upload a file through ecommerce (OFBIZ 12636)>>
and message that should have been:
<<Remove useless system properties used to handle logging. Maybe previously this
was working but it was then long ago.

Also speeds things a bit while loading Solr by using the not so obvious
SOLRHOME_ATTRIBUTE servlet attribute rather than the "solr/home" system property

Note: this is a 1st cleaning step and we are still missing external logging>>

I forgot to remove the related properties in solrconfig.properties, this does it
2022-06-17 17:34:55 +02:00
Jacques Le Roux 102eb51153 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-06-16 16:48:43 +02:00
Jacques Le Roux e18d5768ac Improved: Ecommerce Error Page Does Not Work (OFBIZ-4390)
Currently when an error occures in ecommerce or ecomseo CsrfUtil::checkToken
throws the RequestHandlerException "Invalid or missing CSRF token for AJAX call..."

It's only disturbing in log for no benefit. This feature seems obsolete and
we should rather get rids of it.

I don't backport in case I'd proved wrong
2022-06-11 14:43:08 +02:00
Pierre Smits 34ba24e439 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:02:13 +02:00
Jacques Le Roux f8cb563d18 Improved: Screen projectmgr main is taking long time to load when projects are more (OFBIZ-12606)
When projects are more than 1000, main screen of projectmgr component is taking
very long time  to load.
Currently it is loading all available projects in one shot and there is
"ProjectIsBillable.groovy" which is calling in row-actions

Solution : We can use performFind service  to increase performance in this screen

jleroux: I have just removed the commented out replaced code and changed the new
<field name="createdStamp"
by
<field name="createdDate" map-name="resultProject.projectInfo"
Also automatically removed few trailing blanks

Thanks: Balaji Yendamuri for the patch
2022-05-03 11:58:22 +02:00
Nicolas Malin 070c3c09d5 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:04 +02:00
Jacques Le Roux eac1fb508f 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:36:20 +02:00
Jacques Le Roux 2ddb605ae8 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:44:14 +02:00
Jacques Le Roux 5792f452a9 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:38:15 +02:00
Jacques Le Roux 4cce082e93 Improved: no functional change, adds GitHub Actions build status emails.
As the name suggests, these are emails that notify of either a failed build
using GitHub Actions, or a change from failure in previous builds to a
successful build. Continuously successful builds will not trigger emails, as
that could be rather spammy.

Please see the documentation on this at: https://s.apache.org/asfyaml-gha
2022-04-02 13:13:22 +02:00
Jacques Le Roux 265cc7f83e 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 10:41:55 +02:00
Jacques Le Roux daa5f74b42 Improved: no functional change, adds GitHub Actions build status emails.
As the name suggests, these are emails that notify of either a failed build
using GitHub Actions, or a change from failure in previous builds to a
successful build. Continuously successful builds will not trigger emails, as
that could be rather spammy.

Please see the documentation on this at: https://s.apache.org/asfyaml-gha
2022-03-29 13:43:19 +02:00
Jacques Le Roux a7bb363932 Improved: no functional change, removes misleading comment
The Base64 class no longer exists
2022-03-05 11:04:41 +01:00
Jacques Le Roux 0da1f22334 Improved: no functional change simple formatting 2022-02-28 18:27:30 +01:00
Jacques Le Roux 20ce270211 Improved: no functional change, removes commented out request-maps since 2009
See https://markmail.org/message/upeivoflev5de3ke
2022-02-24 09:28:20 +01:00
Michael Brohl a38685f23d Improved: Update Redoc to v2.0.0-rc.59 (OFBIZ-12520) 2022-02-22 23:44:55 +01:00
Michael Brohl cea04fea0f Improved: Update to Swagger UI 4.2.1 (OFBIZ-12519) 2022-02-22 23:43:45 +01:00
Benjamin Jugl 82f6198e2e Fixed: Setting VIEW_INDEX to 0 in ForumScreens.xml when not initialized (OFBIZ-11429) 2022-02-22 22:57:16 +01:00
Jacques Le Roux 9d66988c5b 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:48:08 +01:00
37 changed files with 124 additions and 283 deletions
+3
View File
@@ -29,3 +29,6 @@ github:
- https
- content
- geospatial
notifications:
jobs: notifications@ofbiz.apache.org
@@ -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
}
}
}
@@ -222,8 +222,7 @@ under the License.
<#list notes as note>
<fo:table-row>
<fo:table-cell>
<fo:block>Author : ${Static[
"org.apache.ofbiz.party.party.PartyHelper"].getPartyName(delegator, note.noteParty, true)}</fo:block>
<fo:block>Author : ${Static["org.apache.ofbiz.party.party.PartyHelper"].getPartyName(delegator, note.noteParty, true)}</fo:block>
<fo:block>Date : ${note.noteDateTime?string.short}</fo:block>
<#escape x as x?html>
<fo:block>${note.noteInfo!}</fo:block>
@@ -19,7 +19,6 @@ under the License.
<html>
<body>
<#if requestParameters.detail?has_content>
<#--assign detailImage = Static["org.apache.ofbiz.base.util.Base64"].base64Decode(requestParameters.detail)-->
<img src="${requestParameters.detail}" alt=""/>
<#else>
<script type="application/javascript">
@@ -21,7 +21,7 @@ under the License.
<site-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://ofbiz.apache.org/Site-Conf" xsi:schemaLocation="http://ofbiz.apache.org/Site-Conf http://ofbiz.apache.org/dtds/site-conf.xsd">
<description>OFBiz: eCommerce Controller Configuration File</description>
<errorpage>component://common/webcommon/error/Error.ftl</errorpage>
<handler name="java" type="request" class="org.apache.ofbiz.webapp.event.JavaEventHandler"/>
@@ -1429,27 +1429,6 @@ under the License.
<response name="error" type="view" value="EditBlogArticle"/>
</request-map>
<!--request-map uri="persistBlogSummary">
<security https="false" auth="true"/>
<event type="service" invoke="persistContentAndAssoc"/>
<response name="success" type="view" value="EditBlog"/>
<response name="error" type="view" value="EditBlog"/>
</request-map>
<request-map uri="persistBlogText">
<security https="false" auth="true"/>
<event type="service" invoke="persistContentAndAssoc"/>
<response name="success" type="view" value="EditBlog"/>
<response name="error" type="view" value="EditBlog"/>
</request-map>
<request-map uri="persistBlogImage">
<security https="false" auth="true"/>
<event type="service" invoke="persistContentAndAssoc"/>
<response name="success" type="view" value="EditBlog"/>
<response name="error" type="view" value="EditBlog"/>
</request-map-->
<request-map uri="createBlogResponse">
<security https="true" auth="true"/>
<event type="service" invoke="createTextContent"/>
@@ -1809,12 +1788,12 @@ under the License.
<security https="false" auth="false"/>
<response name="success" type="view" value="compareProducts" save-last-view="true"/>
</request-map>
<request-map uri="ProductUomDropDownOnly">
<security auth="false" https="false"/>
<response name="success" type="view" value="ProductUomDropDownOnly" save-current-view="false" save-last-view="true"/>
</request-map>
<!-- Captcha: Image request, the captcha code is stored in the session using _CAPTCHA_CODE_ as the key -->
<request-map uri="captcha.jpg">
<security https="true" auth="false"/>
@@ -2014,18 +1993,18 @@ under the License.
<!-- One Page Checkout -->
<view-map name="OnePageCheckout" type="screen" page="component://ecommerce/widget/OrderScreens.xml#OnePageCheckout"/>
<view-map name="compareProducts" type="screen" page="component://ecommerce/widget/OrderScreens.xml#compareProducts"/>
<!-- Product in the different UOM -->
<view-map name="ProductUomDropDownOnly" type="screen" page="component://ecommerce/widget/CatalogScreens.xml#ProductUomDropDownOnly"/>
<!-- Contact List -->
<view-map name="ContactListOptOut" type="screen" page="component://marketing/widget/ContactListScreens.xml#OptOutResponse"/>
<!-- Product Category 's Ajax -->
<view-map name="productCategoryList" type="screen" page="component://ecommerce/widget/CatalogScreens.xml#productCategoryList"/>
<!-- Shopping List 's Ajax -->
<view-map name="showShoppingList" type="screen" page="component://ecommerce/widget/ShoppingListScreens.xml#showShoppingList"/>
<!-- End of View Mappings -->
</site-conf>
@@ -163,9 +163,4 @@ under the License.
<welcome-file>index.html</welcome-file>
<welcome-file>index.htm</welcome-file>
</welcome-file-list>
<error-page>
<error-code>404</error-code>
<location>/error/404.jsp</location>
</error-page>
</web-app>
-54
View File
@@ -1,54 +0,0 @@
<%--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
--%>
<%@ page import="java.util.*" %>
<%@ page import="org.apache.ofbiz.base.util.*" %>
<%@ page import="org.apache.ofbiz.entity.*" %>
<%@ page import="org.apache.ofbiz.entity.util.*" %>
<%@ page import="org.apache.ofbiz.webapp.website.WebSiteWorker" %>
<jsp:useBean id="delegator" type="org.apache.ofbiz.entity.GenericDelegator" scope="request" />
<%
ServletContext context = pageContext.getServletContext();
String webSiteId = WebSiteWorker.getWebSiteId(request);
List<GenericValue> webAnalytics = delegator.findByAnd("WebAnalyticsConfig", UtilMisc.toMap("webSiteId", webSiteId), null, false);
%>
<!DOCTYPE html>
<html lang="en">
<head>
<title>Error 404</title>
<%if (webAnalytics != null) {%>
<script type="application/javascript">
<%for (GenericValue webAnalytic : webAnalytics) {%>
<%=StringUtil.wrapString((String) webAnalytic.get("webAnalyticsCode"))%>
<%}%>
</script>
<%}%>
</head>
<body>
<p>
<strong>404.</strong>
<ins>That&#39;s an error.</ins>
</p>
<p>
The requested URL
<code><%=request.getAttribute("filterRequestUriError")%></code>
was not found on this server.
<ins>That&#39;s all we know.</ins>
</p>
</body>
</html>
-5
View File
@@ -156,9 +156,4 @@ under the License.
<welcome-file>index.html</welcome-file>
<welcome-file>index.htm</welcome-file>
</welcome-file-list>
<error-page>
<error-code>404</error-code>
<location>/error/404.jsp</location>
</error-page>
</web-app>
+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 -->
+31 -18
View File
@@ -17,7 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
<forms xmlns:xsi="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">
<form name="EditProject" type="single" target="updateProject" default-map-name="projectInfo"
header-row-style="header-row" default-table-style="basic-table">
@@ -164,7 +164,7 @@
<field-map field-name="distinct" value="Y"/>
<field-map field-name="orderBy" value="-lastStatusUpdate"/>
<field-map field-name="viewIndex" from-field="viewIndex"/>
<field-map field-name="viewSize" from-field="viewSize"/>
<field-map field-name="viewSize" from-field="viewSize"/>
</service>
</actions>
<row-actions>
@@ -186,27 +186,40 @@
<field name="actualHours" map-name="resultProject.projectInfo" title="${uiLabelMap.ProjectMgrActualHours}"><display/></field>
<field name="createdStamp" title="${uiLabelMap.FormFieldTitle_createdDate}"><display type="date"/></field>
</form>
<form name="ListCurrentProjects" type="list" list-name="projects" paginate-target="main"
<form name="ListCurrentProjects" type="list" list-name="listIt" paginate-target="main"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
<script location="component://projectmgr/groovyScripts/ListCurrentProjects.groovy"/>
<set field="parameters.workEffortTypeId" value="PROJECT"/>
<set field="fieldList[]" value="workEffortId"/>
<set field="fieldList[]" value="lastStatusUpdate"/>
<service service-name="performFind" result-map-list="listIt">
<field-map field-name="fieldList" from-field="fieldList"/>
<field-map field-name="inputFields" from-field="parameters"/>
<field-map field-name="entityName" value="WorkEffortAndPartyAssign"/>
<field-map field-name="distinct" value="Y"/>
<field-map field-name="orderBy" value="-lastStatusUpdate"/>
<field-map field-name="viewIndex" from-field="viewIndex"/>
<field-map field-name="viewSize" from-field="viewSize"/>
</service>
</actions>
<row-actions>
<script location="component://projectmgr/groovyScripts/ProjectIsBillable.groovy"/>
<service service-name="getProject" result-map="resultProject">
<field-map field-name="projectId" value="${workEffortId}"/>
</service>
</row-actions>
<field name="projectName" title="${uiLabelMap.ProjectMgrProjectName}" widget-style="buttontext">
<hyperlink description="${projectName}" target="projectView">
<parameter param-name="projectId"/>
<field name="projectName" map-name="resultProject.projectInfo" title="${uiLabelMap.ProjectMgrProjectName}" widget-style="buttontext">
<hyperlink description="${resultProject.projectInfo.projectName}" target="projectView">
<parameter param-name="projectId" from-field="resultProject.projectInfo.projectId"/>
</hyperlink>
</field>
<field name="currentStatusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
<field name="estimatedStartDate" title="${uiLabelMap.FormFieldTitle_estimatedStartDate}"><display type="date"/></field>
<field name="estimatedCompletionDate" title="${uiLabelMap.FormFieldTitle_estimatedCompletionDate}"><display type="date"/></field>
<field name="actualStartDate" title="${uiLabelMap.FormFieldTitle_actualStartDate}"><display type="date"/></field>
<field name="actualCompletionDate" title="${uiLabelMap.FormFieldTitle_actualCompletionDate}"><display type="date"/></field>
<field name="plannedHours" title="${uiLabelMap.ProjectMgrPlannedHours}"><display/></field>
<field name="actualHours" title="${uiLabelMap.ProjectMgrActualHours}"><display/></field>
<field name="actualNonBilledHours" title="${uiLabelMap.ProjectMgrNonBilledActualHours}"><display description="${groovy:isBillable&amp;&amp;actualNonBilledHours!=void?actualNonBilledHours:&quot;&quot;}"/></field>
<field name="createdDate" map-name="resultProject.projectInfo" title="${uiLabelMap.FormFieldTitle_createdDate}"><display type="date"/></field>
<field name="currentStatusId" map-name="resultProject.projectInfo" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
<field name="estimatedStartDate" map-name="resultProject.projectInfo" title="${uiLabelMap.FormFieldTitle_estimatedStartDate}"><display type="date"/></field>
<field name="estimatedCompletionDate" map-name="resultProject.projectInfo" title="${uiLabelMap.FormFieldTitle_estimatedCompletionDate}"><display type="date"/></field>
<field name="actualStartDate" map-name="resultProject.projectInfo" title="${uiLabelMap.FormFieldTitle_actualStartDate}"><display type="date"/></field>
<field name="actualCompletionDate" map-name="resultProject.projectInfo" title="${uiLabelMap.FormFieldTitle_actualCompletionDate}"><display type="date"/></field>
<field name="plannedHours" map-name="resultProject.projectInfo" title="${uiLabelMap.ProjectMgrPlannedHours}"><display/></field>
<field name="actualHours" map-name="resultProject.projectInfo" title="${uiLabelMap.ProjectMgrActualHours}"><display/></field>
<field name="createdStamp" title="${uiLabelMap.FormFieldTitle_createdDate}"><display type="date"/></field>
</form>
<form name="EditSubProjects" list-name="projects" type="list" target="RemoveSubProject"
@@ -579,14 +592,14 @@
<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">
<condition-list combine="and">
<condition-expr field-name="roleTypeId" operator="equals" value="PROJECT_TEAM"/>
<condition-expr field-name="statusId" operator="not-equals" value="PARTY_DISABLED"/>
</condition-list>
</condition-list>
<select-field field-name="partyId"/>
<select-field field-name="lastName"/>
<select-field field-name="firstName"/>
+3 -3
View File
@@ -27,9 +27,9 @@ dependencies {
pluginLibsCompile 'org.glassfish.jersey.media:jersey-media-multipart:2.31'
pluginLibsCompile 'org.glassfish.jersey.media:jersey-media-json-jackson:2.31'
pluginLibsCompile 'org.glassfish.jersey.inject:jersey-hk2:2.31'
pluginLibsCompile 'io.swagger.core.v3:swagger-jaxrs2:2.1.10'
pluginLibsCompile 'io.swagger.core.v3:swagger-jaxrs2-servlet-initializer:2.1.10'
pluginLibsCompile 'io.swagger.core.v3:swagger-annotations:2.1.10'
pluginLibsCompile 'io.swagger.core.v3:swagger-jaxrs2:2.2.1'
pluginLibsCompile 'io.swagger.core.v3:swagger-jaxrs2-servlet-initializer:2.2.1'
pluginLibsCompile 'io.swagger.core.v3:swagger-annotations:2.2.1'
}
task install {
@@ -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;
@@ -158,10 +159,12 @@ public final class OpenApiUtil {
}
private static void buildApiResponseSchemas() {
Schema<?> genericErrorSchema = new MapSchema().addProperties("statusCode", new IntegerSchema().description("HTTP Status Code"))
.addProperties("statusDescription", new StringSchema().description("HTTP Status Code Description"))
.addProperties("errorType", new StringSchema().description("Error Type for the error"))
.addProperties("errorMessage", new StringSchema().description("Error Message"));
Schema<?> genericErrorSchema = new MapSchema();
genericErrorSchema.addProperty("statusCode", new IntegerSchema().description("HTTP Status Code"));
genericErrorSchema.addProperty("statusDescription", new StringSchema().description("HTTP Status Code Description"));
genericErrorSchema.addProperty("errorType", new StringSchema().description("Error Type for the error"));
genericErrorSchema.addProperty("errorMessage", new StringSchema().description("Error Message"));
SCHEMAS.put("api.response.unauthorized.noheader", genericErrorSchema);
SCHEMAS.put("api.response.unauthorized.invalidtoken", genericErrorSchema);
SCHEMAS.put("api.response.forbidden", genericErrorSchema);
@@ -282,7 +285,7 @@ public final class OpenApiUtil {
}
Schema<?> attrSchema = getAttributeSchema(service, param);
if (attrSchema != null) {
parentSchema.addProperties(name, getAttributeSchema(service, service.getParam(name)));
parentSchema.addProperty(name, getAttributeSchema(service, service.getParam(name)));
}
});
parentSchema.setRequired(required);
@@ -298,8 +301,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();
}
@@ -331,7 +335,7 @@ public final class OpenApiUtil {
if (!param.isOptional()) {
required.add(childParam.getName());
}
schema.addProperties(childParam.getName(), getAttributeSchema(service, childParam));
schema.addProperty(childParam.getName(), getAttributeSchema(service, childParam));
}
schema.setRequired(required);
}
@@ -344,15 +348,15 @@ public final class OpenApiUtil {
Schema<Object> parentSchema = new Schema<Object>();
parentSchema.setDescription("Out Schema for service: " + service.getName() + " response");
parentSchema.setType("object");
parentSchema.addProperties("statusCode", new IntegerSchema().description("HTTP Status Code"));
parentSchema.addProperties("statusDescription", new StringSchema().description("HTTP Status Code Description"));
parentSchema.addProperties("successMessage", new StringSchema().description("Success Message"));
parentSchema.addProperty("statusCode", new IntegerSchema().description("HTTP Status Code"));
parentSchema.addProperty("statusDescription", new StringSchema().description("HTTP Status Code Description"));
parentSchema.addProperty("successMessage", new StringSchema().description("Success Message"));
Schema<Object> dataSchema = new Schema<Object>();
parentSchema.addProperties("data", dataSchema);
parentSchema.addProperty("data", dataSchema);
service.getOutParamNamesMap().forEach((name, type) -> {
Schema<?> attrSchema = getAttributeSchema(service, service.getParam(name));
if (attrSchema != null) {
dataSchema.addProperties(name, getAttributeSchema(service, service.getParam(name)));
dataSchema.addProperty(name, getAttributeSchema(service, service.getParam(name)));
}
});
return parentSchema;
@@ -377,12 +381,13 @@ 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) {
dataSchema.addProperties(fieldNm, schema.description(fieldNm));
dataSchema.addProperty(fieldNm, schema.description(fieldNm));
}
}
return dataSchema;
+2 -2
View File
@@ -4,12 +4,12 @@ You can choose between Swagger UI and Redoc to publish documentation for the RES
== Swagger
Current version: swagger-ui-3.45.1
Current version: swagger-ui-4.2.1
Access: https://localhost:8443/docs/swagger-ui.html
== Redoc
Current version: redoc@2.0.0-rc.50
Current version: redoc@2.0.0-rc.59
Accesss: https://localhost:8443/docs/redoc.html
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+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'
}
-5
View File
@@ -46,10 +46,5 @@ solr.client.connection.timeout=
# If true, trust self signed certification, default is false.
solr.client.trust.selfsigned.cert=true
# Defines Solr specific log directory
solr.log.dir=runtime/logs/solr
# Defines Solr log level
solr.log.level=INFO
# Define the location of its home, speeds loading
solr/home=/plugins/solr/home
+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 */