Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas

This commit is contained in:
Albert Santoni 2014-04-01 12:29:20 -04:00
commit a6e80e2789
9 changed files with 103 additions and 18 deletions

View file

@ -44,7 +44,7 @@ class CcFilesTableMap extends TableMap {
$this->addColumn('FTYPE', 'DbFtype', 'VARCHAR', true, 128, '');
$this->addForeignKey('DIRECTORY', 'DbDirectory', 'INTEGER', 'cc_music_dirs', 'ID', false, null, null);
$this->addColumn('FILEPATH', 'DbFilepath', 'LONGVARCHAR', false, null, '');
$this->addColumn('IMPORT_STATUS', 'DbImportStatus', 'INTEGER', true, null, 0);
$this->addColumn('IMPORT_STATUS', 'DbImportStatus', 'INTEGER', true, null, 1);
$this->addColumn('CURRENTLYACCESSING', 'DbCurrentlyaccessing', 'INTEGER', true, null, 0);
$this->addForeignKey('EDITEDBY', 'DbEditedby', 'INTEGER', 'cc_subjs', 'ID', false, null, null);
$this->addColumn('MTIME', 'DbMtime', 'TIMESTAMP', false, 6, null);

View file

@ -66,7 +66,7 @@ abstract class BaseCcFiles extends BaseObject implements Persistent
/**
* The value for the import_status field.
* Note: this column has a database default value of: 0
* Note: this column has a database default value of: 1
* @var int
*/
protected $import_status;
@ -524,7 +524,7 @@ abstract class BaseCcFiles extends BaseObject implements Persistent
$this->mime = '';
$this->ftype = '';
$this->filepath = '';
$this->import_status = 0;
$this->import_status = 1;
$this->currentlyaccessing = 0;
$this->length = '00:00:00';
$this->file_exists = true;
@ -2892,7 +2892,7 @@ abstract class BaseCcFiles extends BaseObject implements Persistent
return false;
}
if ($this->import_status !== 0) {
if ($this->import_status !== 1) {
return false;
}