Merge pull request #2443 from djagya/2436-related-model-attributes

framework/CHANGELOG.md

@@ -111,6 +111,7 @@ Yii Framework 2 Change Log
 - Enh #2364: Take into account current error reporting level in error handler (gureedo)
 - Enh #2387: Added support for fetching data from database in batches (nineinchnick, qiangxue)
 - Enh #2417: Added possibility to set `dataType` for `$.ajax` call in yii.activeForm.js (Borales)
+- Enh #2436: Label of the attribute, which looks like `relatedModel.attribute`, will be received from the related model if it available (djagya)
 - Enh: Added support for using arrays as option values for console commands (qiangxue)
 - Enh: Added `favicon.ico` and `robots.txt` to default application templates (samdark)
 - Enh: Added `Widget::autoIdPrefix` to support prefixing automatically generated widget IDs (qiangxue)

framework/db/BaseActiveRecord.php

@@ -1286,4 +1286,41 @@ abstract class BaseActiveRecord extends Model implements ActiveRecordInterface
 			return false;
 		}
 	}
+
+	/**
+	 * Returns the text label for the specified attribute.
+	 * If the attribute looks like `relatedModel.attribute`, then the attribute will be received from the related model.
+	 * @param string $attribute the attribute name
+	 * @return string the attribute label
+	 * @see generateAttributeLabel()
+	 * @see attributeLabels()
+	 */
+	public function getAttributeLabel($attribute)
+	{
+		$labels = $this->attributeLabels();
+		if (isset($labels[$attribute])) {
+			return ($labels[$attribute]);
+		} elseif(strpos($attribute, '.')) {
+			$attributeParts = explode('.', $attribute);
+			$neededAttribute = array_pop($attributeParts);
+
+			$relatedModel = $this;
+			foreach ($attributeParts as $relationName) {
+				try {
+					$relation = $relatedModel->getRelation($relationName);
+				} catch (InvalidParamException $e) {
+					return $this->generateAttributeLabel($attribute);
+				}
+
+				$relatedModel = new $relation->modelClass;
+			}
+
+			$labels = $relatedModel->attributeLabels();
+			if (isset($labels[$neededAttribute])) {
+				return $labels[$neededAttribute];
+			}
+		}
+
+		return $this->generateAttributeLabel($attribute);
+	}
 }