Index: classes/manager/form/ReviewFormElementForm.inc.php =================================================================== --- classes/manager/form/ReviewFormElementForm.inc.php 2009-11-19 17:21:21.000000000 +0100 +++ classes/manager/form/ReviewFormElementForm.inc.php 2009-11-19 17:34:51.000000000 +0100 @@ -80,6 +80,7 @@ $this->_data = array( 'question' => $reviewFormElement->getQuestion(null), // Localized 'required' => $reviewFormElement->getRequired(), + 'included' => $reviewFormElement->getIncluded(), 'elementType' => $reviewFormElement->getElementType(), 'possibleResponses' => $reviewFormElement->getPossibleResponses(null) //Localized ); @@ -91,7 +92,7 @@ * Assign form data to user-submitted data. */ function readInputData() { - $this->readUserVars(array('question', 'required', 'elementType', 'possibleResponses')); + $this->readUserVars(array('question', 'required', 'included', 'elementType', 'possibleResponses')); } /** @@ -112,6 +113,7 @@ $reviewFormElement->setQuestion($this->getData('question'), null); // Localized $reviewFormElement->setRequired($this->getData('required') ? 1 : 0); + $reviewFormElement->setIncluded($this->getData('included') ? 1 : 0); $reviewFormElement->setElementType($this->getData('elementType')); if (in_array($this->getData('elementType'), ReviewFormElement::getMultipleResponsesElementTypes())) { Index: classes/reviewForm/ReviewFormElement.inc.php =================================================================== --- classes/reviewForm/ReviewFormElement.inc.php 2009-11-19 13:24:53.000000000 +0100 +++ classes/reviewForm/ReviewFormElement.inc.php 2009-11-19 13:26:08.000000000 +0100 @@ -131,6 +131,22 @@ } /** + * get included + * @return boolean + */ + function getIncluded() { + return $this->getData('included'); + } + + /** + * set included + * @param $included boolean + */ + function setIncluded($included) { + return $this->setData('included', $included); + } + + /** * Get question. * @param $locale string * @return string Index: classes/reviewForm/ReviewFormElementDAO.inc.php =================================================================== --- classes/reviewForm/ReviewFormElementDAO.inc.php 2009-11-19 15:05:16.000000000 +0100 +++ classes/reviewForm/ReviewFormElementDAO.inc.php 2009-11-19 17:30:34.000000000 +0100 @@ -50,6 +50,7 @@ $reviewFormElement->setSequence($row['seq']); $reviewFormElement->setElementType($row['element_type']); $reviewFormElement->setRequired($row['required']); + $reviewFormElement->setIncluded($row['included']); $this->getDataObjectSettings('review_form_element_settings', 'review_form_element_id', $row['review_form_element_id'], $reviewFormElement); @@ -83,14 +84,15 @@ function insertReviewFormElement(&$reviewFormElement) { $this->update( 'INSERT INTO review_form_elements - (review_form_id, seq, element_type, required) + (review_form_id, seq, element_type, required, included) VALUES - (?, ?, ?, ?)', + (?, ?, ?, ?, ?)', array( $reviewFormElement->getReviewFormId(), $reviewFormElement->getSequence() == null ? 0 : $reviewFormElement->getSequence(), $reviewFormElement->getElementType(), - $reviewFormElement->getRequired() ? 1 : 0 + $reviewFormElement->getRequired() ? 1 : 0, + $reviewFormElement->getIncluded() ? 1 : 0 ) ); @@ -110,13 +112,15 @@ review_form_id = ?, seq = ?, element_type = ?, - required = ? + required = ?, + included = ? WHERE review_form_element_id = ?', array( $reviewFormElement->getReviewFormId(), $reviewFormElement->getSequence(), $reviewFormElement->getElementType(), $reviewFormElement->getRequired(), + $reviewFormElement->getIncluded(), $reviewFormElement->getReviewFormElementId() ) ); Index: dbscripts/xml/ocs_schema.xml =================================================================== --- dbscripts/xml/ocs_schema.xml 2009-11-19 16:43:00.000000000 +0100 +++ dbscripts/xml/ocs_schema.xml 2009-11-19 16:43:04.000000000 +0100 @@ -80,6 +80,7 @@ + Review form elements. Index: locale/en_US/locale.xml =================================================================== --- locale/en_US/locale.xml 2009-11-19 13:20:31.000000000 +0100 +++ locale/en_US/locale.xml 2009-11-19 13:20:46.000000000 +0100 @@ -59,6 +59,7 @@ Copy to: Item Reviewers required to complete item + Not included in message to author Item type Selection Add selection Index: templates/manager/reviewForms/reviewFormElementForm.tpl =================================================================== --- templates/manager/reviewForms/reviewFormElementForm.tpl 2009-11-19 13:37:03.000000000 +0100 +++ templates/manager/reviewForms/reviewFormElementForm.tpl 2009-11-19 13:37:32.000000000 +0100 @@ -60,6 +60,13 @@ +   + + + {fieldLabel name="included" key="manager.reviewFormElements.notIncluded"} + + + {fieldLabel name="elementType" required="true" key="manager.reviewFormElements.elementType"}