[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[28327] trunk

[<jon...@us...>]

Revision: 28327
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=28327&view=rev
Author:   jonnybradley
Date:     2010-08-05 20:52:33 +0000 (Thu, 05 Aug 2010)

Log Message:
-----------
[FIX] Validation: Move tracker_validator.tpl out of wiki-plugins and deploy in tiki-view_tracker_item.tpl.
Add JS to delay form submission until all validation requests have been served so it saves properly.

Modified Paths:
--------------
    trunk/lib/wiki-plugins/wikiplugin_tracker.php
    trunk/templates/tiki-view_tracker_item.tpl

Added Paths:
-----------
    trunk/templates/tracker_validator.tpl

Removed Paths:
-------------
    trunk/templates/wiki-plugins/tracker_validator.tpl

Modified: trunk/lib/wiki-plugins/wikiplugin_tracker.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_tracker.php	2010-08-05 20:42:05 UTC (rev 28326)
+++ trunk/lib/wiki-plugins/wikiplugin_tracker.php	2010-08-05 20:52:33 UTC (rev 28327)
@@ -909,7 +909,7 @@
 				$validationjs = $validatorslib->generateTrackerValidateJS( $flds['data'], "track_", $customvalidation, $customvalidation_m );
 
 				$smarty->assign('validationjs', $validationjs);
-				$back .= $smarty->fetch('wiki-plugins/tracker_validator.tpl');
+				$back .= $smarty->fetch('tracker_validator.tpl');
 			}
 			$back .= '<form name="editItemForm' . $iTRACKER . '" id="editItemForm' . $iTRACKER . '" enctype="multipart/form-data" method="post"'.(isset($target)?' target="'.$target.'"':'').' action="'. $_SERVER['REQUEST_URI'] .'"><input type="hidden" name="trackit" value="'.$trackerId.'" />';
 			$back .= '<input type="hidden" name="iTRACKER" value="'.$iTRACKER.'" />';

Modified: trunk/templates/tiki-view_tracker_item.tpl
===================================================================
--- trunk/templates/tiki-view_tracker_item.tpl	2010-08-05 20:42:05 UTC (rev 28326)
+++ trunk/templates/tiki-view_tracker_item.tpl	2010-08-05 20:52:33 UTC (rev 28327)
@@ -182,11 +182,7 @@
 {tab name="{tr}Edit/Delete{/tr}"}
 <h2>{tr}Edit Item{/tr}</h2>
 
-{jq}
-$jq("#editItemForm").validate({
-	{{$validationjs}}
-});
-{/jq}
+{include file="tracker_validator.tpl"}
 
 {if  $tiki_p_admin_trackers eq 'y' and !empty($trackers)}	
 	<form>

Copied: trunk/templates/tracker_validator.tpl (from rev 28273, trunk/templates/wiki-plugins/tracker_validator.tpl)
===================================================================
--- trunk/templates/tracker_validator.tpl	                        (rev 0)
+++ trunk/templates/tracker_validator.tpl	2010-08-05 20:52:33 UTC (rev 28327)
@@ -0,0 +1,17 @@
+{* $Id$ *}
+{jq}
+$jq("#editItemForm{{$trackerEditFormId}}").submit(function(evt){
+	if (!$jq(this).attr("is_validating")) {
+		$jq(this).attr("is_validating", true);
+		$jq(this).validate();
+	}
+	if ($jq(this).validate().pendingRequest > 0) {
+		setTimeout(function(){$jq(this).submit();}, 500);
+		return false;
+	}
+	$jq(this).attr("is_validating", false);
+	return $jq(this).valid();
+}).validate({
+	{{$validationjs}}
+});
+{/jq}
\ No newline at end of file


Property changes on: trunk/templates/tracker_validator.tpl
___________________________________________________________________
Added: svn:keywords
   + Id

Deleted: trunk/templates/wiki-plugins/tracker_validator.tpl
===================================================================
--- trunk/templates/wiki-plugins/tracker_validator.tpl	2010-08-05 20:42:05 UTC (rev 28326)
+++ trunk/templates/wiki-plugins/tracker_validator.tpl	2010-08-05 20:52:33 UTC (rev 28327)
@@ -1,5 +0,0 @@
-{jq}
-$jq("#editItemForm{{$trackerEditFormId}}").validate({
-	{{$validationjs}}
-});
-{/jq}
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.