Skip to content
GitLab
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
Hide whitespace changes
Inline Side-by-side
htdocs/artefact/annotation/lib.php
View file @ b450d7be
...@@ -1275,24 +1275,27 @@ class ArtefactTypeAnnotationfeedback extends ArtefactType { ...@@ -1275,24 +1275,27 @@ class ArtefactTypeAnnotationfeedback extends ArtefactType {
safe_require('module', 'framework'); safe_require('module', 'framework');
$evidence = get_record('framework_evidence', 'annotation', $metadata->block); $evidence = get_record('framework_evidence', 'annotation', $metadata->block);
$defaultval = $evidence->state; if (!empty($evidence)) {
// we are dealing with an annotation added since smartevidence was added
if ($options = Framework::get_my_assessment_options_for_user($view->get('owner'), $evidence->framework)) { $defaultval = $evidence->state;
if (!array_key_exists($defaultval, $options)) {
$defaultval = null; if ($options = Framework::get_my_assessment_options_for_user($view->get('owner'), $evidence->framework)) {
if (!array_key_exists($defaultval, $options)) {
$defaultval = null;
}
$form['elements']['assessment'] = array(
'type' => 'select',
'title' => get_string('assessment', 'module.framework'),
'options' => $options,
'defaultvalue' => $defaultval,
'width' => '280px',
);
$form['elements']['evidence'] = array(
'type' => 'hidden',
'value' => $evidence->id,
);
} }
$form['elements']['assessment'] = array(
'type' => 'select',
'title' => get_string('assessment', 'module.framework'),
'options' => $options,
'defaultvalue' => $defaultval,
'width' => '280px',
);
$form['elements']['evidence'] = array(
'type' => 'hidden',
'value' => $evidence->id,
);
} }
} }
} }
......
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