Commit 55c50c1c authored by Robert Lyon's avatar Robert Lyon
Browse files

Bug 1756764: Alert user if shared with rules 2nd option empty



This is for the 'Search for...' Friends / Groups / Users

Currently we don't allow the submission / cancel of the form if any of
these 3 options are selected but the second select2 box is empty

But we also don't tell the user why.

I've added an alert to mention why the form will not submit / cancel

behatnotneeded

Change-Id: I71827647fd7a2f8177c336bdb91f6ce8b9b23df8
Signed-off-by: Robert Lyon's avatarRobert Lyon <robertl@catalyst.net.nz>
parent 3927b696
...@@ -1458,10 +1458,12 @@ function jsstrings() { ...@@ -1458,10 +1458,12 @@ function jsstrings() {
'toggletoolbarsoff', 'toggletoolbarsoff',
'imagexofy', 'imagexofy',
'remove', 'remove',
'errorprocessingform',
), ),
'pieforms' => array( 'pieforms' => array(
'element.calendar.opendatepicker', 'element.calendar.opendatepicker',
'rule.maxlength.maxlength' 'rule.maxlength.maxlength',
'rule.required.required',
) )
), ),
'tablerenderer' => array( 'tablerenderer' => array(
......
...@@ -108,6 +108,11 @@ ...@@ -108,6 +108,11 @@
line-height: $input-height-base / 2; line-height: $input-height-base / 2;
} }
} }
.input-short-error {
max-width: 205px;
display: inline-block;
width: 230px;
}
} }
......
...@@ -125,13 +125,25 @@ jQuery(function($) { ...@@ -125,13 +125,25 @@ jQuery(function($) {
$j('#{{$formname}} select:required').each(function() { $j('#{{$formname}} select:required').each(function() {
if ($j(this).val()) { if ($j(this).val()) {
$j(this).prop("required", false); $j(this).prop("required", false);
$j(this).parent().parent().find('div.errmsg').remove();
} }
else { else {
var b = $j(this).attr("data-type");
$j('#messages').html('<div class="alert alert-danger"><div>' + get_string('errorprocessingform', 'mahara') + '</div></div>');
if ($j(this).parent().parent().find('div.errmsg').length === 0) {
$j(this).parent().parent().append('<div class="errmsg"><span class="input-short-error"></span><span id="' + $j(this).prop('id') + '_error">' + get_string('rule.required.required', 'pieforms') + '</span></div>');
}
e.preventDefault(); e.preventDefault();
e.stopPropagation(); e.stopPropagation();
} }
}); });
}); });
// Remove 'required' on cancel
$j('#cancel_{{$formname}}_submit').click(function(e) {
$j('#{{$formname}} select:required').each(function() {
$j(this).prop("required", false);
});
});
function setDatePicker(target) { function setDatePicker(target) {
var loc = '{{strstr(current_language(), '.', true)}}'; // Get current langauge to use for locale var loc = '{{strstr(current_language(), '.', true)}}'; // Get current langauge to use for locale
......
Markdown is supported
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