[open-ils-commits] [GIT] Evergreen ILS branch rel_3_0 updated. 70add5a0977f2b5b24f1f19a53ba79c7494a8207

[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_3_0 has been updated
       via  70add5a0977f2b5b24f1f19a53ba79c7494a8207 (commit)
      from  7bc308ffa2b6a1599b1f91ef55f4adf6d4ba44e4 (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 70add5a0977f2b5b24f1f19a53ba79c7494a8207
Author: Mike Rylander <mrylander at gmail.com>
Date:   Mon Nov 27 13:06:56 2017 -0500

    LP#1734737: Display originating template UI
    
    Until the (planned for 3.1) ability to clone XUL-created reports in the web
    staff client is completed, it would be useful to at least display to the user
    the origin UI in which a template was created. This will allow staff to, for
    the immediate term, decide which UI they should use to deal with a particular
    template, re cloning etc.
    
    Signed-off-by: Mike Rylander <mrylander at gmail.com>
    Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>

diff --git a/Open-ILS/web/opac/common/js/fm_table_conf.js b/Open-ILS/web/opac/common/js/fm_table_conf.js
index 948fb65..8879efe 100644
--- a/Open-ILS/web/opac/common/js/fm_table_conf.js
+++ b/Open-ILS/web/opac/common/js/fm_table_conf.js
@@ -125,6 +125,7 @@ var FM_TABLE_DISPLAY = {
 			'name',
 			'description',
             'docs',
+            'ui',
 			'create_time',
 			'owner',
 		],
@@ -143,6 +144,13 @@ var FM_TABLE_DISPLAY = {
                     return elem('a', args, 'External Documentation')
                 }
                 return text('');
+            },
+            ui : function (t) {
+                var d = JSON2js(t.data());
+                if (d.version >= 5) {
+                    return text('WebStaff');
+                }
+                return text('XUL');
             }
         },
 		sortdata : [ 'name', 1 ]

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

Summary of changes:
 Open-ILS/web/opac/common/js/fm_table_conf.js |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
Evergreen ILS