https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24201 Nicolas Legrand <nicolas.legrand@bulac.fr> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |Needs Signoff -- You are receiving this mail because: You are watching all bug changes. You are the assignee for the bug.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24201 Nicolas Legrand <nicolas.legrand@bulac.fr> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #96158|0 |1 is obsolete| | --- Comment #2 from Nicolas Legrand <nicolas.legrand@bulac.fr> --- Created attachment 96164 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=96164&action=edit Bug 24201: Attach desk to intranet session When Desks are defined, a librarian can attach a desk to its session. Test plan: 1. apply 13881 and create some desks 2. you should see “NO DESK SET” in the intranet header 3. go to circulation > Set desk 4. you should see your desk name in the header, whatever the page 5. you can also set desk with the header menu -- You are receiving this mail because: You are the assignee for the bug. You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24201 Nicolas Legrand <nicolas.legrand@bulac.fr> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #96165|0 |1 is obsolete| | --- Comment #4 from Nicolas Legrand <nicolas.legrand@bulac.fr> --- Created attachment 96166 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=96166&action=edit Bug 24201: Attach desk to intranet session When Desks are defined, a librarian can attach a desk to its session. Test plan: 1. apply 13881 and create some desks 2. you should see “NO DESK SET” in the intranet header 3. go to circulation > Set desk 4. you should see your desk name in the header, whatever the page 5. you can also set desk with the header menu -- You are receiving this mail because: You are watching all bug changes. You are the assignee for the bug.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24201 Owen Leonard <oleonard@myacpl.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |BLOCKED -- You are receiving this mail because: You are watching all bug changes. You are the assignee for the bug.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24201 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |katrin.fischer@bsz-bw.de Assignee|koha-bugs@lists.koha-commun |nicolas.legrand@bulac.fr |ity.org | -- You are receiving this mail because: You are the assignee for the bug. You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24201 Nicolas Legrand <nicolas.legrand@bulac.fr> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|BLOCKED |Needs Signoff -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24201 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |oleonard@myacpl.org -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24201 --- Comment #9 from Nicolas Legrand <nicolas.legrand@bulac.fr> --- (In reply to Martin Renvoize from comment #7)

Generally, this patch appears to work as expected so I'll sign it off.

However, I have some feedback:

Thank you!

1/ I'd like to see the whole 'Desks' functionality behind a system preference so libraries not interested in using the feature don't see it.

I thought about not adding another syspref. If there is no desk defined it should not be seen apart from the links “desks” in admin home page and menu. If it's too much anyway I can surely add a syspref.

2/ If there are not desks defined for the logged-in library then a trailing `|` is left in the header menu

Oups, that should not happen, I'll fix it.

3/ Should you not be able to set a Desk from the Login screen?

Sure, but I wasn't sure how to do it, because it's necessary to change the desk menu when switching libraries, and I wasn't sure how to do it. I better liked the idea to attach IP addresses to a desk to automatically set a desk at logged-in.

4/ Jury is out regarding adding the Desk into the header bar menu title.. I like that it's immediately obvious, but for narrow screens, this could cause issues?

Ho, I'm terrible at web things. We are used to this display, but we certainly will conform to what suits best the community. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24201 --- Comment #11 from Owen Leonard <oleonard@myacpl.org> --- (In reply to Nicolas Legrand from comment #9)

I thought about not adding another syspref. If there is no desk defined it should not be seen apart from the links “desks” in admin home page and menu.

I think this mostly works. The goal of the system preferences is to prevent confusion from users about options they have which aren't relevant. In that sense this works as it should. The only problem I see right now is that the page is still accessible. It's still possible to navigate to /circ/selectdesk.pl and have no options. I would consider that a minor issue though.

...

3/ Should you not be able to set a Desk from the Login screen?

I agree, this would be a logical and useful finishing touch. My idea of how this feature is useful is with libraries where there are multiple desks in one location and it's necessary to distinguish between them. In that situation the user wouldn't be using the change library option at all.

...

but for narrow screens, this could cause issues?

I think it's logical to display the desk if it is set. We can adjust the responsive behavior of the menu as a whole if necessary. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24201 --- Comment #12 from Owen Leonard <oleonard@myacpl.org> --- Created attachment 101697 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=101697&action=edit Bug 24201: (follow-up) Show desk information at lower screen widths The staff client header menu adjusts responsively to narrower viewport widths, but for the logged-in-user menu this requires showing and hiding part of the template which duplicates information. This patch adds a copy of the current desk information to the part of the template shown at narrower widths. To test, apply the patch and view any page in the staff client. - Narrow your browser so that the viewport is less than 800px wide. - The logged-in-user menu should change from text to a single "user" icon. - Clicking the icon should display a menu which includes labeled information about the current desk. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24201 Nicolas Legrand <nicolas.legrand@bulac.fr> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #101697|0 |1 is obsolete| | --- Comment #14 from Nicolas Legrand <nicolas.legrand@bulac.fr> --- Created attachment 101705 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=101705&action=edit Bug 24201: (follow-up) Show desk information at lower screen widths The staff client header menu adjusts responsively to narrower viewport widths, but for the logged-in-user menu this requires showing and hiding part of the template which duplicates information. This patch adds a copy of the current desk information to the part of the template shown at narrower widths. To test, apply the patch and view any page in the staff client. - Narrow your browser so that the viewport is less than 800px wide. - The logged-in-user menu should change from text to a single "user" icon. - Clicking the icon should display a menu which includes labeled information about the current desk. Signed-off-by: Nicolas Legrand <nicolas.legrand@bulac.fr> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24201 --- Comment #16 from Nicolas Legrand <nicolas.legrand@bulac.fr> --- (In reply to Owen Leonard from comment #12)

Created attachment 101697 [details] [review] Bug 24201: (follow-up) Show desk information at lower screen widths

The staff client header menu adjusts responsively to narrower viewport widths, but for the logged-in-user menu this requires showing and hiding part of the template which duplicates information. This patch adds a copy of the current desk information to the part of the template shown at narrower widths.

To test, apply the patch and view any page in the staff client.

- Narrow your browser so that the viewport is less than 800px wide. - The logged-in-user menu should change from text to a single "user" icon. - Clicking the icon should display a menu which includes labeled information about the current desk.

Nice! Thanks Owen! -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24201 --- Comment #18 from Nicolas Legrand <nicolas.legrand@bulac.fr> --- Hoi Frido, (In reply to Fridolin SOMERS from comment #17)

In my opinion, we should avoid adding LoginDeskname to get_template_and_user and use the template plugin Desks by adding GetLoggedInDeskName().

I tried to mimic existing code and I'm not really confident on how it works and how it should work. If there are others thinking the way you hint to is better, I have nothing to say to oppose it and will be glad to adapt the patch! -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24201 --- Comment #20 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Created attachment 101848 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=101848&action=edit Bug 24201: (follow-up) Use GetLoggedInDeskName This patch updates the templates to use the new TT plugin instead of adding additional variables to the already crouded get_template_and_user. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24201 --- Comment #22 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Created attachment 101865 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=101865&action=edit Bug 24201: (follow-up) Rework Desks Plugin This patch removes unused plugin methods (they can be re-introduced in subsequent bugs where they are used) and merges the 'all' and 'defined' methods into a ListForBranch method that returns a list of desks associated with the logged in branch. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24201 --- Comment #24 from Nicolas Legrand <nicolas.legrand@bulac.fr> --- (In reply to Martin Renvoize from comment #23)

Hopefully, that'll help get this through the process for you Nicolas :)

sure! thanks! -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24201 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #101866|0 |1 is obsolete| | --- Comment #26 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Created attachment 101877 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=101877&action=edit Bug 24201: (follow-up) Rework Desks Plugin This patch removes unused plugin methods (they can be re-introduced in subsequent bugs where they are used) and merges the 'all' and 'defined' methods into a ListForBranch method that returns a list of desks associated with the logged in branch. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24201 Andrew Fuerste-Henry <andrew@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #101848|0 |1 is obsolete| | --- Comment #27 from Andrew Fuerste-Henry <andrew@bywatersolutions.com> --- Created attachment 101878 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=101878&action=edit Bug 24201: (follow-up) Use GetLoggedInDeskName This patch updates the templates to use the new TT plugin instead of adding additional variables to the already crouded get_template_and_user. Signed-off-by: Andrew Fuerste-Henry <andrew@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24201 Andrew Fuerste-Henry <andrew@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #101704|0 |1 is obsolete| | --- Comment #29 from Andrew Fuerste-Henry <andrew@bywatersolutions.com> --- Created attachment 101880 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=101880&action=edit Bug 24201: Attach desk to intranet session When Desks are defined, a librarian can attach a desk to its session. Test plan: 1. apply 13881 and create some desks 2. you should see “NO DESK SET” in the intranet header 3. go to circulation > Set desk 4. you should see your desk name in the header, whatever the page 5. you can also set desk with the header menu Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Andrew Fuerste-Henry <andrew@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24201 Andrew Fuerste-Henry <andrew@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #101878|0 |1 is obsolete| | --- Comment #31 from Andrew Fuerste-Henry <andrew@bywatersolutions.com> --- Created attachment 101882 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=101882&action=edit Bug 24201: (follow-up) Use GetLoggedInDeskName This patch updates the templates to use the new TT plugin instead of adding additional variables to the already crouded get_template_and_user. Signed-off-by: Andrew Fuerste-Henry <andrew@bywatersolutions.com> Signed-off-by: Andrew Fuerste-Henry <andrew@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24201 --- Comment #34 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Time is running out for this, this cycle now.. I would love to have seen this and bug 24412 make it through alongside bug 13881 this cycle so we had a full feature. There's still a small window of opportunity if we can get back to it quickly. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24201 Nicolas Legrand <nicolas.legrand@bulac.fr> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #101883|0 |1 is obsolete| | --- Comment #35 from Nicolas Legrand <nicolas.legrand@bulac.fr> --- Created attachment 103839 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=103839&action=edit Bug 24201: (follow-up) Rework Desks Plugin This patch removes unused plugin methods (they can be re-introduced in subsequent bugs where they are used) and merges the 'all' and 'defined' methods into a ListForBranch method that returns a list of desks associated with the logged in branch. Signed-off-by: Andrew Fuerste-Henry <andrew@bywatersolutions.com> Signed-off-by: Andrew Fuerste-Henry <andrew@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24201 Nicolas Legrand <nicolas.legrand@bulac.fr> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Failed QA |In Discussion -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24201 --- Comment #38 from Josef Moravec <josef.moravec@gmail.com> --- (In reply to Nicolas Legrand from comment #36)

PROBLEMS:

1. I don't know how to send desk from login page 2. What about multiple libraries with some not having desk? This patch assume that when you use desks, you use it for every libraries 3. when changing library, the bar displaying the library and the desk (up right) doesn't update the desk when arriving on the updated page of set-library.tt. It is changed only after having clicked on “continue” 4. should we keep a separate desk changing page or is it redundant?

ad 1. You should use it in C4::Auth, look to the line 1113 and below, where is 'branch' parameter used ad 2. It should take it into account and use desks for the libraries with desks and not to show any desk for libraries with no desks defined... or you can do a workaround a set desk to fake "default" desk where there is no desk. 3. I dind't run the current code yet, so I am not sure about this 4. I think this is redundant now -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24201 Jonathan Druart <jonathan.druart@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Keywords|rel_20_11_target | -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24201 --- Comment #40 from Nicolas Legrand <nicolas.legrand@bulac.fr> --- I'm still working on it, it should be ready soon :). In June. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24201 Nicolas Legrand <nicolas.legrand@bulac.fr> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #103840|0 |1 is obsolete| | --- Comment #41 from Nicolas Legrand <nicolas.legrand@bulac.fr> --- Created attachment 105795 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=105795&action=edit Bug 24201: (follow-up) add desk choice with library choice You should be able to add desk choice when you are logging in or changing library. Test plan: 1. apply patch 2. log in, you should see desks if they are defined. All are disabled. 3. when choosing a library, it should enabled all desks it has and pick one. 4. the desk should be in your session (not working yet, I don't undersand how to do it) 5. change library from intranet 6. you should have the same behaviours PROBLEMS: 1. I don't know how to send desk from login page 2. What about multiple libraries with some not having desk? This patch assume that when you use desks, you use it for every libraries 3. when changing library, the bar displaying the library and the desk (up right) doesn't update the desk when arriving on the updated page of set-library.tt. It is changed only after having clicked on “continue” 4. should we keep a separate desk changing page or is it redundant? -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24201 --- Comment #43 from Nicolas Legrand <nicolas.legrand@bulac.fr> --- Still not sorry... I'm fighting with the login page. Hope it'll be ready today... If not, next week. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24201 --- Comment #45 from Nicolas Legrand <nicolas.legrand@bulac.fr> --- mostly working now, with still a bit missing : handling a library without desk when others have some. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24201 Nicolas Legrand <nicolas.legrand@bulac.fr> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #105869|0 |1 is obsolete| | --- Comment #46 from Nicolas Legrand <nicolas.legrand@bulac.fr> --- Created attachment 105873 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=105873&action=edit Bug 24201: (follow-up) add desk choice with library choice You should be able to add desk choice when you are logging in or changing library. Test plan: 1. apply patch 2. log in, you should see desks if they are defined. All are disabled. 3. when choosing a library, it should enabled all desks it has and pick one. 4. the desk should be in your session (not working yet, I don't undersand how to do it) 5. change library from intranet 6. you should have the same behaviours PROBLEMS: 1. I don't know how to send desk from login page 2. What about multiple libraries with some not having desk? This patch assume that when you use desks, you use it for every libraries 3. when changing library, the bar displaying the library and the desk (up right) doesn't update the desk when arriving on the updated page of set-library.tt. It is changed only after having clicked on “continue” 4. should we keep a separate desk changing page or is it redundant? -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24201 Nicolas Legrand <nicolas.legrand@bulac.fr> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #105874|0 |1 is obsolete| | --- Comment #48 from Nicolas Legrand <nicolas.legrand@bulac.fr> --- Created attachment 105875 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=105875&action=edit Bug 24201: (follow-up) add desk choice with library choice You should be able to add desk choice when you are logging in or changing library. Test plan: 1. apply patch 2. have at least three libraries, one without desk, one with one and one with a few. 3. At login, when choosing a library, it should enable all desks it has. Pick one. 4. the desk id and name should be set in your session and appear in the top right, next to the library name. 5. change library and desks from intranet (at the set-library.pl page) 6. you should have the same behaviours 7. if you have a library without a desk, it should prompt you a '---' option and no desks will be attached to the session. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24201 Nicolas Legrand <nicolas.legrand@bulac.fr> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #105875|0 |1 is obsolete| | --- Comment #49 from Nicolas Legrand <nicolas.legrand@bulac.fr> --- Created attachment 106576 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=106576&action=edit Bug 24201: (follow-up) add desk choice with library choice You should be able to add desk choice when you are logging in or changing library. Test plan: 1. apply patch 2. have at least three libraries, one without desk, one with one and one with a few. 3. At login, when choosing a library, it should enable all desks it has. Pick one. 4. the desk id and name should be set in your session and appear in the top right, next to the library name. 5. change library and desks from intranet (at the set-library.pl page) 6. you should have the same behaviours 7. if you have a library without a desk, it should prompt you a '---' option and no desks will be attached to the session. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24201 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #101880|0 |1 is obsolete| | --- Comment #50 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Created attachment 107089 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=107089&action=edit Bug 24201: Attach desk to intranet session When Desks are defined, a librarian can attach a desk to its session. Test plan: 1. apply 13881 and create some desks 2. you should see “NO DESK SET” in the intranet header 3. go to circulation > Set desk 4. you should see your desk name in the header, whatever the page 5. you can also set desk with the header menu Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Andrew Fuerste-Henry <andrew@bywatersolutions.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24201 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #101882|0 |1 is obsolete| | --- Comment #52 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Created attachment 107091 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=107091&action=edit Bug 24201: (follow-up) Use GetLoggedInDeskName This patch updates the templates to use the new TT plugin instead of adding additional variables to the already crouded get_template_and_user. Signed-off-by: Andrew Fuerste-Henry <andrew@bywatersolutions.com> Signed-off-by: Andrew Fuerste-Henry <andrew@bywatersolutions.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24201 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #106576|0 |1 is obsolete| | --- Comment #54 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Created attachment 107093 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=107093&action=edit Bug 24201: (follow-up) add desk choice with library choice You should be able to add desk choice when you are logging in or changing library. Test plan: 1. apply patch 2. have at least three libraries, one without desk, one with one and one with a few. 3. At login, when choosing a library, it should enable all desks it has. Pick one. 4. the desk id and name should be set in your session and appear in the top right, next to the library name. 5. change library and desks from intranet (at the set-library.pl page) 6. you should have the same behaviours 7. if you have a library without a desk, it should prompt you a '---' option and no desks will be attached to the session. Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24201 --- Comment #56 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Created attachment 107095 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=107095&action=edit Bug 24201: (QA follow-up) Remove deprecated template file The controller associated to this template was deprecated earlier in this patchset, but the template was left behind. Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24201 --- Comment #58 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Created attachment 107097 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=107097&action=edit Bug 24201: (QA follow-up) Re-indent helpers Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24201 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- See Also| |https://bugs.koha-community | |.org/bugzilla3/show_bug.cgi | |?id=26037 -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24201 Josef Moravec <josef.moravec@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #107089|0 |1 is obsolete| | --- Comment #61 from Josef Moravec <josef.moravec@gmail.com> --- Created attachment 107667 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=107667&action=edit Bug 24201: Attach desk to intranet session When Desks are defined, a librarian can attach a desk to its session. Test plan: 1. apply 13881 and create some desks 2. you should see “NO DESK SET” in the intranet header 3. go to circulation > Set desk 4. you should see your desk name in the header, whatever the page 5. you can also set desk with the header menu Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Andrew Fuerste-Henry <andrew@bywatersolutions.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Josef Moravec <josef.moravec@gmail.com> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24201 Josef Moravec <josef.moravec@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #107091|0 |1 is obsolete| | --- Comment #63 from Josef Moravec <josef.moravec@gmail.com> --- Created attachment 107669 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=107669&action=edit Bug 24201: (follow-up) Use GetLoggedInDeskName This patch updates the templates to use the new TT plugin instead of adding additional variables to the already crouded get_template_and_user. Signed-off-by: Andrew Fuerste-Henry <andrew@bywatersolutions.com> Signed-off-by: Andrew Fuerste-Henry <andrew@bywatersolutions.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Josef Moravec <josef.moravec@gmail.com> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24201 Josef Moravec <josef.moravec@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #107093|0 |1 is obsolete| | --- Comment #65 from Josef Moravec <josef.moravec@gmail.com> --- Created attachment 107671 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=107671&action=edit Bug 24201: (follow-up) add desk choice with library choice You should be able to add desk choice when you are logging in or changing library. Test plan: 1. apply patch 2. have at least three libraries, one without desk, one with one and one with a few. 3. At login, when choosing a library, it should enable all desks it has. Pick one. 4. the desk id and name should be set in your session and appear in the top right, next to the library name. 5. change library and desks from intranet (at the set-library.pl page) 6. you should have the same behaviours 7. if you have a library without a desk, it should prompt you a '---' option and no desks will be attached to the session. Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Josef Moravec <josef.moravec@gmail.com> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24201 Josef Moravec <josef.moravec@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #107095|0 |1 is obsolete| | --- Comment #67 from Josef Moravec <josef.moravec@gmail.com> --- Created attachment 107673 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=107673&action=edit Bug 24201: (QA follow-up) Remove deprecated template file The controller associated to this template was deprecated earlier in this patchset, but the template was left behind. Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Josef Moravec <josef.moravec@gmail.com> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24201 Josef Moravec <josef.moravec@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #107097|0 |1 is obsolete| | --- Comment #69 from Josef Moravec <josef.moravec@gmail.com> --- Created attachment 107675 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=107675&action=edit Bug 24201: (QA follow-up) Re-indent helpers Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Josef Moravec <josef.moravec@gmail.com> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24201 --- Comment #71 from Josef Moravec <josef.moravec@gmail.com> --- Created attachment 107677 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=107677&action=edit Bug 24201: (QA follow-up) Remove unneeded use Signed-off-by: Josef Moravec <josef.moravec@gmail.com> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24201 --- Comment #73 from Josef Moravec <josef.moravec@gmail.com> --- Created attachment 107679 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=107679&action=edit Bug 24201: (QA follow-up) Remove setdesk variable and add desk selection script only on pages in need Signed-off-by: Josef Moravec <josef.moravec@gmail.com> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24201 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #107677|0 |1 is obsolete| | --- Comment #77 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Created attachment 107729 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=107729&action=edit Bug 24201: (QA follow-up) Remove unneeded use Signed-off-by: Josef Moravec <josef.moravec@gmail.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24201 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #107679|0 |1 is obsolete| | --- Comment #79 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Created attachment 107731 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=107731&action=edit Bug 24201: (QA follow-up) Remove setdesk variable and add desk selection script only on pages in need Signed-off-by: Josef Moravec <josef.moravec@gmail.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24201 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Passed QA --- Comment #81 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Thanks for the additional followups and QA run Josef.. I've verified the followups all make sense so setting to PQA as it's had two QA team eyes on it now :) Great work. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24201 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #107672|0 |1 is obsolete| | --- Comment #83 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Created attachment 107750 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=107750&action=edit Bug 24201: (QA follow-up) Only display desks picker if enabled I missed a case on the authentication page with the prior patch of the same name. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24201 --- Comment #85 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Created attachment 107752 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=107752&action=edit Bug 24201: (QA follow-up) Correct call to set_userenv One call to set_userenv had been implimented incorrectly with the parameters out of order. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24201 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |24786 Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24786 [Bug 24786] Allow setting a cash register for a login session -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24201 Josef Moravec <josef.moravec@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #107750|0 |1 is obsolete| | --- Comment #87 from Josef Moravec <josef.moravec@gmail.com> --- Created attachment 107815 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=107815&action=edit Bug 24201: (QA follow-up) Only display desks picker if enabled I missed a case on the authentication page with the prior patch of the same name. Signed-off-by: Josef Moravec <josef.moravec@gmail.com> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24201 Josef Moravec <josef.moravec@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #107752|0 |1 is obsolete| | --- Comment #89 from Josef Moravec <josef.moravec@gmail.com> --- Created attachment 107817 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=107817&action=edit Bug 24201: (QA follow-up) Correct call to set_userenv One call to set_userenv had been implimented incorrectly with the parameters out of order. Signed-off-by: Josef Moravec <josef.moravec@gmail.com> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24201 Josef Moravec <josef.moravec@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Passed QA --- Comment #91 from Josef Moravec <josef.moravec@gmail.com> --- (In reply to Martin Renvoize from comment #86)

Three more tiny QA followups.. would appreciate your eyes on them Josef for the final switch to PQA :)

And one more from me again (capitalization fix) I consider it PQA now, thanks! -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24201 --- Comment #93 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- (In reply to Jonathan Druart from comment #92)

Can I have an updated test plan please?

I followed the one from comment 1: 1. apply 13881 and create some desks 2. you should see “NO DESK SET” in the intranet header 3. go to circulation > Set desk => I don't see that 4. you should see your desk name in the header, whatever the page 5. you can also set desk with the header menu => I did not see it until I figured out it was in "set library"

2 first questions then, - Why "NO DESK SET" vs "No desk set" vs nothing display if no desk set? - Why not "set library and desk"?

This will only appear upon first applying the patch, or if you enable 'UseDesks' during a session (If it was already enabled you will have had to have selected a desk at login and you cannot select 'no desk' at any point now I believe)

'Set desk' was merged into the 'Set library' page.

Updated test plan: 1. apply 13881 and create some desks 2. you should see “NO DESK SET” in the intranet header 3. go to circulation > Set library 4. you should see your desk name in the header, whatever the page 5. you can also set desk with the header menu 'NO DESK SET'.. I think Nicholas felt it was very important to highlight that no desk is set so capitalised it.. I think in reality it will appear so infrequently that the capitalisation isn't a bad thing. As for 'Set library and desk'.. I'm of two minds here, as mentioned on irc this morning. With bug 24786 we also add the ability to set 'Cash register' from this page.. we could end up with 'Set library, desk and cash register' which feels a little verbose.. we could change it here for simply be 'Set library [and desk]' when desks are enabled and then perhaps update it on bug 24786 to read 'Session settings' or something like that when both preferences are enabled? -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24201 --- Comment #95 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Created attachment 107952 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=107952&action=edit Bug 24201: (QA follow-up) IndependentBranches This patch updates the IndependentBranches template display logic such that the 'Select desk' and 'Select library and desk' options appear correctly when IndependentBranches is enabled. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24201 --- Comment #97 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Created attachment 107968 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=107968&action=edit Bug 24201: (QA follow-up) Replace library select Removing the library select entirely results in a JS failure for desk selection when independant branches is enabled and the user does not have permission to select a library. This patch adds a hidden select element so we can still grab the current branch from the selection. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24201 --- Comment #98 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- Pushed to master for 20.11, thanks to everybody involved! -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24201 --- Comment #100 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- Created attachment 107981 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=107981&action=edit Bug 24201: fix failing tests -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24201 Lucas Gass <lucas@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |lucas@bywatersolutions.com --- Comment #102 from Lucas Gass <lucas@bywatersolutions.com> --- enhancement will not be backported to 20.05.x series -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24201 Nicolas Legrand <nicolas.legrand@bulac.fr> changed: What |Removed |Added ---------------------------------------------------------------------------- Text to go in the| |When `UseCirculationDesks` release notes| |is enabled and desks are | |defined and attached to a | |library, this feature makes | |it possible to chose your | |current desk on login or | |when changing library from | |the intranet. The desk is | |then attached to the | |session. | | | |Future | |developments are planned to | |allow associating hold | |pickup locations with desks | |and other features. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24201 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks|14654 | Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14654 [Bug 14654] Add desk filter in Holds awaiting pickup list -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24201 Jonathan Druart <jonathan.druart+koha@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |30123 Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30123 [Bug 30123] On set library page, desk always defaults to last in list instead of desk user is signed in at -- You are receiving this mail because: You are watching all bug changes.