removed the ability to send reports to other user's shared folders

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

diff --git a/Open-ILS/web/reports/oils_rpt_folder_window.xhtml b/Open-ILS/web/reports/oils_rpt_folder_window.xhtml
index fbabb1c..1f44dac 100644 (file)
--- a/Open-ILS/web/reports/oils_rpt_folder_window.xhtml
+++ b/Open-ILS/web/reports/oils_rpt_folder_window.xhtml
@@ -9,10 +9,10 @@
                                        <span>
                                                <select id='oils_rpt_folder_contents_action_selector' style='width: auto;'>
                                                        <option type='template' value='create_report'>Create a new report from selected template</option>
-                                                       <option type='template' value='clone_template'>Clone selected template</option>
+                                                       <option type='template' value='clone_template' disabled='disabled'>Clone selected template</option>
                                                        <option type='template' value='delete_template'>Delete selected template(s)</option>
-                                                       <option type='report' value='change_params'>Clone report</option>
-                                                       <option type='report' value='schedule_report'>Schedule report</option>
+                                                       <option type='report' value='change_params' disabled='disabled'>Clone report</option>
+                                                       <option type='report' value='schedule_report' disabled='disabled'>Schedule report</option>
                                                        <option type='report' value='delete_report'>Delete selected report(s)</option>
                                                        <option type='output' value='show_output'>View report output</option>
                                                        <option type='output' value='delete_output'>Delete selected output(s)</option>

diff --git a/Open-ILS/web/reports/oils_rpt_folders.js b/Open-ILS/web/reports/oils_rpt_folders.js
index 37ee85e..998e5bb 100644 (file)
--- a/Open-ILS/web/reports/oils_rpt_folders.js
+++ b/Open-ILS/web/reports/oils_rpt_folders.js
@@ -306,7 +306,7 @@ oilsRptFolderManager.prototype.findNode = function(type, id) {
        if defined, "action" must be a function pointer that takes the
        folder node as the param */
 var __someid;
-function oilsRptBuildFolder(type, node, treeVar, rootName, action) {
+function oilsRptBuildFolder(type, node, treeVar, rootName, action, shared) {
        removeChildren(node);
        var tree = new SlimTree(node, treeVar);
        this.treeId = oilsNextId();
@@ -321,6 +321,8 @@ function oilsRptBuildFolder(type, node, treeVar, rootName, action) {
                var pid = this.treeId;
                var f = cache[c].folder;
 
+               if( !shared && f.owner() != USER.id() ) continue;
+
                if(f.parent()) {
                        /* find the parent's tree id so we can latch on to it */
                        var pnode = cache[f.parent()];