Bug 30517: Translation breaks editing parent type circulation rule fix
Test plan: 1. Install another language in the staff interface 1. in commandline: `cd misc/translator/; ./translate install xx-XX` 2. Check the box of the language in the 'language' system preference and save 3. Refresh and you should be able to choose languages 2. Create an item type with a parent 1. Go to Administration > Item types 2. Create a new item type or modify an existing one, assigning a parent type (I created a 'Children's books' type and assigned 'Books' as its parent) 3. Create a circulation rule for the parent type (I created All/Books, with 10 checkouts allowed) 4. Create a circulation rule for All/All (I created All/All with 30 checkouts allowed) 5. In English, click on "Edit" next to the parent type rule (All/Books) --> Note that the item type in the bottom row (the modifiable row) is changed to 'Books (All)' 6. Modify the number of checkouts allowed (e.g. 99) --> The All/Books rule is modified 7. Switch the interface to the other language 8. Click on "Edit" next to the parent type rule (All/Books) --> Note that the item type in the bottom row stays on 'All' 9. Modify the number of checkouts allowed (e.g. 88) --> The All/All rule is modified 10. Apply the patch, translate again and refresh the page 11. Do step 8-9 again and notice it now behaves as it should Signed-off-by: Emmanuel Bétemps <e.betemps@gmail.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
This commit is contained in:
parent
95face066f
commit
2eccae54ee
|
|
@ -1428,7 +1428,7 @@
|
|||
// select the corresponding option
|
||||
$(current_column).find("select option").each(function(){
|
||||
opt = $(this).text().toLowerCase();
|
||||
opt = opt.replace(/ \(all\)$/,""); //If option is a parent, compare without (All)
|
||||
opt = opt.replace(/ \(\w*?\)$/,""); //If option is a parent, compare without (All) or the equivalent in other languages
|
||||
itm = itm.replace(/.*->(.*)/,"$1"); //If item type is part of a group we need to clear the parent description
|
||||
opt = opt.replace(/^\s*|\s*$/g,'');
|
||||
if ( opt == itm.toLowerCase() ) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue