[open-ils-commits] [GIT] Evergreen ILS branch rel_2_4 updated. 0778472f110cb1b008f24395de55c08a519c74c3

[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_4 has been updated
       via  0778472f110cb1b008f24395de55c08a519c74c3 (commit)
       via  e60941abf0d126e369a4b281996a460b93ca39aa (commit)
      from  33934d4c51d98f7763d79be009b1ed352e7092ca (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 0778472f110cb1b008f24395de55c08a519c74c3
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 fa94cfa..d5a67c0 100644
--- a/Open-ILS/examples/fm_IDL.xml
+++ b/Open-ILS/examples/fm_IDL.xml
@@ -2959,7 +2959,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 e60941abf0d126e369a4b281996a460b93ca39aa
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 27f079e..8bc3710 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