Parcourir la source

Fix: properly manage validation field for vertical radio buttons.

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@1557 a333f486-631f-4898-b8df-5754b55c2be0
dflaven il y a 13 ans
Parent
commit
4117915866

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

@@ -353,7 +353,7 @@ class ObjectDetailsTemplate extends DisplayTemplate
 				{
 						$aParams['this->field('.$sAttCode.')'] = $this->m_oObj->GetAsHTML($sAttCode);
 					}
-					$aParams['this->'.$sAttCode] = "<table><tr><td class=\"label\">".$aParams['this->label('.$sAttCode.')'].":</td><td>".$aParams['this->field('.$sAttCode.')']."</td><td>".$aParams['this->comments('.$sAttCode.')']."</td></tr></table>";					
+					$aParams['this->'.$sAttCode] = "<table class=\"field\"><tr><td class=\"label\">".$aParams['this->label('.$sAttCode.')'].":</td><td>".$aParams['this->field('.$sAttCode.')']."</td><td>".$aParams['this->comments('.$sAttCode.')']."</td></tr></table>";					
 				}
 			}
 		}

+ 6 - 2
application/ui.extkeywidget.class.inc.php

@@ -125,6 +125,7 @@ class UIExtKeyWidget
 				case 'radio':
 				case 'radio_horizontal':
 				case 'radio_vertical':
+				$sValidationField = "<span id=\"v_{$this->iId}\"></span>";
 				$sHTMLValue = '';
 				$bVertical = ($sDisplayStyle != 'radio_horizontal');
 				$bExtensions = false;
@@ -134,7 +135,7 @@ class UIExtKeyWidget
 				{
 					$aAllowedValues[$oObj->GetKey()] = $oObj->Get('friendlyname');
 				}				
-				$sHTMLValue = $oPage->GetRadioButtons($aAllowedValues, $value, $this->iId, "{$sAttrFieldPrefix}{$sFieldName}", $bMandatory, $bVertical, '' /* TODO: manage validation field */);
+				$sHTMLValue = $oPage->GetRadioButtons($aAllowedValues, $value, $this->iId, "{$sAttrFieldPrefix}{$sFieldName}", $bMandatory, $bVertical, $sValidationField);
 				$aEventsList[] ='change';
 				break;
 
@@ -246,7 +247,10 @@ EOF
 EOF
 );
 		}
-		$sHTMLValue .= "<span id=\"v_{$this->iId}\"></span>";
+		if ($sDisplayStyle == 'select')
+		{
+			$sHTMLValue .= "<span id=\"v_{$this->iId}\"></span>";
+		}
 		$sHTMLValue .= "</span>"; // end of no wrap
 		return $sHTMLValue;
 	}