瀏覽代碼

In the 'context', pass menus by ID and no longer by index.

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@2143 a333f486-631f-4898-b8df-5754b55c2be0
dflaven 13 年之前
父節點
當前提交
b5e222d344
共有 2 個文件被更改,包括 2 次插入2 次删除
  1. 1 1
      pages/UI.php
  2. 1 1
      pages/ajax.render.php

+ 1 - 1
pages/UI.php

@@ -2159,7 +2159,7 @@ EOF
 		///////////////////////////////////////////////////////////////////////////////////////////
 
 		default: // Menu node rendering (templates)
-		$oMenuNode = ApplicationMenu::GetMenuNode(ApplicationMenu::GetActiveNodeId());
+		$oMenuNode = ApplicationMenu::GetMenuNode(ApplicationMenu::GetMenuIndexById(ApplicationMenu::GetActiveNodeId()));
 		if (is_object($oMenuNode))
 		{
 		

+ 1 - 1
pages/ajax.render.php

@@ -824,7 +824,7 @@ try
 			// navigate to the dashboard page
 			if ($aValues['open_editor'])
 			{
-				$oPage->add_ready_script("window.location.href='".addslashes(utils::GetAbsoluteUrlAppRoot().'pages/UI.php?c[menu]='.$index)."&edit=1';"); // reloads the page, doing a GET even if we arrived via a POST
+				$oPage->add_ready_script("window.location.href='".addslashes(utils::GetAbsoluteUrlAppRoot().'pages/UI.php?c[menu]='.urlencode($sMenuId))."&edit=1';"); // reloads the page, doing a GET even if we arrived via a POST
 			}
 		}
 		break;