From notifications-return-29990-archive-asf-public=cust-asf.ponee.io@ofbiz.apache.org Sat Jan 25 13:41:02 2020 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with SMTP id 1B99C18061A for ; Sat, 25 Jan 2020 14:41:02 +0100 (CET) Received: (qmail 70824 invoked by uid 500); 25 Jan 2020 13:41:01 -0000 Mailing-List: contact notifications-help@ofbiz.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ofbiz.apache.org Delivered-To: mailing list notifications@ofbiz.apache.org Received: (qmail 70813 invoked by uid 99); 25 Jan 2020 13:41:01 -0000 Received: from mailrelay1-us-west.apache.org (HELO mailrelay1-us-west.apache.org) (209.188.14.139) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 25 Jan 2020 13:41:01 +0000 Received: from jira-he-de.apache.org (static.172.67.40.188.clients.your-server.de [188.40.67.172]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id AA1C3E0F04 for ; Sat, 25 Jan 2020 13:41:00 +0000 (UTC) Received: from jira-he-de.apache.org (localhost.localdomain [127.0.0.1]) by jira-he-de.apache.org (ASF Mail Server at jira-he-de.apache.org) with ESMTP id 27105780357 for ; Sat, 25 Jan 2020 13:41:00 +0000 (UTC) Date: Sat, 25 Jan 2020 13:41:00 +0000 (UTC) From: "Jacques Le Roux (Jira)" To: notifications@ofbiz.apache.org Message-ID: In-Reply-To: References: Subject: [jira] [Comment Edited] (OFBIZ-11325) Fixed the issue on party page that will upload the data each time after refreshing the page. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-JIRA-FingerPrint: 30527f35849b9dde25b450d4833f0394 [ https://issues.apache.org/jira/browse/OFBIZ-11325?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17023561#comment-17023561 ] Jacques Le Roux edited comment on OFBIZ-11325 at 1/25/20 1:40 PM: ------------------------------------------------------------------ Here is what I got: {noformat} Jacques@LDLC MINGW64 /c/projectsASF/Git/ofbiz-framework (trunk) $ git pull Already up to date. Current branch trunk is up to date. Jacques@LDLC MINGW64 /c/projectsASF/Git/ofbiz-framework (trunk) $ patch -p0 < OFBIZ-11325.patch patching file applications/party/webapp/partymgr/WEB-INF/controller.xml Hunk #12 FAILED at 1028. Hunk #13 succeeded at 1055 (offset 4 lines). Hunk #14 succeeded at 1151 (offset 4 lines). Hunk #15 succeeded at 1165 (offset 4 lines). Hunk #16 succeeded at 1260 (offset 4 lines). Hunk #17 succeeded at 1281 (offset 4 lines). 1 out of 17 hunks FAILED -- saving rejects to file applications/party/webapp/partymgr/WEB-INF/controller.xml.rej Jacques@LDLC MINGW64 /c/projectsASF/Git/ofbiz-framework (trunk) $ tail -n100 applications/party/webapp/partymgr/WEB-INF/controller.xml.rej --- applications/party/webapp/partymgr/WEB-INF/controller.xml (revision 1873128) +++ applications/party/webapp/partymgr/WEB-INF/controller.xml (working copy) @@ -1028,8 +1066,12 @@ - - + + + + + + Jacques@LDLC MINGW64 /c/projectsASF/Git/ofbiz-framework (trunk) {noformat} The reason is it was already applied for OFBIZ-11171, see: [https://gitbox.apache.org/repos/asf?p=ofbiz-framework.git;a=commitdiff;h=2cb33566ab7807e7aaf49224aa64640cc11fb619] If I remove {noformat} @@ -990,8 +1028,12 @@ - - + + + + + + {noformat} From your patch, it works. That's why I asked you to "git pull" and recreate the patch. Then we would not have had this issue, better to not mix patches ;) OK I'll commit and backport... a bit later... was (Author: jacques.le.roux): Here is what I got: {noformat} Jacques@LDLC MINGW64 /c/projectsASF/Git/ofbiz-framework (trunk) $ git pull Already up to date. Current branch trunk is up to date. Jacques@LDLC MINGW64 /c/projectsASF/Git/ofbiz-framework (trunk) $ patch -p0 < OFBIZ-11325.patch patching file applications/party/webapp/partymgr/WEB-INF/controller.xml Hunk #12 FAILED at 1028. Hunk #13 succeeded at 1055 (offset 4 lines). Hunk #14 succeeded at 1151 (offset 4 lines). Hunk #15 succeeded at 1165 (offset 4 lines). Hunk #16 succeeded at 1260 (offset 4 lines). Hunk #17 succeeded at 1281 (offset 4 lines). 1 out of 17 hunks FAILED -- saving rejects to file applications/party/webapp/partymgr/WEB-INF/controller.xml.rej Jacques@LDLC MINGW64 /c/projectsASF/Git/ofbiz-framework (trunk) $ tail -n100 applications/party/webapp/partymgr/WEB-INF/controller.xml.rej --- applications/party/webapp/partymgr/WEB-INF/controller.xml (revision 1873128) +++ applications/party/webapp/partymgr/WEB-INF/controller.xml (working copy) @@ -1028,8 +1066,12 @@ - - + + + + + + Jacques@LDLC MINGW64 /c/projectsASF/Git/ofbiz-framework (trunk) {noformat} The reason is it was already applied for OFBIZ-11171, see: [https://gitbox.apache.org/repos/asf?p=ofbiz-framework.git;a=commitdiff;h=2cb33566ab7807e7aaf49224aa64640cc11fb619] If I remove {noformat} @@ -990,8 +1028,12 @@ - - + + + + + + {noformat} From your patch, it works. That's why I asked you to "git pull" and recreate the patch. Then we would not have had this issue ;) OK I'll commit and backport... a bit later... > Fixed the issue on party page that will upload the data each time after refreshing the page. > -------------------------------------------------------------------------------------------- > > Key: OFBIZ-11325 > URL: https://issues.apache.org/jira/browse/OFBIZ-11325 > Project: OFBiz > Issue Type: Sub-task > Components: party > Affects Versions: Trunk > Reporter: Humera Khan > Assignee: Humera Khan > Priority: Major > Fix For: Trunk > > Attachments: OFBIZ-11325.patch > > > Please refer OFBIZ-11171 -- This message was sent by Atlassian Jira (v8.3.4#803005)