Fixed small bug in Survey validation where invalid branch expressions
wouldn't be shown Improved and i18n'ed Survey validation warning container
This commit is contained in:
parent
d19963fd8e
commit
571ca5db06
6 changed files with 28 additions and 8 deletions
|
|
@ -4,6 +4,7 @@
|
||||||
- Survey summaries now added. In the Survey edit, select quiz mode, and a summary will be shown to the user at the end of the survey.
|
- Survey summaries now added. In the Survey edit, select quiz mode, and a summary will be shown to the user at the end of the survey.
|
||||||
- fixed #10110: Matrix 2.0 - "Data Error" on Pending Product Listing Updates
|
- fixed #10110: Matrix 2.0 - "Data Error" on Pending Product Listing Updates
|
||||||
- rfe #9965: matrix/pls reverse dropped event variables
|
- rfe #9965: matrix/pls reverse dropped event variables
|
||||||
|
- fixed install of Passive Analytics settings for new sites
|
||||||
7.7.2
|
7.7.2
|
||||||
- fixed #10056: YUI javascripts included while adminOff (BNC)
|
- fixed #10056: YUI javascripts included while adminOff (BNC)
|
||||||
- fixed a bug that required you to hit "update cart" before the checkout
|
- fixed a bug that required you to hit "update cart" before the checkout
|
||||||
|
|
|
||||||
Binary file not shown.
|
|
@ -1200,15 +1200,12 @@ Returns an array of messages to inform a user what is logically wrong with the S
|
||||||
|
|
||||||
sub validateSurvey{
|
sub validateSurvey{
|
||||||
my $self = shift;
|
my $self = shift;
|
||||||
#check all goto's
|
|
||||||
#bad goto expressions
|
|
||||||
#check that all survey is able to be seen
|
|
||||||
|
|
||||||
my @messages;
|
my @messages;
|
||||||
|
|
||||||
#set up valid goto targets
|
#set up valid goto targets
|
||||||
my $gotoTargets = $self->getGotoTargets();
|
my $gotoTargets = $self->getGotoTargets();
|
||||||
my $goodTargets;
|
my $goodTargets = {};
|
||||||
my $duplicateTargets;
|
my $duplicateTargets;
|
||||||
for my $g (@{$gotoTargets}) {
|
for my $g (@{$gotoTargets}) {
|
||||||
$goodTargets->{$g}++;
|
$goodTargets->{$g}++;
|
||||||
|
|
|
||||||
|
|
@ -67,6 +67,10 @@ our $I18N = {
|
||||||
message => q|Delete|,
|
message => q|Delete|,
|
||||||
lastUpdated => 1224686319
|
lastUpdated => 1224686319
|
||||||
},
|
},
|
||||||
|
'warnings' => {
|
||||||
|
message => q|Warnings|,
|
||||||
|
lastUpdated => 0
|
||||||
|
},
|
||||||
'section number' => {
|
'section number' => {
|
||||||
message => q|Section Number:|,
|
message => q|Section Number:|,
|
||||||
lastUpdated => 1224686319
|
lastUpdated => 1224686319
|
||||||
|
|
@ -355,9 +359,9 @@ our $I18N = {
|
||||||
lastUpdated => 0
|
lastUpdated => 0
|
||||||
},
|
},
|
||||||
'jump expression description' => {
|
'jump expression description' => {
|
||||||
message => q|An expression used to control complex branching based user responses to previous questions.|,
|
message => q|An expression used to control complex branching based user responses to previous questions. Ignored unless enableSurveyExpressionEngine enabled in your site config file.|,
|
||||||
context => q|Description of the 'jump expression' field, used as hoverhelp in the edit answer dialog.|,
|
context => q|Description of the 'jump expression' field, used as hoverhelp in the edit answer dialog.|,
|
||||||
lastUpdated => 0
|
lastUpdated => 1239259550
|
||||||
},
|
},
|
||||||
'text answer' => {
|
'text answer' => {
|
||||||
message => q|TextArea|,
|
message => q|TextArea|,
|
||||||
|
|
|
||||||
|
|
@ -56,9 +56,17 @@ Survey.Data = (function(){
|
||||||
focus = d.address;//What is the current highlighted item.
|
focus = d.address;//What is the current highlighted item.
|
||||||
var warnings = "";
|
var warnings = "";
|
||||||
for(var w in d.warnings){
|
for(var w in d.warnings){
|
||||||
warnings = warnings + "<br>" + d.warnings[w];
|
warnings += "<div class='warning'>" + d.warnings[w] + "</div>";
|
||||||
|
}
|
||||||
|
if (document.getElementById('warnings')) {
|
||||||
|
if (warnings !== "") {
|
||||||
|
document.getElementById('warnings').innerHTML = warnings;
|
||||||
|
YAHOO.util.Dom.setStyle('warnings-outer', 'display', 'block');
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
YAHOO.util.Dom.setStyle('warnings-outer', 'display', 'none');
|
||||||
|
}
|
||||||
}
|
}
|
||||||
document.getElementById('warnings').innerHTML = warnings;
|
|
||||||
var showEdit = 1;
|
var showEdit = 1;
|
||||||
if (lastId.toString() === d.address.toString()) {
|
if (lastId.toString() === d.address.toString()) {
|
||||||
showEdit = 0;
|
showEdit = 0;
|
||||||
|
|
|
||||||
|
|
@ -171,3 +171,13 @@ li.newAnswer {
|
||||||
width:15em;
|
width:15em;
|
||||||
margin-top:0.5em;
|
margin-top:0.5em;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#warnings-outer {
|
||||||
|
margin: 5px;
|
||||||
|
padding: 0 5px;
|
||||||
|
border: 1px solid;
|
||||||
|
color: red;
|
||||||
|
}
|
||||||
|
#warnings {
|
||||||
|
color: red;
|
||||||
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue