added logic to spawn the correct clone-template interface based on template version...

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

diff --git a/Open-ILS/web/reports/oils_rpt_folder_window.js b/Open-ILS/web/reports/oils_rpt_folder_window.js
index d017f9a..4939b1c 100644 (file)
--- a/Open-ILS/web/reports/oils_rpt_folder_window.js
+++ b/Open-ILS/web/reports/oils_rpt_folder_window.js
@@ -1,5 +1,5 @@
-
-
+var OILS_TEMPLATE_INTERFACE = 'xul/template_builder.xul';
+var OILS_LEGACY_TEMPLATE_INTERFACE = 'oils_rpt_builder.xhtml';
 
 
 /* generic folder window class */
@@ -97,9 +97,15 @@ oilsRptFolderWindow.prototype.drawEditActions = function() {
                var s = location.search+'';
                s = s.replace(/\&folder=\d+/g,'');
                s = s.replace(/\&ct=\d+/g,'');
-               goTo( 'oils_rpt_builder.xhtml'+s+'&folder='+obj.folderNode.folder.id());
+               goTo( OILS_LEGACY_TEMPLATE_INTERFACE+s+'&folder='+obj.folderNode.folder.id());
        }
 
+       DOM.oils_rpt_folder_window_contents_new_template_new_ui.onclick = function() {
+               var s = location.search+'';
+               s = s.replace(/\&folder=\d+/g,'');
+               s = s.replace(/\&ct=\d+/g,'');
+               goTo( OILS_TEMPLATE_INTERFACE+s+'&folder='+obj.folderNode.folder.id());
+       }
 
        if( this.folderNode.folder.owner().id() != USER.id() )
                hideMe(DOM.oils_rpt_folder_manager_tab_table);
@@ -286,7 +292,13 @@ oilsRptFolderWindow.prototype.cloneTemplate = function(template) {
                        var s = location.search+'';
                        s = s.replace(/\&folder=\d+/g,'');
                        s = s.replace(/\&ct=\d+/g,'');
-                       goTo('oils_rpt_builder.xhtml'+s+'&folder='+folderid+'&ct='+template.id());
+            version = JSON2js(template.data()).version;
+            if(version && version >= 2) {
+                _debug('entering new template building interface with template version ' + version);
+                           goTo(OILS_TEMPLATE_INTERFACE+s+'&folder='+folderid+'&ct='+template.id());
+            } else {
+                           goTo(OILS_LEGACY_TEMPLATE_INTERFACE+s+'&folder='+folderid+'&ct='+template.id());
+            }
                }
        );
 }

diff --git a/Open-ILS/web/reports/oils_rpt_folder_window.xhtml b/Open-ILS/web/reports/oils_rpt_folder_window.xhtml
index 5aab176..1f2c799 100644 (file)
--- a/Open-ILS/web/reports/oils_rpt_folder_window.xhtml
+++ b/Open-ILS/web/reports/oils_rpt_folder_window.xhtml
@@ -47,6 +47,8 @@
                                <td style='text-align:right;'>
                                        <a id='oils_rpt_folder_window_contents_new_template' 
                                                href='javascript:void(0);'><b>Create a new Template for this folder</b></a>
+                    <a id='oils_rpt_folder_window_contents_new_template_new_ui' 
+                                               href='javascript:void(0);'><b>(New temlpate editor)</b></a>
                                </td>
                        </tr>