Skip to content

Commit

Permalink
Merge pull request #164 from oat-sa/backport/DPF-514/tt-update-event-…
Browse files Browse the repository at this point in the history
…trigger-timing

Backport/dpf 514/tt update event trigger timing
  • Loading branch information
ks16 authored Sep 29, 2020
2 parents 0354ed6 + 6bb03d6 commit 8a452d0
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions actions/TestTaker.php
Original file line number Diff line number Diff line change
Expand Up @@ -179,10 +179,6 @@ public function editSubject()
$data = ['hashForKey' => UserHashForEncryption::hash($plainPassword)];
}

$this->getEventManager()->trigger(
new TestTakerUpdatedEvent($subjectUri,array_merge($values, $data))
);

if ($addMode) {
// force default subject roles to be the Delivery Role:
$this->getClassService()->setTestTakerRole($subject);
Expand All @@ -195,6 +191,10 @@ public function editSubject()
GenerisRdf::PROPERTY_USER_DEFLG => $lang->getUri()
));

$this->getEventManager()->trigger(
new TestTakerUpdatedEvent($subjectUri, array_merge($values, $data))
);

$message = __('Test taker saved');

if ($addMode) {
Expand Down
2 changes: 1 addition & 1 deletion manifest.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
'label' => 'Test-taker core extension',
'description' => 'TAO TestTaker extension',
'license' => 'GPL-2.0',
'version' => '7.1.3',
'version' => '7.1.4',
'author' => 'Open Assessment Technologies, CRP Henri Tudor',
'requires' => array(
'tao' => '>=36.1.0',
Expand Down
2 changes: 1 addition & 1 deletion scripts/update/Updater.php
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,6 @@ public function update($initialVersion)
$this->setVersion('3.11.0');
}

$this->skip('3.11.0', '7.1.3');
$this->skip('3.11.0', '7.1.4');
}
}

0 comments on commit 8a452d0

Please sign in to comment.