Commit b450d7be authored by Son Nguyen's avatar Son Nguyen Committed by Gerrit Code Review
Browse files

Merge "Bug 1623282: property of non-object error for old annotations"

parents 51f780ab 1adfbdc6
......@@ -1275,6 +1275,8 @@ class ArtefactTypeAnnotationfeedback extends ArtefactType {
safe_require('module', 'framework');
$evidence = get_record('framework_evidence', 'annotation', $metadata->block);
if (!empty($evidence)) {
// we are dealing with an annotation added since smartevidence was added
$defaultval = $evidence->state;
if ($options = Framework::get_my_assessment_options_for_user($view->get('owner'), $evidence->framework)) {
......@@ -1297,6 +1299,7 @@ class ArtefactTypeAnnotationfeedback extends ArtefactType {
}
}
}
}
$form['elements']['ispublic'] = array(
'type' => 'switchbox',
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment