diff --git a/lang/en_utf8/data.php b/lang/en_utf8/data.php index 4144ce332464a..b44f33140859b 100644 --- a/lang/en_utf8/data.php +++ b/lang/en_utf8/data.php @@ -75,7 +75,7 @@ $string['emptyadd'] = 'The Add template is empty, generating a default form...'; $string['emptyaddform'] = 'You did not fill out any fields!'; $string['entries'] = 'Entries'; -$string['entrieslefttoadd'] = 'You must add $a more entry/entries before you can view other participants\' entries.'; +$string['entrieslefttoadd'] = 'You must add $a->entriesleft more entry/entries before you can view other participants\' entries.'; $string['entry'] = 'Entry'; $string['entrysaved'] = 'Your entry has been saved'; $string['errormustbeteacher'] = 'You need to be a teacher to use this page!'; diff --git a/mod/data/view.php b/mod/data/view.php index a018a33c49617..4427a6aaa6432 100755 --- a/mod/data/view.php +++ b/mod/data/view.php @@ -332,21 +332,12 @@ $requiredentries_allowed = true; $numentries = data_numentries($data); if ($data->requiredentries > 0 && $numentries < $data->requiredentries && !has_capability('mod/data:manageentries', $context)) { - $entriesleft = $data->requiredentries - $numentries; - $strentrieslefttoadd = get_string('entrieslefttoadd', 'data', $entriesleft); + $data->entriesleft = $data->requiredentries - $numentries; + $strentrieslefttoadd = get_string('entrieslefttoadd', 'data', $data); notify($strentrieslefttoadd); $requiredentries_allowed = false; } - // If not teacher, check whether user has sufficient records to view - if (!has_capability('mod/data:managetemplates', $context) and data_numentries($data) < $data->requiredentriestoview){ - notify (($data->requiredentriestoview - data_numentries($data)).' '.get_string('insufficiententries','data')); - echo ''; - print_footer($course); - exit; - } - - /// We need to examine the whole dataset to produce the correct paging if ((!has_capability('mod/data:managetemplates', $context)) && ($data->approval)) {