mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-29 10:50:25 +02:00
Code Issues Releases Wiki Activity

Issue #539 - validation of user-extended elements will automatically switch tabs when an error is found.

Browse Source
This commit is contained in:
Cameron
2014-10-06 17:32:36 -07:00
parent 877fad903a
commit ad0491c901
4 changed files with 69 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
e107_core/shortcodes/batch/usersettings_shortcodes.php
View File

@@ -267,6 +267,8 @@ class usersettings_shortcodes extends e_shortcode
{
$sql = e107::getDb();
$tp = e107::getParser();
$frm = e107::getForm();
$qry = "
SELECT * FROM #user_extended_struct
@@ -428,7 +430,7 @@ class usersettings_shortcodes extends e_shortcode
if(defined($fname)) $fname = constant($fname);
$fname = $tp->toHTML($fname, "", "emotes_off, defs");
if($fInfo['user_extended_struct_required'] == 1)
if($fInfo['user_extended_struct_required'] == 1 && !deftrue('BOOTSTRAP'))
{
$fname = str_replace("{FIELDNAME}", $fname, $REQUIRED_FIELD);
}

10
e107_handlers/form_handler.php
View File

@@ -208,6 +208,11 @@ class e_form
$c = 0;
foreach($array as $key=>$tab)
{
if(is_numeric($key))
{
$key = 'tab-'.$this->name2id($tab['caption']);
}
$active = ($c == 0) ? ' class="active"' : '';
$text .= '<li'.$active.'><a href="#'.$key.'" data-toggle="tab">'.$tab['caption'].'</a></li>';
$c++;
@@ -222,6 +227,11 @@ class e_form
$c=0;
foreach($array as $key=>$tab)
{
if(is_numeric($key))
{
$key = 'tab-'.$this->name2id($tab['caption']);
}
$active = ($c == 0) ? ' active' : '';
$text .= '<div class="tab-pane'.$active.'" id="'.$key.'">'.$tab['text'].'</div>';
$c++;

15
e107_handlers/user_extended_class.php
View File

@@ -676,6 +676,7 @@ class e107_user_extended
$regexfail = $tp->toText($parms[2]);
$fname = "ue[user_".$struct['user_extended_struct_name']."]";
$required = vartrue($struct['user_extended_struct_required']) ? "required" : "";
$fid = $frm->name2id($fname);
if(strpos($include, 'class') === FALSE)
{
@@ -687,7 +688,7 @@ class e107_user_extended
{
case EUF_TEXT : //textbox
case EUF_INTEGER : //integer
$ret = "<input name='{$fname}' value='{$curval}' {$include} {$required} />";
$ret = "<input id='{$fid}' name='{$fname}' value='{$curval}' {$include} {$required} />";
return $ret;
break;
@@ -722,7 +723,7 @@ class e107_user_extended
else
{
$chk = ($curval == $val)? " checked='checked' " : "";
$ret .= "<input {$include} type='radio' name='{$fname}' value='{$val}' {$chk} {$required} /> {$label}";
$ret .= "<input id='{$fid}' {$include} type='radio' name='{$fname}' value='{$val}' {$chk} {$required} /> {$label}";
}
}
@@ -766,7 +767,7 @@ class e107_user_extended
break;
case EUF_DROPDOWN : //dropdown
$ret = "<select {$include} name='{$fname}' {$required} >\n";
$ret = "<select {$include} id='{$fid}' name='{$fname}' {$required} >\n";
$ret .= "<option value=''>&nbsp;</option>\n"; // ensures that the user chose it.
foreach($choices as $choice)
{
@@ -790,7 +791,7 @@ class e107_user_extended
if (!method_exists($className, 'getValue')) return '???-???';
$temp->pointerReset();
$ret = "<select {$include} name='{$fname}' {$required} >\n";
$ret = "<select id='{$fid}' {$include} name='{$fname}' {$required} >\n";
$ret .= "<option value=''>&nbsp;</option>\n"; // ensures that the user chooses it.
while (FALSE !== ($row = $temp->getValue(0, 'next')))
{
@@ -810,7 +811,7 @@ class e107_user_extended
if($sql->db_Select($tp -> toDB($choices[0], true), $tp -> toDB($choices[1], true).",".$tp -> toDB($choices[2], true), "1 $order")){
$choiceList = $sql->db_getList('ALL',FALSE);
$ret = "<select {$include} name='{$fname}' {$required} >\n";
$ret = "<select id='{$fid}' {$include} name='{$fname}' {$required} >\n";
$ret .= "<option value=''>&nbsp;</option>\n"; // ensures that the user chose it.
foreach($choiceList as $cArray)
{
@@ -827,7 +828,7 @@ class e107_user_extended
break;
case EUF_TEXTAREA : //textarea
return "<textarea {$include} name='{$fname}' {$required} >{$curval}</textarea>";
return "<textarea id='{$fid}' {$include} name='{$fname}' {$required} >{$curval}</textarea>";
break;
case EUF_DATE : //date
@@ -844,7 +845,7 @@ class e107_user_extended
$lanlist = e107::getLanguage()->installed();
sort($lanlist);
$ret = "<select {$include} name='{$fname}' {$required} >\n";
$ret = "<select {$include} id='{$fid}' name='{$fname}' {$required} >\n";
$ret .= "<option value=''>&nbsp;</option>\n"; // ensures that the user chose it.
foreach($lanlist as $choice)
{

32
e107_web/js/core/front.jquery.js
View File

@@ -1,4 +1,4 @@
/* global $ */
$(document).ready(function()
{
@@ -264,7 +264,7 @@ $(document).ready(function()
if(!a.error)
{
//TODO modify status of html on page.
//TODO modify status of html on page
$(id).text(a.html)
.fadeIn('slow')
.addClass('e-comment-edit-success'); //TODO another class?
@@ -303,7 +303,7 @@ $(document).ready(function()
dataType: "html",
success: function(html) {
if(html == '')
if(html === '')
{
return false;
}
@@ -323,4 +323,30 @@ $(document).ready(function()
});
/* Switch to Tab containing invalid form field. */
$('input[type=submit],button[type=submit]').on('click', function() {
var id = $(this).closest('form').attr('id'), found = false;
$('#'+ id).find(':invalid').each(function (index, node) {
var tab = $('#'+node.id).closest('.tab-pane').attr('id');
// console.log(node.id);
if(tab && (found === false))
{
$('a[href="#'+tab+'"]').tab('show');
found = true;
}
});
return true;
});
});