From 7c4b31e2e156b94861969586f57d7a678dc0d97d Mon Sep 17 00:00:00 2001 From: phasefx Date: Thu, 16 Oct 2008 16:54:06 +0000 Subject: [PATCH] Patch to better handle migration of settings on the filesystem. Thanks Jeff! === Greetings- I found that when using open-ils.write_in_user_chrome_directory set to true, the staff client would store local settings in the application chrome directory, but the next time the client was run, it would inappropriately attempt to migrate the settings from the application chrome directory to the user chrome directory. If you allowed the settings to be migrated, on the third run, things would get even more confused. The attached patch causes the migration check in main_init() to respect the open-ils.write_in_user_chrome_directory preference, and not migrate the local settings out of the application chrome directory if the preference dictates that they should remain there. DCO inline below, patch is attached. Feedback welcome! -jeff Developer's Certificate of Origin 1.1 By making a contribution to this project, I certify that: (a) The contribution was created in whole or in part by me and I have the right to submit it under the open source license indicated in the file; or (b) The contribution is based upon previous work that, to the best of my knowledge, is covered under an appropriate open source license and I have the right under that license to submit that work with modifications, whether created in whole or in part by me, under the same open source license (unless I am permitted to submit under a different license), as indicated in the file; or (c) The contribution was provided directly to me by some other person who certified (a), (b) or (c) and I have not modified it. (d) I understand and agree that this project and the contribution are public and that a record of the contribution (including all personal information I submit with it, including my sign-off) is maintained indefinitely and may be redistributed consistent with this project or the open source license(s) involved. Signed-off-by: Jeff Godin -- Jeff Godin Traverse Area District Library git-svn-id: svn://svn.open-ils.org/ILS/trunk@10846 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/xul/staff_client/chrome/content/main/main.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Open-ILS/xul/staff_client/chrome/content/main/main.js b/Open-ILS/xul/staff_client/chrome/content/main/main.js index ab397f9715..aa3c635f2f 100644 --- a/Open-ILS/xul/staff_client/chrome/content/main/main.js +++ b/Open-ILS/xul/staff_client/chrome/content/main/main.js @@ -268,7 +268,10 @@ function main_init() { false ); - if ( found_ws_info_in_Achrome() ) { + var pref = Components.classes["@mozilla.org/preferences-service;1"] + .getService(Components.interfaces.nsIPrefBranch); + + if ( found_ws_info_in_Achrome() && pref.getBoolPref("open-ils.write_in_user_chrome_directory") ) { //var hbox = x.parentNode; var b = document.createElement('button'); //b.setAttribute('label','Migrate legacy settings'); hbox.appendChild(b); //b.addEventListener( -- 2.11.0