moved xpath down to last option vendor data dropdown. anchored the xpath regex

git-svn-id: svn://svn.open-ils.org/ILS/branches/acq-experiment@9621 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/web/oilsweb/oilsweb/public/oils/media/ui_js/oils/default/acq/financial/view_provider.js b/Open-ILS/web/oilsweb/oilsweb/public/oils/media/ui_js/oils/default/acq/financial/view_provider.js
index 40934c7..df1a17b 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/public/oils/media/ui_js/oils/default/acq/financial/view_provider.js
+++ b/Open-ILS/web/oilsweb/oilsweb/public/oils/media/ui_js/oils/default/acq/financial/view_provider.js
@@ -9,7 +9,7 @@ dojo.require('openils.Event');
 dojo.require('openils.User');
 
 var provider = null;
-var marcRegex = /\/\/\*\[@tag="(\d+)"]\/\*\[@code="(\w)"]/;
+var marcRegex = /^\/\/\*\[@tag="(\d+)"]\/\*\[@code="(\w)"]$/;
 
 function getOrgInfo(rowIndex) {
     data = providerGrid.model.getRow(rowIndex);

diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_provider.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_provider.html
index 6a711e7..bd667b2 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_provider.html
+++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_provider.html
@@ -67,10 +67,6 @@
                                 <td><input id='oils-acq-provider-or-desc' dojoType="dijit.form.TextBox" name="description"> </input></td>
                             </tr>
                             <tr>
-                                <td><label for="amount">${_('XPath:')} </label></td>
-                                <td><input dojoType="dijit.form.TextBox" name="xpath"></input></td>
-                            </tr>
-                            <tr>
                                 <td><label for="amount">${_('Tag:')} </label></td>
                                 <td><input dojoType="dijit.form.TextBox" name="tag"></input></td>
                             </tr>
@@ -79,6 +75,10 @@
                                 <td><input dojoType="dijit.form.TextBox" name="subfield"></input></td>
                             </tr>
                             <tr>
+                                <td><label for="amount">${_('XPath:')} </label></td>
+                                <td><input dojoType="dijit.form.TextBox" name="xpath"></input></td>
+                            </tr>
+                            <tr>
                                 <td colspan='2' align='center'>
                                     <button dojoType=dijit.form.Button type="submit">${_('Apply')}</button>
                                 </td>
@@ -102,9 +102,9 @@
                         {name: '${_("ID")}', field: 'id'},
                         {name: '${_("Code")}', field:'code'},
                         {name: '${_("Description")}', field: "description", width:'auto'}, 
-                        {name: '${_("XPath")}', field:'xpath', width:'auto'},
                         {name: '${_("Tag")}', get:getTag},
-                        {name: '${_("Subfield")}', get:getSubfield}
+                        {name: '${_("Subfield")}', get:getSubfield},
+                        {name: '${_("XPath")}', field:'xpath', width:'auto'}
                     ]]
                 }];
             </script>