BUG-13914 Browser not recognizing PDF Output Document

New feature added in Output Document Properties and new column added in OUTPUT DOCUMENT table.
This commit is contained in:
norahmollo
2014-03-19 10:17:29 -04:00
parent 98a8ae045b
commit d8287363a1
7 changed files with 96 additions and 16 deletions

View File

@@ -147,6 +147,12 @@ abstract class BaseOutputDocument extends BaseObject implements Persistent
*/
protected $out_doc_pdf_security_permissions = '';
/**
* The value for the out_doc_open_type field.
* @var int
*/
protected $out_doc_open_type = 0;
/**
* Flag to prevent endless save loop, if this object is referenced
* by another object which falls in this transaction.
@@ -381,6 +387,17 @@ abstract class BaseOutputDocument extends BaseObject implements Persistent
return $this->out_doc_pdf_security_permissions;
}
/**
* Get the [out_doc_open_type] column value.
*
* @return int
*/
public function getOutDocOpenType()
{
return $this->out_doc_open_type;
}
/**
* Set the value of [out_doc_uid] column.
*
@@ -821,6 +838,28 @@ abstract class BaseOutputDocument extends BaseObject implements Persistent
} // setOutDocPdfSecurityPermissions()
/**
* Set the value of [out_doc_open_type] column.
*
* @param int $v new value
* @return void
*/
public function setOutDocOpenType($v)
{
// Since the native PHP type for this column is integer,
// we will cast the input value to an int (if it is not).
if ($v !== null && !is_int($v) && is_numeric($v)) {
$v = (int) $v;
}
if ($this->out_doc_open_type !== $v || $v === 0) {
$this->out_doc_open_type = $v;
$this->modifiedColumns[] = OutputDocumentPeer::OUT_DOC_OPEN_TYPE;
}
} // setOutDocOpenType()
/**
* Hydrates (populates) the object variables with values from the database resultset.
*
@@ -878,12 +917,14 @@ abstract class BaseOutputDocument extends BaseObject implements Persistent
$this->out_doc_pdf_security_permissions = $rs->getString($startcol + 19);
$this->out_doc_open_type = $rs->getInt($startcol + 20);
$this->resetModified();
$this->setNew(false);
// FIXME - using NUM_COLUMNS may be clearer.
return $startcol + 20; // 20 = OutputDocumentPeer::NUM_COLUMNS - OutputDocumentPeer::NUM_LAZY_LOAD_COLUMNS).
return $startcol + 21; // 21 = OutputDocumentPeer::NUM_COLUMNS - OutputDocumentPeer::NUM_LAZY_LOAD_COLUMNS).
} catch (Exception $e) {
throw new PropelException("Error populating OutputDocument object", $e);
@@ -1147,6 +1188,9 @@ abstract class BaseOutputDocument extends BaseObject implements Persistent
case 19:
return $this->getOutDocPdfSecurityPermissions();
break;
case 20:
return $this->getOutDocOpenType();
break;
default:
return null;
break;
@@ -1187,6 +1231,7 @@ abstract class BaseOutputDocument extends BaseObject implements Persistent
$keys[17] => $this->getOutDocPdfSecurityOpenPassword(),
$keys[18] => $this->getOutDocPdfSecurityOwnerPassword(),
$keys[19] => $this->getOutDocPdfSecurityPermissions(),
$keys[20] => $this->getOutDocOpenType(),
);
return $result;
}
@@ -1278,6 +1323,9 @@ abstract class BaseOutputDocument extends BaseObject implements Persistent
case 19:
$this->setOutDocPdfSecurityPermissions($value);
break;
case 20:
$this->setOutDocOpenType($value);
break;
} // switch()
}
@@ -1381,6 +1429,10 @@ abstract class BaseOutputDocument extends BaseObject implements Persistent
$this->setOutDocPdfSecurityPermissions($arr[$keys[19]]);
}
if (array_key_exists($keys[20], $arr)) {
$this->setOutDocOpenType($arr[$keys[20]]);
}
}
/**
@@ -1472,6 +1524,10 @@ abstract class BaseOutputDocument extends BaseObject implements Persistent
$criteria->add(OutputDocumentPeer::OUT_DOC_PDF_SECURITY_PERMISSIONS, $this->out_doc_pdf_security_permissions);
}
if ($this->isColumnModified(OutputDocumentPeer::OUT_DOC_OPEN_TYPE)) {
$criteria->add(OutputDocumentPeer::OUT_DOC_OPEN_TYPE, $this->out_doc_open_type);
}
return $criteria;
}
@@ -1564,6 +1620,8 @@ abstract class BaseOutputDocument extends BaseObject implements Persistent
$copyObj->setOutDocPdfSecurityPermissions($this->out_doc_pdf_security_permissions);
$copyObj->setOutDocOpenType($this->out_doc_open_type);
$copyObj->setNew(true);