Changeset 756

Timestamp:

01/14/10 13:29:02 (2 years ago)

Author:

brieb

Message:

• fixes #399 widgets with no role were not able to be added for non-administrators
• fixes #400 pathing of manual update lookup

Location:

trunk/phpbms/modules/base

Files:

• include/snapshot_include.php (modified) (1 diff)
• javascript/adminsettings.js (modified) (1 diff)

trunk/phpbms/modules/base/include/snapshot_include.php

@@ -275 +275 @@
 
         if(!$_SESSION["userinfo"]["admin"])
-            $rolewhere = "AND `roleid` IN ('".implode($_SESSION["userinfo"]["roles"])."')";
+            $rolewhere = "AND (`roleid` IN ('".implode($_SESSION["userinfo"]["roles"])."') OR `roleid` ='' OR `roleid` IS NULL)";
         else
             $rolewhere = "";

trunk/phpbms/modules/base/javascript/adminsettings.js

@@ -303 +303 @@
     checkForUpdate : function(manual){
 
-        var url;
+        var url = APP_PATH;
+
         if(manual)
-            url = "adminsettings_ajax.php?m=1";
+            url += "adminsettings_ajax.php?m=1";
         else
-            url = "adminsettings_ajax.php?m=0";
+            url += "adminsettings_ajax.php?m=0";
 
         loadXMLDoc(url, null, false);