diff options
| -rw-r--r-- | js/backoffice.js | 23 | ||||
| -rw-r--r-- | talerbackoffice/backoffice/templates/backoffice.html | 4 |
2 files changed, 15 insertions, 12 deletions
diff --git a/js/backoffice.js b/js/backoffice.js index 77361d9..13539b4 100644 --- a/js/backoffice.js +++ b/js/backoffice.js @@ -480,7 +480,8 @@ function toggle_loader(){ * whether the user selected "order" ("transfer") on the * dedicated form. */ -function track_cherry_pick(form){ +function track_cherry_pick(){ + var form = document.getElementById("choices"); var types = xpath_get("input[@type='radio']", form); for(var i in [0, 1]){ if (!types.snapshotItem(i).checked) @@ -652,8 +653,8 @@ var VALID_TT_INPUTS = 0; function validate_exchange_url(text_input) { - var submit_button = xpath_get("//button[@value='submit']", - document); + var submit_button = document.getElementById + ("submit-cherry-pick"); if (text_input.value.match (/^https:\/\/[a-zA-Z]+\.[a-zA-Z]+\//)) @@ -667,16 +668,16 @@ function validate_exchange_url(text_input) VALID_TT_INPUTS &= ~2; } - if (2 == VALID_TT_INPUTS) + if (3 == VALID_TT_INPUTS) submit_button.disabled = false; else submit_button.disabled = true; } function validate_wtid(text_input) { - var submit_button = xpath_get("//button[@value='submit']", - document); - + var submit_button = document.getElementById + ("submit-cherry-pick"); + if (text_input.value.match(/^[A-Za-z0-9]+$/)) { console.log("Good value", text_input.value); @@ -688,16 +689,16 @@ function validate_wtid(text_input) VALID_TT_INPUTS &= ~1; } - if (2 == VALID_TT_INPUTS) + if (3 == VALID_TT_INPUTS) submit_button.disabled = false; else submit_button.disabled = true; } function validate_order_id(text_input) { - var submit_button = xpath_get("//button[@value='submit']", - document); - + var submit_button = document.getElementById + ("submit-cherry-pick"); + if (text_input.value.match(/^[A-Za-z0-9]+$/)) { console.log("Good value", text_input.value); diff --git a/talerbackoffice/backoffice/templates/backoffice.html b/talerbackoffice/backoffice/templates/backoffice.html index 144a060..3e1ef91 100644 --- a/talerbackoffice/backoffice/templates/backoffice.html +++ b/talerbackoffice/backoffice/templates/backoffice.html @@ -49,8 +49,10 @@ <div> <form action=""> <input type="button" + id="submit-cherry-pick" + disabled value="submit" - onclick='track_cherry_pick(this.parentNode)'> + onclick='track_cherry_pick()'> </input> </form> </div> |