浏览代码

Fixed the broken n:n links management UI (Add button remained disabled)

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@2097 a333f486-631f-4898-b8df-5754b55c2be0
dflaven 13 年之前
父节点
当前提交
30246af350
共有 2 个文件被更改,包括 15 次插入12 次删除
  1. 14 11
      application/cmdbabstract.class.inc.php
  2. 1 1
      application/uilinkswizard.class.inc.php

+ 14 - 11
application/cmdbabstract.class.inc.php

@@ -970,18 +970,20 @@ oTable.tablesorter( { $sHeaders widgets: ['myZebra', 'truncatedList'] $sSortList
 EOF
 		);
 		
-		if (isset($aExtraParams['cssCount']))
+		if ($iNbPages == 1)
 		{
-			$sCssCount = $aExtraParams['cssCount'];
-			if ($bSingleSelectMode)
+			if (isset($aExtraParams['cssCount']))
 			{
-				$sSelectSelector = ":radio[name^=selectObj]";
-			}
-			else
-			{
-				$sSelectSelector = ":checkbox[name^=selectObj]";
-			}
-			$oPage->add_ready_script(
+				$sCssCount = $aExtraParams['cssCount'];
+				if ($bSingleSelectMode)
+				{
+					$sSelectSelector = ":radio[name^=selectObj]";
+				}
+				else
+				{
+					$sSelectSelector = ":checkbox[name^=selectObj]";
+				}
+				$oPage->add_ready_script(
 <<<EOF
 	$('#{$iListId} table.listResults $sSelectSelector').change(function() {
 		var c = $('{$sCssCount}');							
@@ -991,7 +993,8 @@ EOF
 		c.trigger('change');	
 	});
 EOF
-			);
+				);
+			}
 		}
 
 		return $sHtml;

+ 1 - 1
application/uilinkswizard.class.inc.php

@@ -104,7 +104,7 @@ class UILinksWizard
 			var nbChecked = $('.selection:checked').length;
 			if (nbChecked > 0)
 			{
-				$('#btnRemove').attr('disabled','');
+				$('#btnRemove').removeAttr('disabled');
 			}
 			else
 			{