diff --git a/airtime_mvc/application/models/StoredFile.php b/airtime_mvc/application/models/StoredFile.php index a63cf2703..3270000d2 100644 --- a/airtime_mvc/application/models/StoredFile.php +++ b/airtime_mvc/application/models/StoredFile.php @@ -45,7 +45,9 @@ class Application_Model_StoredFile { "mime" => "DbMime", "md5" => "DbMd5", "ftype" => "DbFtype", - "language" => "DbLanguage" + "language" => "DbLanguage", + "filepath" => "DbFilepath", + "directory" => "DbDirectory" ); public function __construct() @@ -223,7 +225,19 @@ class Application_Model_StoredFile { foreach ($c['user'] as $constant => $value) { if (preg_match('/^MDATA_KEY/', $constant)) { if (isset($this->_dbMD[$value])) { - $md[$constant] = $this->getDbColMetadataValue($value); + if ($value == 'filepath') { + $directoryPK = $this->getDbColMetadataValue('directory'); + if ($directoryPK == 1) { + $musicDir = Application_Model_MusicDir::getDirByPK($directoryPK); + $md[$constant] = $musicDir->getDirectory() . $this->getDbColMetadataValue($value); + } + else { + $md[$constant] = $this->getDbColMetadataValue($value); + } + } + else { + $md[$constant] = $this->getDbColMetadataValue($value); + } } } } diff --git a/airtime_mvc/application/views/scripts/library/get-file-meta-data.ajax.phtml b/airtime_mvc/application/views/scripts/library/get-file-meta-data.ajax.phtml index 4e0caf69d..76f62b86a 100644 --- a/airtime_mvc/application/views/scripts/library/get-file-meta-data.ajax.phtml +++ b/airtime_mvc/application/views/scripts/library/get-file-meta-data.ajax.phtml @@ -17,6 +17,7 @@