Skip to content

Commit c6005ad

Browse files
committed
Merge branch 'release/3.3.6'
2 parents efdf7a5 + 92b8ce6 commit c6005ad

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
All notable changes to the Form Render Skip Logic module will be documented in this file.
33
This project adheres to [Semantic Versioning](http://semver.org/).
44

5+
## [3.3.6] - 2019-06-03
6+
### Changed
7+
- Checks if records exist before preventing hidden data (Kyle Chesney)
8+
59

610
## [3.3.5] - 2019-04-08
711
### Changed

ExternalModule.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ function getFormsAccessMatrix($event_id = null, $record = null) {
303303

304304
$logic = Calculate::formatCalcToPHP($logic, $Proj);
305305
$logic = LogicTester::logicPrependEventName($logic, $events_names[$event_id]);
306-
306+
307307
if (empty($data[$event_id])) {
308308
$data[$event_id] = array();
309309
}
@@ -315,7 +315,7 @@ function getFormsAccessMatrix($event_id = null, $record = null) {
315315

316316
$forms = $Proj->eventsForms[$event_id];
317317

318-
if ($prevent_hidden_data) {
318+
if ($prevent_hidden_data && !empty($forms_status)) {
319319
$forms = array();
320320

321321
foreach ($forms_status[$id][$event_id] as $form => $instances) {

js/frsl.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ document.addEventListener('DOMContentLoaded', function() {
2323
this.href.indexOf(app_path_webroot + 'DataEntry/index.php?') === -1) {
2424
return;
2525
}
26-
26+
2727
var params = getQueryParameters(this.href,this.getAttribute('onclick'));
2828
if (!formRenderSkipLogic.formsAccess[params.id][params.event_id][params.page]) {
2929
disableForm(this);

0 commit comments

Comments
 (0)