[open-ils-commits] [GIT] Evergreen ILS branch rel_2_3 updated. fa4f670254b912cda0383a58a5c6a7c09c1177ca

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, rel_2_3 has been updated
       via  fa4f670254b912cda0383a58a5c6a7c09c1177ca (commit)
       via  b0923e11f5180efee27ab39528f946cfe05b9905 (commit)
      from  8b8f2690a71d5cbba67f31b6ee67229db0393378 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit fa4f670254b912cda0383a58a5c6a7c09c1177ca
Author: Chris Sharp <csharp at georgialibraries.org>
Date:   Mon Aug 19 14:29:23 2013 -0400

    The ILS User reports source branches to an All Hold Requests linked source
    that was marked class="circ" instead of class="ahr".  This corrects that problem.
    
    Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
    Signed-off-by: Ben Shum <bshum at biblio.org>

diff --git a/Open-ILS/examples/fm_IDL.xml b/Open-ILS/examples/fm_IDL.xml
index 8f1447b..baf10f3 100644
--- a/Open-ILS/examples/fm_IDL.xml
+++ b/Open-ILS/examples/fm_IDL.xml
@@ -2846,7 +2846,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 			<link field="groups" reltype="has_many" key="usr" map="grp" class="pugm"/>
 			<link field="usrgroup" reltype="has_many" key="usrgroup" map="" class="au"/>
 			<link field="checkouts" reltype="has_many" key="usr" map="" class="circ"/>
-			<link field="hold_requests" reltype="has_many" key="usr" map="" class="circ"/>
+			<link field="hold_requests" reltype="has_many" key="usr" map="" class="ahr"/>
 			<link field="permissions" reltype="has_many" key="usr" map="perm" class="pupm"/>
 			<link field="settings" reltype="has_many" key="usr" map="" class="aus"/>
 			<link field="billable_transactions" reltype="has_many" key="usr" map="" class="mbt"/>

commit b0923e11f5180efee27ab39528f946cfe05b9905
Author: Ben Shum <bshum at biblio.org>
Date:   Fri Sep 6 22:49:30 2013 -0400

    Fix some bad break syntax
    
    Change </br> to a more appropriate <br/>
    
    Signed-off-by: Ben Shum <bshum at biblio.org>

diff --git a/Open-ILS/src/templates/opac/password_reset.tt2 b/Open-ILS/src/templates/opac/password_reset.tt2
index bbf9418..156f6dd 100644
--- a/Open-ILS/src/templates/opac/password_reset.tt2
+++ b/Open-ILS/src/templates/opac/password_reset.tt2
@@ -60,7 +60,7 @@
                 </tr>
             </table>
             [% IF ctx.get_org_setting(ctx.physical_loc || ctx.aou_tree.id, 'circ.password_reset_request_requires_matching_email') %]
-            <label for="email">[% l('Email address associated with the account:') %] </label><input type="text" name="email"/></br>
+            <label for="email">[% l('Email address associated with the account:') %] </label><input type="text" name="email"/><br/>
             [% END %]
             <button name="submit" id="submitButton" class="opac-button" type="submit">[% l('Submit') %]</button>
         </form>

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/examples/fm_IDL.xml                   |    2 +-
 Open-ILS/src/templates/opac/password_reset.tt2 |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Evergreen ILS