[open-ils-commits] [GIT] Evergreen ILS branch master updated. ad733ecdb31fbd4752c9f41e54cddfc4d4596ade

[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, master has been updated
       via  ad733ecdb31fbd4752c9f41e54cddfc4d4596ade (commit)
      from  afbda31bf6ffb065f3c1b1c85c0caddc0fcbc583 (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 ad733ecdb31fbd4752c9f41e54cddfc4d4596ade
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Tue Nov 15 16:35:30 2016 -0500

    Revert "webstaff: add template for patron merge dialog"
    
    Whoops, sorry.
    
    This reverts commit afbda31bf6ffb065f3c1b1c85c0caddc0fcbc583.

diff --git a/Open-ILS/src/templates/staff/circ/share/t_merge_patrons.tt2 b/Open-ILS/src/templates/staff/circ/share/t_merge_patrons.tt2
deleted file mode 100644
index f498f60..0000000
--- a/Open-ILS/src/templates/staff/circ/share/t_merge_patrons.tt2
+++ /dev/null
@@ -1,32 +0,0 @@
-<div>
-  <div class="modal-header">
-    <button type="button" class="close"
-      ng-click="cancel()" aria-hidden="true">×</button>
-    <h4 class="modal-title">[% l('Merge patrons?') %]</h4>
-  </div>
-  <div class="modal-body">
-      <div class="row">
-          
-          <div class="col-xs-6">
-            <label>
-              <input type="radio" name="lead_record" ng-model="lead_id" ng-value="patron_ids[0]"/></input>
-              [% l('Use as lead') %]
-            </label>
-            <eg-patron-summary patron-id="patron_ids[0]"></eg-patron-summary>
-          </div>
-          <div class="col-xs-6">
-            <label>
-              <input type="radio" name="lead_record" ng-model="lead_id" ng-value="patron_ids[1]"/></input>
-              [% l('Use as lead') %]
-            </label>
-            <eg-patron-summary patron-id="patron_ids[1]"></eg-patron-summary>
-          </div>
-      </div>
-  </div>
-  <div class="modal-footer">
-    <input type="submit" ng-click="ok()"
-        ng-class="{disabled : !lead_id }"
-        class="btn btn-primary" value="[% l('Merge') %]"/>
-    <button class="btn btn-warning" ng-click="cancel()">[% l('Cancel') %]</button>
-  </div>
-</div>

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

Summary of changes:
 .../templates/staff/circ/share/t_merge_patrons.tt2 |   32 --------------------
 1 files changed, 0 insertions(+), 32 deletions(-)
 delete mode 100644 Open-ILS/src/templates/staff/circ/share/t_merge_patrons.tt2


hooks/post-receive
-- 
Evergreen ILS