[jira] [Comment Edited] (OFBIZ-11329) setUserTimeZone should ran only once based on error
[ https://issues.apache.org/jira/browse/OFBIZ-11329?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17032464#comment-17032464 ] Jacques Le Roux edited comment on OFBIZ-11329 at 2/7/20 3:39 PM: - Hi James, Thanks for the explanation, one worry less. You mean that if you use RequestHandlerException the link does not work? was (Author: jacques.le.roux): Hi James, Thanks for the explanation, one worry less. > setUserTimeZone should ran only once based on error > --- > > Key: OFBIZ-11329 > URL: https://issues.apache.org/jira/browse/OFBIZ-11329 > Project: OFBiz > Issue Type: Bug > Components: framework, webpos >Affects Versions: Trunk >Reporter: Jacques Le Roux >Assignee: James Yong >Priority: Minor > Fix For: 17.12.01, 18.12.01 > > Attachments: OFBIZ-11329-plugins.patch, OFBIZ-11329.patch, > OFBIZ-11329.patch > > > This will be useful when committing CSRF solution as explained in OFBIZ-11306 -- This message was sent by Atlassian Jira (v8.3.4#803005)
[jira] [Comment Edited] (OFBIZ-11329) setUserTimeZone should ran only once based on error
[
https://issues.apache.org/jira/browse/OFBIZ-11329?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17030832#comment-17030832
]
Jacques Le Roux edited comment on OFBIZ-11329 at 2/7/20 3:36 PM:
-
Since you are interested in (simple version):
{noformat}
Jacques@LDLC MINGW64 /c/projectsASF/Git/ofbiz-framework (trunk)
$ git pull
First, rewinding head to replay your work on top of it...
Applying: Improved: Updated plugins url in release17.12
Using index info to reconstruct a base tree...
M build.gradle
Falling back to patching base and 3-way merge...
Auto-merging build.gradle
CONFLICT (content): Merge conflict in build.gradle
Staged 'build.gradle' using previous resolution.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 Improved: Updated plugins url in release17.12
Resolve all conflicts manually, mark them as resolved with
"git add/rm ", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase
--abort".
{noformat}
Better solution:
{noformat}
git fetch origin
git reset --hard origin/trunk
{noformat}
Then I got my stash, previous to backport, clean... pfew...
was (Author: jacques.le.roux):
Since you are interested in (simple version):
{noformat}
Jacques@LDLC MINGW64 /c/projectsASF/Git/ofbiz-framework (trunk)
$ git pull
First, rewinding head to replay your work on top of it...
Applying: Improved: Updated plugins url in release17.12
Using index info to reconstruct a base tree...
M build.gradle
Falling back to patching base and 3-way merge...
Auto-merging build.gradle
CONFLICT (content): Merge conflict in build.gradle
Staged 'build.gradle' using previous resolution.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 Improved: Updated plugins url in release17.12
Resolve all conflicts manually, mark them as resolved with
"git add/rm ", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase
--abort".
{noformat}
Better solution:
{noformat}
git fetch origin
git reset --hard origin/master
{noformat}
Then I got my stash, previous to backport, clean... pfew...
> setUserTimeZone should ran only once based on error
> ---
>
> Key: OFBIZ-11329
> URL: https://issues.apache.org/jira/browse/OFBIZ-11329
> Project: OFBiz
> Issue Type: Bug
> Components: framework, webpos
>Affects Versions: Trunk
>Reporter: Jacques Le Roux
>Assignee: James Yong
>Priority: Minor
> Fix For: 17.12.01, 18.12.01
>
> Attachments: OFBIZ-11329-plugins.patch, OFBIZ-11329.patch,
> OFBIZ-11329.patch
>
>
> This will be useful when committing CSRF solution as explained in OFBIZ-11306
--
This message was sent by Atlassian Jira
(v8.3.4#803005)
[jira] [Comment Edited] (OFBIZ-11329) setUserTimeZone should ran only once based on error
[
https://issues.apache.org/jira/browse/OFBIZ-11329?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17030832#comment-17030832
]
Jacques Le Roux edited comment on OFBIZ-11329 at 2/5/20 5:30 PM:
-
Since you are interested in (simple version):
{noformat}
Jacques@LDLC MINGW64 /c/projectsASF/Git/ofbiz-framework (trunk)
$ git pull
First, rewinding head to replay your work on top of it...
Applying: Improved: Updated plugins url in release17.12
Using index info to reconstruct a base tree...
M build.gradle
Falling back to patching base and 3-way merge...
Auto-merging build.gradle
CONFLICT (content): Merge conflict in build.gradle
Staged 'build.gradle' using previous resolution.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 Improved: Updated plugins url in release17.12
Resolve all conflicts manually, mark them as resolved with
"git add/rm ", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase
--abort".
{noformat}
Better solution:
{noformat}
git fetch origin
git reset --hard origin/master
{noformat}
Then I got my stash, previous to backport, clean... pfew...
was (Author: jacques.le.roux):
Since you are interested in:
{noformat}
Since you are interested in:
Jacques@LDLC MINGW64 /c/projectsASF/Git/ofbiz-framework (trunk)
$ git pull
First, rewinding head to replay your work on top of it...
Applying: Improved: Updated plugins url in release17.12
Using index info to reconstruct a base tree...
M build.gradle
Falling back to patching base and 3-way merge...
Auto-merging build.gradle
CONFLICT (content): Merge conflict in build.gradle
Staged 'build.gradle' using previous resolution.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 Improved: Updated plugins url in release17.12
Resolve all conflicts manually, mark them as resolved with
"git add/rm ", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase
--abort".
Jacques@LDLC MINGW64 /c/projectsASF/Git/ofbiz-framework (trunk|REBASE 1/130)
$
Jacques@LDLC MINGW64 /c/projectsASF/Git/ofbiz-framework (trunk|REBASE 1/130)
$
Jacques@LDLC MINGW64 /c/projectsASF/Git/ofbiz-framework (trunk|REBASE 1/130)
$ git rebase --skip
Applying: "Applied fix from trunk for revision: 1819805"
Using index info to reconstruct a base tree...
M themes/rainbowstone/ofbiz-component.xml
M themes/rainbowstone/template/includes/TopAppBar.ftl
Falling back to patching base and 3-way merge...
Auto-merging themes/rainbowstone/template/includes/TopAppBar.ftl
CONFLICT (add/add): Merge conflict in
themes/rainbowstone/config/rainbowstone.properties
Auto-merging themes/rainbowstone/config/rainbowstone.properties
Recorded preimage for 'themes/rainbowstone/config/rainbowstone.properties'
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0002 "Applied fix from trunk for revision: 1819805"
Resolve all conflicts manually, mark them as resolved with
"git add/rm ", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase
--abort".
Jacques@LDLC MINGW64 /c/projectsASF/Git/ofbiz-framework (trunk|REBASE 2/130)
$ git rebase --abort
Jacques@LDLC MINGW64 /c/projectsASF/Git/ofbiz-framework (trunk)
$ git pull
First, rewinding head to replay your work on top of it...
Applying: Improved: Updated plugins url in release17.12
Using index info to reconstruct a base tree...
M build.gradle
Falling back to patching base and 3-way merge...
Auto-merging build.gradle
CONFLICT (content): Merge conflict in build.gradle
Staged 'build.gradle' using previous resolution.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 Improved: Updated plugins url in release17.12
Resolve all conflicts manually, mark them as resolved with
"git add/rm ", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase
--abort".
Jacques@LDLC MINGW64 /c/projectsASF/Git/ofbiz-framework (trunk|REBASE 1/130)
$ git am --show-current-patch
commit 4c65b791a0db7e2738dd6fd0c56cbd63f147d695
Author: Deepak Dixit
Date: Thu Dec 28 10:11:00 2017 +
Improved: Updated plugins url in release17.12
git-svn-id:
https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1819413
13f79535-47bb-0310-9956-ffa450edef68
diff --git a/build.gradle b/build.gradle
index 05b8e4fca2..8bab70
[jira] [Comment Edited] (OFBIZ-11329) setUserTimeZone should ran only once based on error
[
https://issues.apache.org/jira/browse/OFBIZ-11329?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17030832#comment-17030832
]
Jacques Le Roux edited comment on OFBIZ-11329 at 2/5/20 5:27 PM:
-
Since you are interested in:
{noformat}
Since you are interested in:
Jacques@LDLC MINGW64 /c/projectsASF/Git/ofbiz-framework (trunk)
$ git pull
First, rewinding head to replay your work on top of it...
Applying: Improved: Updated plugins url in release17.12
Using index info to reconstruct a base tree...
M build.gradle
Falling back to patching base and 3-way merge...
Auto-merging build.gradle
CONFLICT (content): Merge conflict in build.gradle
Staged 'build.gradle' using previous resolution.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 Improved: Updated plugins url in release17.12
Resolve all conflicts manually, mark them as resolved with
"git add/rm ", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase
--abort".
Jacques@LDLC MINGW64 /c/projectsASF/Git/ofbiz-framework (trunk|REBASE 1/130)
$
Jacques@LDLC MINGW64 /c/projectsASF/Git/ofbiz-framework (trunk|REBASE 1/130)
$
Jacques@LDLC MINGW64 /c/projectsASF/Git/ofbiz-framework (trunk|REBASE 1/130)
$ git rebase --skip
Applying: "Applied fix from trunk for revision: 1819805"
Using index info to reconstruct a base tree...
M themes/rainbowstone/ofbiz-component.xml
M themes/rainbowstone/template/includes/TopAppBar.ftl
Falling back to patching base and 3-way merge...
Auto-merging themes/rainbowstone/template/includes/TopAppBar.ftl
CONFLICT (add/add): Merge conflict in
themes/rainbowstone/config/rainbowstone.properties
Auto-merging themes/rainbowstone/config/rainbowstone.properties
Recorded preimage for 'themes/rainbowstone/config/rainbowstone.properties'
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0002 "Applied fix from trunk for revision: 1819805"
Resolve all conflicts manually, mark them as resolved with
"git add/rm ", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase
--abort".
Jacques@LDLC MINGW64 /c/projectsASF/Git/ofbiz-framework (trunk|REBASE 2/130)
$ git rebase --abort
Jacques@LDLC MINGW64 /c/projectsASF/Git/ofbiz-framework (trunk)
$ git pull
First, rewinding head to replay your work on top of it...
Applying: Improved: Updated plugins url in release17.12
Using index info to reconstruct a base tree...
M build.gradle
Falling back to patching base and 3-way merge...
Auto-merging build.gradle
CONFLICT (content): Merge conflict in build.gradle
Staged 'build.gradle' using previous resolution.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 Improved: Updated plugins url in release17.12
Resolve all conflicts manually, mark them as resolved with
"git add/rm ", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase
--abort".
Jacques@LDLC MINGW64 /c/projectsASF/Git/ofbiz-framework (trunk|REBASE 1/130)
$ git am --show-current-patch
commit 4c65b791a0db7e2738dd6fd0c56cbd63f147d695
Author: Deepak Dixit
Date: Thu Dec 28 10:11:00 2017 +
Improved: Updated plugins url in release17.12
git-svn-id:
https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1819413
13f79535-47bb-0310-9956-ffa450edef68
diff --git a/build.gradle b/build.gradle
index 05b8e4fca2..8bab70657d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -754,7 +754,7 @@ task pullPluginSource(group: ofbizPlugin, description:
'Download and install a p
if (project.hasProperty('pluginId')) {
task pullPluginFromSvn(type: SvnCheckout) {
-svnUrl =
"https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk/${pluginId}";
+svnUrl =
"https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12/${pluginId}";
workspaceDir = "${pluginsDir}/${pluginId}"
}
dependsOn pullPluginFromSvn
@@ -771,7 +771,7 @@ task pullAllPluginsSource(group: ofbizPlugin,
doLast { delete "${pluginsDir}" }
}
task pullPluginsFromSvn(type: SvnCheckout, dependsOn: deleteBeforePulling)
{
-svnUrl = "https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk";
+svnUrl =
"https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/branches/release17.12";
workspaceDir = "${pluginsDir}"
}
dependsOn pullPluginsFromSvn
Jacques@LDLC MINGW64 /c/projectsASF/Git/ofbiz-framework (trunk|REBASE 1/130)
$
{no
[jira] [Comment Edited] (OFBIZ-11329) setUserTimeZone should ran only once based on error
[ https://issues.apache.org/jira/browse/OFBIZ-11329?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17029919#comment-17029919 ] Jacques Le Roux edited comment on OFBIZ-11329 at 2/4/20 3:02 PM: - bq. Sorry i meant additional info which should NOT be returned from ajax request of SetTimeZoneFromBrowser. You can print out the 'success' variable in setUserTimeZone.js for more info. Well spotted James! I fixed the issue at OFBIZ-5409 which needed a bit of update. I wonder why userLogin was missed before or it's only due to SetTimeZoneFromBrowser.groovy. Anyway it's safe now. With this change the current patch does not need to be updated. If you agree we can move it to OFBIZ-11306 and continue there. was (Author: jacques.le.roux): bq. Sorry i meant additional info which should NOT be returned from ajax request of SetTimeZoneFromBrowser. You can print out the 'success' variable in setUserTimeZone.js for more info. Well spotted James! I fixed the issue at OFBIZ-5409 which needed a bit of update. I wonder why userLogin was missed before or it's only due to SetTimeZoneFromBrowser.groovy. Anyway it's safe now. With this change the current patch does not need to updated. If you agree we can move it to OFBIZ-11306 and continue there. > setUserTimeZone should ran only once based on error > --- > > Key: OFBIZ-11329 > URL: https://issues.apache.org/jira/browse/OFBIZ-11329 > Project: OFBiz > Issue Type: Sub-task > Components: framework, webpos >Affects Versions: Trunk >Reporter: Jacques Le Roux >Assignee: James Yong >Priority: Minor > Attachments: OFBIZ-11329-plugins.patch, OFBIZ-11329.patch, > OFBIZ-11329.patch > > > This will be useful when committing CSRF solution as explained in OFBIZ-11306 -- This message was sent by Atlassian Jira (v8.3.4#803005)
[jira] [Comment Edited] (OFBIZ-11329) setUserTimeZone should ran only once based on error
[ https://issues.apache.org/jira/browse/OFBIZ-11329?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17029919#comment-17029919 ] Jacques Le Roux edited comment on OFBIZ-11329 at 2/4/20 3:01 PM: - bq. Sorry i meant additional info which should NOT be returned from ajax request of SetTimeZoneFromBrowser. You can print out the 'success' variable in setUserTimeZone.js for more info. Well spotted James! I fixed the issue at OFBIZ-5409 which needed a bit of update. I wonder why userLogin was missed before or it's only due to SetTimeZoneFromBrowser.groovy. Anyway it's safe now. With this change the current patch does not need to updated. If you agree we can move it to OFBIZ-11306 and continue there. was (Author: jacques.le.roux): bq. Sorry i meant additional info which should NOT be returned from ajax request of SetTimeZoneFromBrowser. You can print out the 'success' variable in setUserTimeZone.js for more info. Well spotted James! I fixed the issue at OFBIZ-5409 which needed a bit of update. Though I wonder why userLogin was missed before or I guess has been added since for another reason and before work on CSRF. With this change the current patch does not need to updated. If you agree we can move it to OFBIZ-11306 and continue there. > setUserTimeZone should ran only once based on error > --- > > Key: OFBIZ-11329 > URL: https://issues.apache.org/jira/browse/OFBIZ-11329 > Project: OFBiz > Issue Type: Sub-task > Components: framework, webpos >Affects Versions: Trunk >Reporter: Jacques Le Roux >Assignee: James Yong >Priority: Minor > Attachments: OFBIZ-11329-plugins.patch, OFBIZ-11329.patch, > OFBIZ-11329.patch > > > This will be useful when committing CSRF solution as explained in OFBIZ-11306 -- This message was sent by Atlassian Jira (v8.3.4#803005)
