You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pluto-scm@portals.apache.org by ms...@apache.org on 2015/01/28 15:42:41 UTC

[06/14] portals-pluto git commit: Fixed bug in Portlet Hub public render parameter handling; cleaned up portlet hub impl

Fixed bug in Portlet Hub public render parameter handling; cleaned up portlet hub impl


Project: http://git-wip-us.apache.org/repos/asf/portals-pluto/repo
Commit: http://git-wip-us.apache.org/repos/asf/portals-pluto/commit/65df9c67
Tree: http://git-wip-us.apache.org/repos/asf/portals-pluto/tree/65df9c67
Diff: http://git-wip-us.apache.org/repos/asf/portals-pluto/diff/65df9c67

Branch: refs/heads/V3Prototype
Commit: 65df9c6703e4bfe79800f2f0d5748bd0cd81a40b
Parents: a8bed7f
Author: Scott Nicklous <ms...@apache.org>
Authored: Wed Jan 28 10:04:48 2015 +0100
Committer: Scott Nicklous <ms...@apache.org>
Committed: Wed Jan 28 10:04:48 2015 +0100

----------------------------------------------------------------------
 pluto-portal/src/main/webapp/portletHubImpl.js | 46 ++-------------------
 1 file changed, 3 insertions(+), 43 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/65df9c67/pluto-portal/src/main/webapp/portletHubImpl.js
----------------------------------------------------------------------
diff --git a/pluto-portal/src/main/webapp/portletHubImpl.js b/pluto-portal/src/main/webapp/portletHubImpl.js
index ff27149..8269455 100644
--- a/pluto-portal/src/main/webapp/portletHubImpl.js
+++ b/pluto-portal/src/main/webapp/portletHubImpl.js
@@ -525,28 +525,14 @@ var portlet = portlet || {};
                   if (pageState.prpMap[group].hasOwnProperty(tpid)) {
                      name = pageState.prpMap[group][tpid];
                      // only need to add parameter once, since it is shared
-                     if (!prpstrings.hasOwnProperty(name)) {
-                        prpstrings[name] = genParmString(tpid, name, PUBLIC_RENDER_PARAM, group);
-                        str += prpstrings[name];
+                     if (!prpstrings.hasOwnProperty(group)) {
+                        prpstrings[group] = genParmString(tpid, name, PUBLIC_RENDER_PARAM, group);
+                        str += prpstrings[group];
                      }
                   }
                }
             }
          }
-         
-//          for (tpid in pageState.portlets) {
-//             if (pageState.portlets.hasOwnProperty(tpid)) {               
-//                names = pageState.portlets[tpid].pubParms;
-//                for (ii=0; ii < names.length; ii++) {
-//                   name = names[ii];
-//                   // only need to add parameter once, since it is shared
-//                   if (!prpstrings.hasOwnProperty(name)) {
-//                      prpstrings[name] = genParmString(tpid, name, PUBLIC_RENDER_PARAM);
-//                      str += prpstrings[name];
-//                   }
-//                }
-//             }
-//          }
          url += str;
 
       }
@@ -622,32 +608,6 @@ var portlet = portlet || {};
                   
                }
             }
-            
-            // process each portlet ID
-//             pids = getIds();
-//             for (ii = 0; ii < pids.length; ii++) {
-//                tpid = pids[ii];
-//                
-//                // don't update for initiating portlet. that's done after the loop
-//                if (tpid !== pid) {
-//             
-//                   oldVal = getParmVal(tpid, prp);
-//                   prpNames = getPRPNames(tpid);
-//                   
-//                   // check for public parameter and if the value has changed
-//                   if ((prpNames.indexOf(prp) >= 0) && 
-//                       (_isParmEqual(oldVal, newVal) === false)) {
-//                   
-//                      if (newVal === undefined) {
-//                         delete pageState.portlets[tpid].state.parameters[prp];
-//                      } else {
-//                         pageState.portlets[tpid].state.parameters[prp] = newVal.slice(0);
-//                      }
-//                      upids.push(tpid);
-//                      
-//                   }
-//                }
-//             }
          }
       }