WebSVN – DevTools – Diff – /ManagerSuite/Release_Manager/branches/dpurdie/form_edit_deps.asp

 	OraDatabase.Parameters.Add "RTAG_ID", nRtag_id, ORAPARM_INPUT, ORATYPE_NUMBER
 	OraDatabase.Parameters.Add "PV_ID", NNpv_id, ORAPARM_INPUT, ORATYPE_NUMBER
 	Set rsDeps = OraDatabase.DbCreateDynaset( Query_String, cint(0))
 	While ((NOT rsDeps.BOF) AND (NOT rsDeps.EOF))
+        Dim PVID : PVID=rsDeps("pv_id")
+        Dim PKGID: PKGID=rsDeps("pkg_id")
 		disabled = FALSE
 		'If IsNull(rsDeps("lpv_id")) Then
 		'	disabled = TRUE
 		'End If
 		If NOT disabled Then
 			SShtml_pkg_list = SShtml_pkg_list &"<tr> "
-			SShtml_pkg_list = SShtml_pkg_list &"  <td background='images/bg_form_lightgray.gif' nowrap class='form_item'>"& rsDeps("pkg_name") &"<input name='bt"& rsDeps("pv_id") &"' type='hidden' value='"& rsDeps("build_type") &"'></td>"
+			SShtml_pkg_list = SShtml_pkg_list &"  <td background='images/bg_form_lightgray.gif' nowrap class='form_item'>"& rsDeps("pkg_name") &"<input name='bt"& PVID &"' type='hidden' value='"& rsDeps("build_type") &"'></td>"
 			SShtml_pkg_list = SShtml_pkg_list &"  <td background='images/bg_form_lightgray.gif'>" &_
+                                "<select style='width:10em;display:none' id='edpkgn"& PVID &"' class='form_item' > " &_
-                                "<input type='text' readonly ondblclick='editVerNum("& rsDeps("pkg_id") &","& rsDeps("pv_id")&");' id='pkgn"& rsDeps("pv_id") &"' name='pkgn"& rsDeps("pv_id") &"' class='form_item' size='12' value='"& rsDeps("pkg_version") &"' onBlur='Compare_Version ( """& rsDeps("pv_id") &""" );' onFocus='Compare_Version ( """& rsDeps("pv_id") &""" );'> "
+                                "<input type='text' readonly ondblclick='editVerNum("& PKGID &","& PVID&");' id='pkgn"& PVID &"' name='pkgn"& PVID &"' class='form_item' size='12' value='"& rsDeps("pkg_version") &"' onBlur='Compare_Version ( """& PVID &""" );' onFocus='Compare_Version ( """& PVID &""" );'> "
-			SShtml_pkg_list = SShtml_pkg_list &"    <a href='javascript:;' onClick='editVerNum("& rsDeps("pkg_id") &","& rsDeps("pv_id") & ")'><img src='images/i_get.gif' width='16' height='16' align='absmiddle' hspace='5' border='0' alt='Get package version from the list' title='Get package version from the list'></a> "
+			SShtml_pkg_list = SShtml_pkg_list &"    <a href='javascript:;' onClick='editVerNum("& PKGID &","& PVID & ")'><img src='images/i_edit.gif' width='12' height='12' align='absmiddle' border='0' alt='Edit Version' title='Select Version from a list'></a> "
 			SShtml_pkg_list = SShtml_pkg_list &"  </td>"
 		Else
 			SShtml_pkg_list = SShtml_pkg_list &"<tr> "
-			SShtml_pkg_list = SShtml_pkg_list &"  <td background='images/bg_form_lightgray.gif' nowrap class='form_item'>"& rsDeps("pkg_name") &"<input name='bt"& rsDeps("pv_id") &"' type='hidden' value='"& rsDeps("build_type") &"'></td>"
+			SShtml_pkg_list = SShtml_pkg_list &"  <td background='images/bg_form_lightgray.gif' nowrap class='form_item'>"& rsDeps("pkg_name") &"<input name='bt"& PVID &"' type='hidden' value='"& rsDeps("build_type") &"'></td>"
 			SShtml_pkg_list = SShtml_pkg_list &"  <td background='images/bg_form_lightgray.gif'><input disabled type='text' class='form_item' size='12' value='"& rsDeps("pkg_version") &"'>"
 			SShtml_pkg_list = SShtml_pkg_list &"  </td>"
 		End If
 		' Latest Versions
 		LatestVisible = "style='display:none;'"
-		If ( rsDeps("pv_id") <> rsDeps("lpv_id") ) AND ( NOT disabled ) Then
+		If ( PVID <> rsDeps("lpv_id") ) AND ( NOT disabled ) Then
 			LatestVisible = ""
 		End If
-		SShtml_pkg_list = SShtml_pkg_list &"  <td background='images/bg_form_lightgray.gif' class='sublbox_hitem'><DIV id='divLPV"& rsDeps("pv_id") &"' name='divLPV"& rsDeps("pv_id") &"' "& LatestVisible &">"&_
+		SShtml_pkg_list = SShtml_pkg_list &"  <td background='images/bg_form_lightgray.gif' class='sublbox_hitem'><DIV id='divLPV"& PVID &"' name='divLPV"& PVID &"' "& LatestVisible &">"&_
-								  		      "<a href='javascript:;' onClick='Merge_Version ( ""pkgn"& rsDeps("pv_id") &""", """& rsDeps("lpkg_version") &""", ""divLPV"& rsDeps("pv_id") &""" );'>"&_
+								  		      "<a href='javascript:;' onClick='Merge_Version ( """& PVID &""", """& rsDeps("lpkg_version") &""" );'>"&_
 											  "<img src='images/bt_move_left.gif' border='0' alt='Bring over this latest version' hspace='2' align='absmiddle'>"&_
-											  "</a>"& rsDeps("lpkg_version") &"<input name='lp"& rsDeps("pv_id") &"' type='hidden' value='"& rsDeps("lpkg_version") &"'></DIV></td> "
+											  "</a>"& rsDeps("lpkg_version") &"<input name='lp"& PVID &"' type='hidden' value='"& rsDeps("lpkg_version") &"'></DIV></td> "
 		SShtml_pkg_list = SShtml_pkg_list &"</tr>"
 		If disabled Then
 			' Store not found dependency as hidden field.
 			' NOTE: This is not safe as the client can temper with hidden value but it will do for now.
-			SShtml_pkg_list = SShtml_pkg_list &"<input type='hidden' name='pkgn"& rsDeps("pv_id") &"' value='"& rsDeps("pkg_version") &"'>"
+			SShtml_pkg_list = SShtml_pkg_list &"<input type='hidden' name='pkgn"& PVID &"' value='"& rsDeps("pkg_version") &"'>"
 		Else
-			SSJSreq = SSJSreq & ",'pkgn"& rsDeps("pv_id") &"','"& rsDeps("pkg_name") &" Version','RisVersionStr'"
+			SSJSreq = SSJSreq & ",'pkgn"& PVID &"','"& rsDeps("pkg_name") &" Version','RisVersionStr'"
 		End If
 		rsDeps.MoveNext
 	WEnd
 	If SSJSreq <> "" Then SSJSreq = Right( SSJSreq, Len(SSJSreq)-1 )		' Remove first comma
 <script type="text/javascript" src="scripts/json2.js"></script>
 <script language="JavaScript" type="text/JavaScript">
 <!--
 // Restore original value
-function Merge_Version ( pkgtxt_name, lpkg_version, lpkg_div ) {
+function Merge_Version (pv_id, lpkg_version) {
+    endEditVerNum(pv_id);
+    var ediv = MM_findObj("divLPV"+ pv_id );
+    var epkg = MM_findObj("pkgn"+ pv_id );
-    MM_findObj( pkgtxt_name ).value = lpkg_version;
+    if(epkg) epkg.value = lpkg_version;
-	MM_findObj(lpkg_div).style.display = "none";
+    if(ediv) ediv.style.display = "none";
+}
 // Highlight diff between release and user selection
 function Compare_Version ( pv_id ) {
 	var cv, lv, el;
     el = MM_findObj( "pkgn" + pv_id );
 	cv = (el) ? el.value : 0;
 	lv = MM_findObj( "lp" + pv_id ).value;
-	if ( cv != lv ) {
-		MM_findObj( "divLPV"+ pv_id ).style.display = "block";
+    var ediv = MM_findObj("divLPV"+ pv_id );
-	} else {
-		MM_findObj( "divLPV"+ pv_id ).style.display = "none";
+    ediv.style.display = (cv == lv) ? 'none' : 'block';
-	}
+}
 // Edit the version number
-var editElementSaved;
-var editElement;
-var editElementValue;
+var editData = new Object();
 function editVerNum(NNpkg_id, NN_pv_id)
+{
-    // Determine element to be edited
+    // Only initiate the edit once
+    if (editData[NN_pv_id])
+    {
+        endEditVerNum(NN_pv_id);
+        return;
+    }
-    // Won't be found if we are editing one.
+    // Get the base element in the document
     var elem = document.getElementById('pkgn' + NN_pv_id );
+    var elemed = document.getElementById('edpkgn' + NN_pv_id );
-    if ( !elem)
+    if ( ! (elem && elemed) )
         return;
-    // Only edit one at a time
+    // Show edit element and hide the fixed text
-    // Close previous one first
+    elem.style.display = 'none';
-    if (editElementSaved) {
+    elemed.style.display = '';
-        endEditVerNum();
-    }
-    // Create a new selection element
     // Populate essential fields
-    var nel = document.createElement("select");
+    elemed.onchange = function(){editUpdate(NN_pv_id);}
-    nel.style.width = '10em';
-    nel.className = elem.className;
-    nel.id = 'ed' + elem.id;
-    nel.onblur = endEditVerNum;
+    elemed.onblur = elemed.onchange;
-    nel.onchange = function(){Compare_Version(NN_pv_id);}
     // Create a dummy selection to indicate loading
     var el = document.createElement("option");
     var vname = "Loading";
     el.textContent = vname;
     el.value = vname;
-    nel.appendChild(el);
+    elemed.appendChild(el);
-    // Save element and replace the DOM with our edit element
+    // Save refs to the two elements
-    editElementSaved = elem;
+    var np = editData[NN_pv_id] = new Object();
-    editElement = nel;
+    np.edit = elemed;
-    editElementValue = elem.value;
+    np.elem = elem;
-    elem.parentNode.replaceChild(nel, elem);
+    np.Value = elem.value;
     // Load version data into this new element
     getVersions(NNpkg_id, NN_pv_id);
+}
+function editUpdate(NN_pv_id)
+{
+    var sd = editData[NN_pv_id];
-// Only one element is being edited at any one time
+    sd.elem.value = sd.edit.value;
+    Compare_Version(NN_pv_id);
+}
 // Globals are used to save state information
-function endEditVerNum()
+function endEditVerNum(NN_pv_id)
+{
+    var sd = editData[NN_pv_id];
-    if (editElementSaved ) {
+    if (sd) {
-        editElementSaved.value = editElement.value;
+        sd.elem.value = sd.edit.value;
-        editElement.parentNode.replaceChild(editElementSaved, editElement);
+        sd.edit.style.display = 'none';
-        editElementSaved.onblur();
+        sd.elem.style.display = '';
-        editElementSaved = null;
+        delete editData[NN_pv_id];
+    }
+}
 // Allow the user to populate the version selector box
 // Enables the selector once its been populated
             alert("Invalid responce from Release Manager");
             return;
+        }
         var ref = myJson.VersionRef;
+        var sd = editData[ref];
-        var select = document.getElementById("edpkgn" + ref);
+        var select = sd.edit;
+        var sv = (sd) ? sd.Value  : 0;
         select.innerHTML = '';
         select.disabled = false;
         for( var ii=0; ii< myJson.Versions.length; ii++)
+        {
             var el = document.createElement("option");
             var vname = myJson.Versions[ii].vname;
-            el.selected = ( vname == editElementValue );
+            el.selected = ( vname == sv );
             var p1 = el.selected ? '>' : ' ';
             var p2 = (myJson.Versions[ii].dlocked == "Y") ? 'R ' : '    ';
             el.textContent = p1 + p2 + vname;
             el.value = vname;

Subversion Repositories DevTools

(root)/ManagerSuite/Release_Manager/branches/dpurdie/form_edit_deps.asp – Rev 3901 → 3902