Skip to content
This repository was archived by the owner on Jun 9, 2021. It is now read-only.

Commit 0e59f01

Browse files
committed
Avoiding admin page to crash if entering quote as value of a field #73
1 parent 6dbb299 commit 0e59f01

File tree

3 files changed

+11
-4
lines changed

3 files changed

+11
-4
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33
Changelog of Pull Request Notifier for Stash.
44

5+
## 1.31
6+
* Bugfix: Avoiding admin page to crash if entering quote as value of a field.
7+
58
## 1.30
69
* Adding "Triggers do not apply to" option with values DECLINED and MERGED.
710
* Changing wording of trigger conditions in admin GUI.

src/main/java/se/bjurr/prnfs/settings/SettingsStorage.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,10 @@ private static AdminFormValues injectConfigurationName(AdminFormValues adminForm
245245
if (nameMapOpt.isPresent()) {
246246
return adminFormValues;
247247
}
248-
adminFormValues.add(ImmutableMap.<String, String> builder().put(NAME, name.name()).put(VALUE, DEFAULT_NAME).build());
248+
adminFormValues.add(ImmutableMap.<String, String> builder()//
249+
.put(NAME, name.name())//
250+
.put(VALUE, DEFAULT_NAME)//
251+
.build());
249252
return adminFormValues;
250253
}
251254

src/main/resources/admin.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,14 +114,15 @@
114114
var $template = $(".prnfs-template-"+formType).clone();
115115

116116
$.each(config, function(fieldIndex,field_map) {
117+
var safe_value = field_map.value.replace(/[^a-zA-Z]/g,'');
117118
$('.variable[data-variable="'+field_map.name+'"]', $template).html(field_map.value);
118119
$('input[type="text"][name="'+field_map.name+'"]', $template).attr('value', field_map.value);
119120
$('input[type="password"][name="'+field_map.name+'"]', $template).attr('value', field_map.value);
120121
$('textarea[name="'+field_map.name+'"]', $template).text(field_map.value);
121122
$('input[type="hidden"][name="'+field_map.name+'"]', $template).attr('value', field_map.value);
122-
$('input[type="checkbox"][name="'+field_map.name+'"][value="'+field_map.value+'"]', $template).attr('checked','checked');
123-
$('input[type="radio"][name="'+field_map.name+'"][value="'+field_map.value+'"]', $template).attr('checked','checked');
124-
$('.visibleif.'+field_map.name+'_'+field_map.value.replace(/[^a-zA-Z]/g,''), $template).show();
123+
$('input[type="checkbox"][name="'+field_map.name+'"][value="'+safe_value+'"]', $template).attr('checked','checked');
124+
$('input[type="radio"][name="'+field_map.name+'"][value="'+safe_value+'"]', $template).attr('checked','checked');
125+
$('.visibleif.'+field_map.name+'_'+safe_value, $template).show();
125126
});
126127

127128
var header_names = [];

0 commit comments

Comments
 (0)