ACQ invoice search not persisting in staff client

[Bill Erickson]

The Invoice UI search persistence feature only works in Firefox and not the staff client. This is the result of standard browser cookies (e.g. dojo.cookie()) no longer working within the staff client. Branch to follow, which uses the xulrunner cookie service.

[Bill Erickson (berick)]

Branch pushed to working/user/berick/invoice-search-persist-lp1059670

[Bill Erickson (berick)]

Rebased and force-pushed to branch, including change to make cookies persist beyond logins.

[Kathy Lussier (klussier)]

Hi Bill,

We're getting merge conflicts on this branch. Can you rebase it?

Thanks!
Kathy

[Bill Erickson (berick)]

Hmm, I didn't have any conflicts when I rebased. I did in the past, but they should have been resolved around 10/19.. perhaps I failed to push that rebase. Anyhoo, rebased branch pushed to user/berick/invoice-search-persist-lp1059670-rebase

[Jason Stephenson (jstephenson)]

jason@jason:~/Src/Evergreen (20121219)$ quickpick working/user/berick/invoice-search-persist-lp1059670
error: could not apply 1befc4c... ACQ invoice search persistence repaired
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'
jason@jason:~/Src/Evergreen (20121219|CHERRY-PICKING)$ git status
# On branch 20121219
# Unmerged paths:
# (use "git add/rm <file>..." as appropriate to mark resolution)
#
# both modified: Open-ILS/web/js/ui/default/acq/invoice/view.js
#
no changes added to commit (use "git add" and/or "git commit -a")

Maybe its conflicting with some other acq branch that I've merged, but last time I tried against a clean master, I'm pretty sure that I got the same output.

[Jason Stephenson (jstephenson)]

Yep, same thing in a clean master:

jason@jason:~/Src/Evergreen (master)$ git checkout -b lp1059670 origin/master
Branch lp1059670 set up to track remote branch master from origin.
Switched to a new branch 'lp1059670'
jason@jason:~/Src/Evergreen (lp1059670)$ quickpick working/user/berick/invoice-search-persist-lp1059670
error: could not apply 1befc4c... ACQ invoice search persistence repaired
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'
jason@jason:~/Src/Evergreen (lp1059670|CHERRY-PICKING)$ git status
# On branch lp1059670
# Unmerged paths:
# (use "git add/rm <file>..." as appropriate to mark resolution)
#
# both modified: Open-ILS/web/js/ui/default/acq/invoice/view.js
#
no changes added to commit (use "git add" and/or "git commit -a")

[Jason Stephenson (jstephenson)]

I get the same from the -rebase branch.

jason@jason:~/Src/Evergreen (master)$ git checkout -b lp1059670 origin/master
Branch lp1059670 set up to track remote branch master from origin.
Switched to a new branch 'lp1059670'
jason@jason:~/Src/Evergreen (lp1059670)$ quickpick working/user/berick/invoice-search-persist-lp1059670-rebase
error: could not apply ce09c14... ACQ invoice search persistence repaired
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'
jason@jason:~/Src/Evergreen (lp1059670|CHERRY-PICKING)$ git status
# On branch lp1059670
# Unmerged paths:
# (use "git add/rm <file>..." as appropriate to mark resolution)
#
# both modified: Open-ILS/web/js/ui/default/acq/invoice/view.js
#
no changes added to commit (use "git add" and/or "git commit -a")

[Bill Erickson (berick)]

Pushed another rebase to user/berick/invoice-search-persist-lp1059670-rebase2

[Kathy Lussier (klussier)]

Looks great Bill! Signed off at
http://git.evergreen-ils.org/?p=working/Evergreen.git;a=shortlog;h=refs/heads/user/kmlussier/invoice-search-persist-lp1059670

[Bill Erickson (berick)]

Thanks, Kathy. Merged to master, 2_3.