Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cc-3936: Changed setting of owner when modifying/inserting metadata.

This commit is contained in:
Rudi Grinberg 2012-08-24 12:38:33 -04:00
parent 5841cb7066
commit 7284770226
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
airtime_mvc/application/models/StoredFile.php
View File

@ -145,14 +145,15 @@ class Application_Model_StoredFile
$this->_file->$method(null); $this->_file->$method(null);
} }
} else { } else {
$owner = $this->_file->getOwner(); $owner = $this->_file->getFkOwner();
// if owner_id is already set we don't want to set it again. // if owner_id is already set we don't want to set it again.
if(!$owner) { // no owner detected, we try to assign one. if(!$owner) { // no owner detected, we try to assign one.
$owner = null;
// if MDATA_OWNER_ID is not set then we default to the // if MDATA_OWNER_ID is not set then we default to the
// first admin user we find // first admin user we find
if (!array_key_exists('MDATA_OWNER_ID', $p_md)) { if (!array_key_exists('MDATA_OWNER_ID', $p_md)) {
$admins = Application_Model_User::getUsers(array('A')); //$admins = Application_Model_User::getUsers(array('A'));
$admins = Application_Model_User::getUsersOfType('A');
//$admins = array();
if (count($admins) > 0) { // found admin => pick first one if (count($admins) > 0) { // found admin => pick first one
$owner = $admins[0]; $owner = $admins[0];
} }
@ -166,13 +167,16 @@ class Application_Model_StoredFile
} }
} }
if ($owner) { if ($owner) {
Logging::info("Suppose to to set owner as ". $this->_file->setDbOwnerId( $owner->getDbId() );
var_export($owner,true)); }
$this->_file->setFkOwner($owner); else {
Logging::info("Could not find suitable owner for file
'".$p_md['MDATA_KEY_FILEPATH']."'");
} }
} }
foreach ($p_md as $dbColumn => $mdValue) { foreach ($p_md as $dbColumn => $mdValue) {
//don't blank out name, defaults to original filename on first insertion to database. // don't blank out name, defaults to original filename on first
// insertion to database.
if ($dbColumn == "track_title" && (is_null($mdValue) || $mdValue == "")) { if ($dbColumn == "track_title" && (is_null($mdValue) || $mdValue == "")) {
continue; continue;
} }