This repository has been archived by the owner on May 9, 2020. It is now read-only.
Trunk #10
Open
Trunk #10
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1. Add zxing-core-3.2.0.jar to framework/base/lib and .classpath. 2. Add services_qrcode.xml and QRCodeService.java in framework/common/. 3. Add qrcode request in common-controller.xml and QRCodeEvents.java under framework/common/. 4. Add qrcode.properties and QRCodeUiLabels.xml under framework/common/. 5. Add a barcode example page in specialpurpose/example, entry is on page: /example/control/EditExample?exampleId=EX01, the example can be seen on page: /example/control/ExampleReportPdfBarcode?exampleId=EX01 git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1696921 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1696950 13f79535-47bb-0310-9956-ffa450edef68
… dev ML git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1697072 13f79535-47bb-0310-9956-ffa450edef68
…component" https://issues.apache.org/jira/browse/OFBIZ-6577 git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1697166 13f79535-47bb-0310-9956-ffa450edef68
…nt specific js file. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1697574 13f79535-47bb-0310-9956-ffa450edef68
…iption" fields was changed from VARCHAR(255) to TEXT; the new TEXT type allows strings of any length; however all other types definitions (MySQL, Derby etc...) are using VARCHAR(255) thus limiting the length of "comments" and "description" fields to 255 characters. By reverting this change we make sure that the Postgres db will be consistent with the other dbs. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1697590 13f79535-47bb-0310-9956-ffa450edef68
…til.getRelated. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1697647 13f79535-47bb-0310-9956-ffa450edef68
…oupName field. Fix the focus-field-name from partyName to partyId as partyName is not a valid field on lookup party form. Used correct jQuery.each method in for paginationMenus. Now lookup party is working fine. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1697674 13f79535-47bb-0310-9956-ffa450edef68
…running OFBiz 13.07.02 against MySQL" https://issues.apache.org/jira/browse/OFBIZ-6582 Updates the "MySQL Connector/J" from 5.1.6 to 5.1.36 This follows OFBIZ-4800 where the "MySQL Connector/J 5.1.6" was used. See http://mvnrepository.com/artifact/mysql/mysql-connector-java/5.1.6 and https://dev.mysql.com/doc/relnotes/connector-j/en/news-5-1.html for details git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1697993 13f79535-47bb-0310-9956-ffa450edef68
…g/jira/browse/OFBIZ-6583 This fixes and improves CompanyHeader.groovy git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1698259 13f79535-47bb-0310-9956-ffa450edef68
…ng for OFBIZ-6583 git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1698261 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1698263 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1698406 13f79535-47bb-0310-9956-ffa450edef68
1. Put the patch into trunk.
2. Added access control to solr /admin/ pages.
3. Upgraded solr to 4.9.0 to match Lucene version in trunk.
4. Removed solr.solr.home, used
SolrResourceLoader loader = new SolrResourceLoader("specialpurpose/solr/conf");
instead.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1700119 13f79535-47bb-0310-9956-ffa450edef68
…lobalActions decorator will generate this data and will be added in screens accordingly. Now date picker working fine. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1700250 13f79535-47bb-0310-9956-ffa450edef68
The reason behind is lack of jars in applications/content/build/lib and specialpurpose/lucene/lib. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1700446 13f79535-47bb-0310-9956-ffa450edef68
Replaces tabs with spaces. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1700448 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1700460 13f79535-47bb-0310-9956-ffa450edef68
Add all the jars under specialpurpose/solr/ into LICENSE. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1700461 13f79535-47bb-0310-9956-ffa450edef68
…open in new windows" https://issues.apache.org/jira/browse/OFBIZ-6593 Currently the various hard coded links at the bottom of the admin screen open in the same window. These should open in a new window to provide a better UX. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1700555 13f79535-47bb-0310-9956-ffa450edef68
Add apache solr to secondary top menu and /solr/control/main request to accept the link from the menu. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1700599 13f79535-47bb-0310-9956-ffa450edef68
1. Use response.sendRedirect to forward url to login page instead of the response.setHeader("location", url), this avoids the warning messages from EntityUtilProperties. Besides, when testing in similar config as demo-ofbiz-trunk is (port 80 -> 8080, port 443 -> 8443), this change can keep the url to 80 or 443.
2. Replace tabs to spaces in several java files.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1700739 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1700864 13f79535-47bb-0310-9956-ffa450edef68
Commented out https scheme check. Let see whether it would work. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1700960 13f79535-47bb-0310-9956-ffa450edef68
…ovy over BSF" https://issues.apache.org/jira/browse/OFBIZ-6597 git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1701150 13f79535-47bb-0310-9956-ffa450edef68
I did not remove copy-apis and other doc (API) related targets because they are used by Buildbot. I should modify the Buildbot conf to automatically use the copy-dtds target, but that's for another insomnia night... git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1701157 13f79535-47bb-0310-9956-ffa450edef68
… 7.0.64 git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1701164 13f79535-47bb-0310-9956-ffa450edef68
Removed https scheme check and demo-trunk-ofbiz.apache.org/solr/ can be displayed correctly now. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1701379 13f79535-47bb-0310-9956-ffa450edef68
1. Add specialpurpose/webapp/exampleext/error/error.jsp to display error page. 2. Move specialpurpose/example/widget/exampleext to specialpurpose/exampleext/widget/example. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1701441 13f79535-47bb-0310-9956-ffa450edef68
Add permission check on /update, /update/json, /update/csv and /update/extract requests. These requests are defined in an index's solrconfig.xml. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1701495 13f79535-47bb-0310-9956-ffa450edef68
Thanks to Akash Jain for the contribution: OFBIZ-6728, OFBIZ-6729, OFBIZ-6730 git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1715485 13f79535-47bb-0310-9956-ffa450edef68
…iguration. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1715491 13f79535-47bb-0310-9956-ffa450edef68
…="fixed" to fix the warning. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1715493 13f79535-47bb-0310-9956-ffa450edef68
=========================================================== Currently the quote report (or print) opens in the same window. This should be in a new window(target = _BLANK) Thanks Pierre Smits for your contribution. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1715494 13f79535-47bb-0310-9956-ffa450edef68
…populated when trying to add a shipping address from the Quick Finalize Order screen. Thanks Aditya for reporting the issue and providing the fix for the same. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1715495 13f79535-47bb-0310-9956-ffa450edef68
============================================================ Fixed Missing userLogin error on party profile screen when 1st content is non public. Thanks Jacques for reporting the issue :) and Thanks Vishal for providing the patch for the issue. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1715501 13f79535-47bb-0310-9956-ffa450edef68
============================================================ Layout improvement for showing cart properly on order entry page for bizznesstime theme. Thanks Aditya for your contribution. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1715504 13f79535-47bb-0310-9956-ffa450edef68
…sh, earlier it was not refreshing. Updated uiLabelJsonObjects method's (used for jsonify ui lables) signature. Added callback function in this method to get response returned from asynchronous ajax request. After this uiLabel object is available which resolves the issue git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1715505 13f79535-47bb-0310-9956-ffa450edef68
============================================================ - Added session cookies config for ecommerce,ecomseo and ecomclone web.xml. - Used web-app 3.0 version for web-app - Re-arrange description and display-name attribute as per the web-app structure. Thanks Rahul for your contribution. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1715506 13f79535-47bb-0310-9956-ffa450edef68
… was generating error as well. Applying patch from OFBIZ-6534. Thanks Pierre Smits for reporting the issue. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1715531 13f79535-47bb-0310-9956-ffa450edef68
…pplying patch from OFBIZ-6742. Thanks Amardeep Singh Jhajj for reporting the issue and providing the patch. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1715536 13f79535-47bb-0310-9956-ffa450edef68
jleroux: This initially was my error in r1705417, So I simply reverted the change in r1715536 done for OFBIZ-6742 and also reverted r1705417 in this file. I will check other changes done in r1705417 git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1715573 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1715670 13f79535-47bb-0310-9956-ffa450edef68
… ftl with widgets" https://issues.apache.org/jira/browse/OFBIZ-6320 jleroux: Added bottom note (in both lists now) title="${uiLabelMap.ProductProductId}" title="${uiLabelMap.ProductProductIdTo}" fromDate <date-time default-value="${nowTimestamp}" tooltip="${uiLabelMap.ProductRecreateAssociation}" Removed EditProductAssoc.ftl old screen with ftl ref in screen (commented out by Christian) UNUSED FORMS comment Product column when same than picked (depend on iterate-section) I liked the idea of changing the main product using a lookup in edit part. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1715755 13f79535-47bb-0310-9956-ffa450edef68
…derFormatHeaderOpen and renderFormatHeaderClose on htmlFromMacroLibrary.ftl. This commit adding these macro on textFormMacroLibrary.ftl, xmlFormMacroLibrary.ftl and csvFormMacroLibrary.ftl. The unit test widgettests now pass without failure git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1715756 13f79535-47bb-0310-9956-ffa450edef68
…ed to issue OFBIZ-6744. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1715788 13f79535-47bb-0310-9956-ffa450edef68
* DataResourceAttribute * ContentRole (not for create will set on second step) * ContentMetaData * ContentOperation * ContentPurpose * ContentPurposeOperation * ContentAttribute * ContentKeyword * ContentType * ContentAssocType * ContentAssocPredicate * ContentPurposeType I also move some service definition from file services.xml to services_content.xml for all entities that concern content relate issue OFBIZ-6745 git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1715960 13f79535-47bb-0310-9956-ffa450edef68
…-6655 git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1716036 13f79535-47bb-0310-9956-ffa450edef68
…//issues.apache.org/jira/browse/OFBIZ-6739 Rerported by Thanakrit Wongyued I found problem to display product category name in Unicode (Thai UTF-8) . The problem is services in CategoryContentWrapper are create content mimeType in "text/html". Then i try to fixed this problem by replace "text/html" with "text/html; charset=utf-8". After that i recompile and restart OFBiz the problem is disappear. jleroux: uses a new defaultMimeType content property, defaulting to "text/html; charset=utf-8", retrieved by EntityUtilProperties.getPropertyValue() git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1716261 13f79535-47bb-0310-9956-ffa450edef68
* WebSiteRole * WebSitePathAlias * WebSiteContentType * WebSiteContent * WebSite * DataResourcePurpose * DataResourceMetaData * OtherDataResource * AudioDataResource * VideoDataResource * ImageDataResource * DataResource (update/delete) * ContentApproval * ContentRevisionItem * ContentRevision I also move some service definition from file services.xml to services_content.xml for ContentApproval, ContentRevisionItem and ContentRevision relate issue OFBIZ-6745 git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1716271 13f79535-47bb-0310-9956-ffa450edef68
…n using Delegator.storeAll() method" https://issues.apache.org/jira/browse/OFBIZ-3847 As reported by Martin Kreidenweis The conditions don't work when updating (not creating) entities using the Delegator.storeAll() method. E.g. the following condition does not work: <eca entity="Product" operation="create-store" event="return"> <condition field-name="autoCreateKeywords" operator="not-equals" value="N"/> <action service="indexProductKeywords" mode="sync" value-attr="productInstance"/> </eca> The indexProductKeywords service is called anyway when the product is updated and the autoCreateKeywords was "N" and stays "N". It works correctly for newly created products. The problem is in the method GenericDelegator.storeAll(), where unchanged field values are not passed down to the store() method. The store method calls the ECA engine, which does not receive the unchanged values at all and thus cannot evaluate the EECA conditions correctly. Scott's comment:We could consider having EntityEcaCondition.eval() perform a db lookup if any of the fields it needs to evaluate are missing. If they are missing it could fully populate the entity with the missing fields so that a lookup is only required at most once per delegator operation. If no ECA conditions require any missing fields then the lookup wouldn't be performed, so the performance penalty would only be incurred when necessary. Anne: I've created a patch modeled after Scott's suggestion. I'd appreciate someone reviewing it. It does work for me, however I am concerned that it might fail when the value of a field that is part of the EECA condition is being changed from non-null to null using GenericDelegator.storeAll, because of the way storeAll works. There may be a simple solution I've missed. jleroux: After reviewing and waiting for Anne's feedback, I commit because even if in some cases it would not work it's at least better than current situation git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1716319 13f79535-47bb-0310-9956-ffa450edef68
…nked to ensurePartyRole service, relate issue OFBIZ-6745 git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1716542 13f79535-47bb-0310-9956-ffa450edef68
…er account - Using Security Questions" https://issues.apache.org/jira/browse/OFBIZ-4983 jleroux: the issue description is quite lengthy so I will summarise it here, please refer to the Jira issue for details. "When a customer creates an account on eCommerce site, s/he will also need to answer a security question. This security question then can be used by the user to reclaim her/his account in case s/he forgets her/his password. If the user correctly answers the required security question while reclaiming her/his account, her/his password will be sent through email notification. This part would work in the same way as the existing functionality of email password (forget password)." The description was actually more ambitious (several questions, possibility for users to create own questions) but AFAIK these parts have not been implemented. Apart updating the patch which did not merge, I got 2 majors issues (and few others I will not report here) I bypassed with workarounds. Unlike Harsha, and as I reported earlier in the issue, I never got the username (userLoginId) back when using hidden parameters in the request body (not in requestParameters, ie UtilHttp.getParameterMap(request)), nor actually any parameters. This is maybe due to my OS (Windows7 was XP before) or my email client (Outlook Express then, now Thunderbird) or even my SMTP configuration (I used my ISP SMTP server) but most probably because I did it all on my sole machine (localhost). I tried to understand what was happening to request body parameters with http://www.telerik.com/fiddler, but finally gave up because it's even more complicated when https is in the picture. So I decided to rather use parameters in the URL (Query string). It's a bit less safe, though the password is OFBiz encrypted, and should be replaced. But it's safe enough because only the user should receive this message and even if the message is sniffed during its journey it should be hard to decrypt the password! Harsha used the SecurityExtUiLabels.xml (created by ashish at r1618415) in securityext component but there is already a SecurityextUiLabels.xml in common component. Since I use Windows OFBiz was unable to retrieve the labels from SecurityExtUiLabels.xml since I guess it looked into a SecurityextUiLabels.xml. So I renamed a SecurityExtUiLabels.xml to EmailPassword.xml. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1716915 13f79535-47bb-0310-9956-ffa450edef68
…FBiz security until OFBIZ-6568 is fixed. To get the contrast-rO0.jar see https://github.com/Contrast-Security-OSS/contrast-rO0 Note that we are safe from an exploit using the commons collections see OFBIZ-6726. The demos will be using contrast-rO0.jar starting this night. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1717058 13f79535-47bb-0310-9956-ffa450edef68
…FBiz security until OFBIZ-6568 is fixed. To get the contrast-rO0.jar see https://github.com/Contrast-Security-OSS/contrast-rO0 In r1717058 I missed to add start-batch-secure and both-secure git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1717180 13f79535-47bb-0310-9956-ffa450edef68
Even if we are covered from the Java Object possible deserialisation exploit by the 3.2.2 version, since it's easy to update, this issue to update the trunk to the last available release. I updated the .classpath file by hand, but kept the tabs in it, so I could move misplaced entries to their right alphabetical places. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1717247 13f79535-47bb-0310-9956-ffa450edef68
…l.java, Testsuite entity-test successfull git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1717333 13f79535-47bb-0310-9956-ffa450edef68
Hungarian Translations. I tried to bring this up to a comparable level with the Deutsch file.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Added a few changes for Hungarian translation.
--Edit--
My mistake, please only pull in the bdd5bd7 commit.