Subversion Repositories DevTools

Rev

Rev 13 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 13 Rev 23
Line 150... Line 150...
150
	If rsQry.RecordCount > 0 Then
150
	If rsQry.RecordCount > 0 Then
151
		aDiffList = rsQry.GetRows()
151
		aDiffList = rsQry.GetRows()
152
		
152
		
153
	Else
153
	Else
154
		'-- No differencses with Release Manager, hence exit
154
		'-- No differencses with Release Manager, hence exit
-
 
155
		OraDatabase.Parameters.Remove "BOM_ID"
155
		Exit Sub
156
		Exit Sub
156
	End If
157
	End If
157
	
158
	
158
	
159
	
159
	
160
	
Line 190... Line 191...
190
	OraDatabase.Parameters.Remove "NEW_PROD_ID"
191
	OraDatabase.Parameters.Remove "NEW_PROD_ID"
191
	OraDatabase.Parameters.Remove "OS_ID"
192
	OraDatabase.Parameters.Remove "OS_ID"
192
	OraDatabase.Parameters.Remove "USER_ID"
193
	OraDatabase.Parameters.Remove "USER_ID"
193
End Sub
194
End Sub
194
'----------------------------------------------------------------------------------------------------------------------------------
195
'----------------------------------------------------------------------------------------------------------------------------------
-
 
196
Sub HideProducts()
-
 
197
	Dim aDiffList, numOfRows, rowNum, OraParameter
-
 
198
	Const os_id_column = 2
-
 
199
	Const old_prod_id_column = 1
-
 
200
	
-
 
201
	'/* Get Lates Release Manager */
-
 
202
	OraDatabase.Parameters.Add "BOM_ID", parBom_id,		ORAPARM_INPUT, ORATYPE_NUMBER 
-
 
203
	OraDatabase.Parameters.Add "RTAG_ID", objFormCollector.Item("rtag_id_fk"),		ORAPARM_INPUT, ORATYPE_NUMBER 
-
 
204
	
-
 
205
	Set rsQry = OraDatabase.DbCreateDynaset( GetQuery ("CompareBomWithLatestFromRM.sql"), ORADYN_DEFAULT )
-
 
206
	
-
 
207
	
-
 
208
	'-- Get Rows
-
 
209
	If rsQry.RecordCount > 0 Then
-
 
210
		aDiffList = rsQry.GetRows()
-
 
211
		
-
 
212
	Else
-
 
213
		'-- No differencses with Release Manager, hence exit
-
 
214
		OraDatabase.Parameters.Remove "BOM_ID"
-
 
215
		OraDatabase.Parameters.Remove "RTAG_ID"
-
 
216
		Exit Sub
-
 
217
		
-
 
218
	End If
-
 
219
	
-
 
220
	
-
 
221
	
-
 
222
	'/* Update Versions */
-
 
223
	On Error Resume Next
-
 
224
	
-
 
225
	OraDatabase.Parameters.Add "NEW_PROD_ID", 	0, 	ORAPARM_INPUT, ORATYPE_NUMBER 
-
 
226
	OraDatabase.Parameters.Add "OS_ID", 		0, 	ORAPARM_INPUT, ORATYPE_NUMBER 
-
 
227
	OraDatabase.Parameters.Add "USER_ID", 		objAccessControl.UserId, 	ORAPARM_INPUT, ORATYPE_NUMBER 
-
 
228
	
-
 
229
	Set OraParameter = OraDatabase.Parameters
-
 
230
	
-
 
231
	
-
 
232
	
-
 
233
	objEH.TryORA ( OraSession )
-
 
234
	
-
 
235
	numOfRows = UBound( aDiffList, 2 )
-
 
236
	
-
 
237
	For rowNum = 0 To numOfRows
-
 
238
		
-
 
239
		If Request("hide_"& aDiffList( os_id_column, rowNum ) &"_"& aDiffList( old_prod_id_column, rowNum ) ) <> "" Then
-
 
240
			OraParameter("NEW_PROD_ID").Value = Request("hide_"& aDiffList( os_id_column, rowNum ) &"_"& aDiffList( old_prod_id_column, rowNum ) )
-
 
241
			OraParameter("OS_ID").Value = aDiffList( os_id_column, rowNum )
-
 
242
			
-
 
243
			OraDatabase.ExecuteSQL "BEGIN   pk_Product.Hide_Product ( :NEW_PROD_ID, :OS_ID, :USER_ID );   END;"
-
 
244
		End If
-
 
245
		
-
 
246
	Next
-
 
247
	
-
 
248
	
-
 
249
	'--- Log Action ---
-
 
250
	'objEH.LogAction  _
-
 
251
	'objAccessControl.UserId, _
-
 
252
	'enumAT_EVENT_COMMENT, _
-
 
253
	'"Sub UpdateProducts for OS list="& Request("spos_id_list"), _
-
 
254
	'SCRIPT_NAME, _
-
 
255
	'"Updated Products with new versions.", _
-
 
256
	'OraDatabase
-
 
257
	
-
 
258
	
-
 
259
	objEH.CatchORA ( OraSession )	
-
 
260
	
-
 
261
	OraDatabase.Parameters.Remove "BOM_ID"
-
 
262
	OraDatabase.Parameters.Remove "RTAG_ID"
-
 
263
	OraDatabase.Parameters.Remove "OLD_PROD_ID"
-
 
264
	OraDatabase.Parameters.Remove "NEW_PROD_ID"
-
 
265
	OraDatabase.Parameters.Remove "OS_ID"
-
 
266
	OraDatabase.Parameters.Remove "USER_ID"
-
 
267
End Sub
-
 
268
'----------------------------------------------------------------------------------------------------------------------------------
-
 
269
Sub HidePatches()
-
 
270
	Dim aDiffList, numOfRows, rowNum, OraParameter
-
 
271
	Const os_id_column = 2
-
 
272
	Const prod_id_column = 1
-
 
273
	
-
 
274
	'/* Get Lates Release Manager */
-
 
275
	OraDatabase.Parameters.Add "BOM_ID", parBom_id,		ORAPARM_INPUT, ORATYPE_NUMBER 
-
 
276
	
-
 
277
	Set rsQry = OraDatabase.DbCreateDynaset( GetQuery ("NewPatches.sql"), ORADYN_DEFAULT )
-
 
278
	
-
 
279
	
-
 
280
	'-- Get Rows
-
 
281
	If rsQry.RecordCount > 0 Then
-
 
282
		aDiffList = rsQry.GetRows()
-
 
283
		
-
 
284
	Else
-
 
285
		'-- No differencses with Release Manager, hence exit
-
 
286
		OraDatabase.Parameters.Remove "BOM_ID"
-
 
287
		Exit Sub
-
 
288
	End If
-
 
289
	
-
 
290
	
-
 
291
	
-
 
292
	'/* Hide Versions */
-
 
293
	On Error Resume Next
-
 
294
	
-
 
295
	OraDatabase.Parameters.Add "NEW_PROD_ID", 	0, 	ORAPARM_INPUT, ORATYPE_NUMBER 
-
 
296
	OraDatabase.Parameters.Add "OS_ID", 		0, 	ORAPARM_INPUT, ORATYPE_NUMBER 
-
 
297
	OraDatabase.Parameters.Add "USER_ID", 		objAccessControl.UserId, 	ORAPARM_INPUT, ORATYPE_NUMBER 
-
 
298
	
-
 
299
	Set OraParameter = OraDatabase.Parameters
-
 
300
	
-
 
301
		
-
 
302
	
-
 
303
	objEH.TryORA ( OraSession )
-
 
304
	
-
 
305
	numOfRows = UBound( aDiffList, 2 )
-
 
306
	
-
 
307
	
-
 
308
	For rowNum = 0 To numOfRows
-
 
309
		
-
 
310
		If Request("hide_"& aDiffList( os_id_column, rowNum ) &"_"& aDiffList( prod_id_column, rowNum ) ) <> "" Then
-
 
311
			OraParameter("NEW_PROD_ID").Value = Request("hide_"& aDiffList( os_id_column, rowNum ) &"_"& aDiffList( prod_id_column, rowNum ) )
-
 
312
			OraParameter("OS_ID").Value = aDiffList( os_id_column, rowNum )
-
 
313
			
-
 
314
			OraDatabase.ExecuteSQL "BEGIN   pk_Product.Hide_Product ( :NEW_PROD_ID, :OS_ID, :USER_ID );   END;"
-
 
315
		End If
-
 
316
		
-
 
317
	Next
-
 
318
	
-
 
319
	
-
 
320
	objEH.CatchORA ( OraSession )	
-
 
321
	
-
 
322
	OraDatabase.Parameters.Remove "BOM_ID"
-
 
323
	OraDatabase.Parameters.Remove "NEW_PROD_ID"
-
 
324
	OraDatabase.Parameters.Remove "OS_ID"
-
 
325
	OraDatabase.Parameters.Remove "USER_ID"
-
 
326
End Sub
-
 
327
'----------------------------------------------------------------------------------------------------------------------------------
195
%>
328
%>
196
<%
329
<%
197
'------------ RUN BEFORE PAGE RENDER ----------
330
'------------ RUN BEFORE PAGE RENDER ----------
198
Call GetFormDetails ( parBom_id, objFormCollector )
331
Call GetFormDetails ( parBom_id, objFormCollector )
199
 
332
 
Line 201... Line 334...
201
	' --- Form is Valid ---
334
	' --- Form is Valid ---
202
	Call UpdateProducts()
335
	Call UpdateProducts()
203
	
336
	
204
	Call AddPatches()
337
	Call AddPatches()
205
	
338
	
-
 
339
	Call HideProducts()
-
 
340
	
-
 
341
	Call HidePatches()
-
 
342
	
206
	If objEH.Finally Then
343
	If objEH.Finally Then
207
		Call OpenInParentWindow ( Request("rfile") &"?UPDATED=OK"& objPMod.ComposeURLWithout("rfile") )
344
		Call OpenInParentWindow ( Request("rfile") &"?UPDATED=OK"& objPMod.ComposeURLWithout("rfile") )
208
		Call CloseWindow()
345
		Call CloseWindow()
209
	End If
346
	End If
210
End If
347
End If
Line 230... Line 367...
230
  checkflag = "false";
367
  checkflag = "false";
231
  return "Check all"; }
368
  return "Check all"; }
232
}
369
}
233
//  End -->
370
//  End -->
234
</script>
371
</script>
-
 
372
<script language="javascript">
-
 
373
function checkAllHide()
-
 
374
{
-
 
375
  var args = arguments;
-
 
376
  start_point:
-
 
377
  for (var i=0;i<document.forms[0].elements.length;i++)
-
 
378
  {
-
 
379
 
-
 
380
     found = false;   
-
 
381
     var e=document.forms[0].elements[i];
-
 
382
     if ((e.name != 'checkall') && (e.type=='checkbox'))
-
 
383
     {
-
 
384
        for (var j = 0; j < args.length; j++)
-
 
385
           if (args[j] == e.name)
-
 
386
             continue start_point;
-
 
387
 
-
 
388
       e.checked=document.forms[0].checkallhide.checked;
-
 
389
    }
-
 
390
  }
-
 
391
}
-
 
392
function checkAllAdd()
-
 
393
{
-
 
394
  var args = arguments;
-
 
395
  start_point:
-
 
396
  for (var i=0;i<document.forms[0].elements.length;i++)
-
 
397
  {
-
 
398
 
-
 
399
     found = false;   
-
 
400
     var e=document.forms[0].elements[i];
-
 
401
     if ((e.name != 'checkall') && (e.type=='checkbox'))
-
 
402
     {
-
 
403
        for (var j = 0; j < args.length; j++)
-
 
404
           if (args[j] == e.name)
-
 
405
             continue start_point;
-
 
406
 
-
 
407
       e.checked=document.forms[0].checkalladd.checked;
-
 
408
    }
-
 
409
  }
-
 
410
}
-
 
411
</script>
235
 
412
 
236
 
413
 
237
<title>Deployment Manager</title>
414
<title>Deployment Manager</title>
238
<meta HTTP-EQUIV="Pragma" CONTENT="no-cache">
415
<meta HTTP-EQUIV="Pragma" CONTENT="no-cache">
239
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
416
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
Line 289... Line 466...
289
          <table width="100%"  border="0" cellspacing="3" cellpadding="0">
466
          <table width="100%"  border="0" cellspacing="3" cellpadding="0">
290
            <tr>
467
            <tr>
291
			  <td width="1%" nowrap background="images/bg_bage_0h.gif" class="body_col">Update</td>
468
			  <td width="1%" nowrap background="images/bg_bage_0h.gif" class="body_col">Update</td>
292
              <td width="40%" align="right" nowrap background="images/bg_bage_0h.gif" class="body_col"><div align="left">Location</div></td>
469
              <td width="40%" align="right" nowrap background="images/bg_bage_0h.gif" class="body_col"><div align="left">Location</div></td>
293
              <td width="20%" align="right" nowrap background="images/bg_bage_0h.gif" class="body_col"><div align="left">Version</div></td>
470
              <td width="20%" align="right" nowrap background="images/bg_bage_0h.gif" class="body_col"><div align="left">Version</div></td>
-
 
471
              <td align="right" background="images/bg_bage_0h.gif" class="body_col"><div align="center">Hide</div></td>
294
              <td align="right" background="images/bg_bage_0h.gif" class="body_col"><div align="left"><img src="images/spacer.gif" width="1" height="18" align="absmiddle">Latest</div>                <div align="left"></div></td>
472
              <td align="right" background="images/bg_bage_0h.gif" class="body_col"><div align="left"><img src="images/spacer.gif" width="1" height="18" align="absmiddle">Latest</div>                <div align="left"></div></td>
295
              </tr>
473
              </tr>	  
296
			<%
474
			<%
297
			OraDatabase.Parameters.Add "BOM_ID", parBom_id,		ORAPARM_INPUT, ORATYPE_NUMBER 
475
			OraDatabase.Parameters.Add "BOM_ID", parBom_id,		ORAPARM_INPUT, ORATYPE_NUMBER 
298
			OraDatabase.Parameters.Add "RTAG_ID", objFormCollector.Item("rtag_id_fk"),		ORAPARM_INPUT, ORATYPE_NUMBER 
476
			OraDatabase.Parameters.Add "RTAG_ID", objFormCollector.Item("rtag_id_fk"),		ORAPARM_INPUT, ORATYPE_NUMBER 
299
			
477
			
300
			Set rsQry = OraDatabase.DbCreateDynaset( GetQuery ("CompareBomWithLatestFromRM.sql"), ORADYN_DEFAULT )
478
			Set rsQry = OraDatabase.DbCreateDynaset( GetQuery ("CompareBomWithLatestFromRM.sql"), ORADYN_DEFAULT )
301
			currPkg_id = 0
479
			currPkg_id = 0
302
			%>
480
			%>
303
			<%If rsQry.RecordCount < 1 Then%>
481
			<%If rsQry.RecordCount < 1 Then%>
304
			<tr>
482
			<tr>
305
              <td colspan="4" class="body_row">No Products to Update.                 </td>
483
              <td colspan="5" class="body_row">No Products to Update.                 </td>
306
            </tr>
484
            </tr>
307
			<%End If%>
485
			<%End If%>
308
			<%
486
			<%
309
			While (NOT rsQry.BOF) AND (NOT rsQry.EOF)
487
			While (NOT rsQry.BOF) AND (NOT rsQry.EOF)
-
 
488
			Dim rsTemp
-
 
489
			
-
 
490
			Set rsTemp = OraDatabase.DbCreateDynaset( "SELECT * FROM HIDE_PRODUCTS WHERE OS_ID="& rsQry("os_id") &" AND PROD_ID="& rsQry("prod_id"), ORADYN_DEFAULT )
-
 
491
			
-
 
492
			If rsTemp.RecordCount = 0 Then			
-
 
493
			
-
 
494
			
310
			%>
495
			%>
311
			<%If currPkg_id <> rsQry("pkg_id") Then%>
496
			<%If currPkg_id <> rsQry("pkg_id") Then%>
312
            <tr>
497
            <tr>
313
			  <td nowrap><div align="left"><span class="body_row"><img src="icons/i_product.gif" width="19" height="19" hspace="2" align="absmiddle"><%=rsQry("prod_name")%>                                                                     				   </span></div></td>
498
			  <td nowrap><div align="left"><span class="body_row"><img src="icons/i_product.gif" width="19" height="19" hspace="2" align="absmiddle"><%=rsQry("prod_name")%>                                                                     				   </span></div></td>
314
              <td nowrap></td>
499
              <td nowrap></td>
315
              <td nowrap class="body_row">&nbsp;</td>
500
              <td nowrap class="body_row">&nbsp;</td>
-
 
501
              <td nowrap class="body_row"><div align="center"></div></td>
316
              <td nowrap class="body_row"></td>
502
              <td nowrap class="body_row"></td>
317
              </tr>
503
              </tr>
318
			<tr>
504
			<tr>
319
              <td colspan="4" background="images/bg_table_border.gif"><img src="images/spacer.gif" width="1" height="1"></td>
505
              <td colspan="5" background="images/bg_table_border.gif"><img src="images/spacer.gif" width="1" height="1"></td>
320
            </tr>
506
            </tr>
321
			<%currPkg_id = rsQry("pkg_id")%>
507
			<%currPkg_id = rsQry("pkg_id")%>
322
			<%End If%>
508
			<%End If%>
323
			
509
			
324
            <tr>
510
            <tr>
325
              <td align="center" nowrap><input type="checkbox" name="update_<%=rsQry("os_id") &"_"& rsQry("prod_id")%>" value="<%=rsQry("latest_prod_id")%>"> </td>
511
              <td align="center" nowrap><input type="checkbox" name="update_<%=rsQry("os_id") &"_"& rsQry("prod_id")%>" value="<%=rsQry("latest_prod_id")%>"> </td>
326
              <td nowrap class="body_row"><img hspace="2" src="icons/<%=rsQry("node_icon")%>" align="absmiddle" border="0"><%=rsQry("prod_location")%></td>
512
              <td nowrap class="body_row"><img hspace="2" src="icons/<%=rsQry("node_icon")%>" align="absmiddle" border="0"><%=rsQry("prod_location")%></td>
327
              <td nowrap class="body_row"><%=rsQry("prod_version")%></td>
513
              <td nowrap class="body_row"><%=rsQry("prod_version")%></td>
-
 
514
			  <td align="center" nowrap><input type="checkbox" name="hide_<%=rsQry("os_id") &"_"& rsQry("prod_id")%>" value="<%=rsQry("prod_id")%>"> </td>
328
              <td nowrap class="body_row"><span class="body_txtr"><%=rsQry("rm_latest_version")%></span></td>
515
              <td nowrap class="body_row"><span class="body_txtr"><%=rsQry("rm_latest_version")%></span></td>
329
              </tr>
516
              </tr>
330
			<tr>
517
			<tr>
331
              <td colspan="4" background="images/bg_table_border.gif"><img src="images/spacer.gif" width="1" height="1"></td>
518
              <td colspan="5" background="images/bg_table_border.gif"><img src="images/spacer.gif" width="1" height="1"></td>
332
            </tr>
519
            </tr>
-
 
520
			<%
-
 
521
			End If
333
			
522
			
-
 
523
			rsTemp.Close()
-
 
524
			Set rsTemp = nothing
-
 
525
			
-
 
526
			%>			
334
            <%rsQry.MoveNext
527
            <%rsQry.MoveNext
335
			Wend
528
			Wend
336
			%>
529
			%>
337
		  
530
		  
338
		  <!-- NEW PATCHES +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
531
		  <!-- NEW PATCHES +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
339
		    <%
532
		    <%
-
 
533
			Dim strAdd, rsAdd, strHide
340
			Set rsQry = OraDatabase.DbCreateDynaset( GetQuery ("NewPatches.sql"), ORADYN_DEFAULT )
534
			Set rsQry = OraDatabase.DbCreateDynaset( GetQuery ("NewPatches.sql"), ORADYN_DEFAULT )
-
 
535
			Set rsAdd = OraDatabase.DbCreateDynaset( GetQuery ("NewPatches.sql"), ORADYN_DEFAULT )
341
			currPkg_id = 0
536
			currPkg_id = 0
342
			%>
537
			%>
343
			
538
			
344
			<%If rsQry.RecordCount > 0 Then%>
539
			<%If rsQry.RecordCount > 0 Then
-
 
540
				While (NOT rsAdd.BOF) AND (NOT rsAdd.EOF)
-
 
541
				Set rsTemp = OraDatabase.DbCreateDynaset( "SELECT * FROM HIDE_PRODUCTS WHERE OS_ID="& rsAdd("os_id") &" AND PROD_ID="& rsAdd("prod_id"), ORADYN_DEFAULT )
-
 
542
			
-
 
543
				If rsTemp.RecordCount = 0 Then					
-
 
544
					strAdd = strAdd + "'add_"&rsAdd("os_id") &"_"& rsAdd("prod_id")&"',"
-
 
545
					strHide = strHide + "'hide_"&rsAdd("os_id") &"_"& rsAdd("prod_id")&"',"
-
 
546
				End If	
-
 
547
					rsAdd.MoveNext
-
 
548
				Wend
-
 
549
					
-
 
550
				rsAdd.Close()
-
 
551
				rsTemp.Close()
-
 
552
				Set rsAdd = nothing
-
 
553
				Set rsTemp = nothing
-
 
554
				
-
 
555
				If NOT IsEmpty(strAdd) Then
-
 
556
					strAdd = Mid(strAdd, 1, Len(strAdd)-1) + ", 'checkalladd'"
-
 
557
				End If
-
 
558
				If NOT IsEmpty(strHide) Then
-
 
559
					strHide = Mid(strHide, 1, Len(strHide)-1) + ", 'checkallhide'"
-
 
560
				End If				
-
 
561
 
-
 
562
			%>
-
 
563
			
345
		    <tr>
564
		    <tr>
346
			  <td nowrap background="images/bg_bage_0h.gif" class="body_col" align="center">Add</td>
565
			  <td nowrap background="images/bg_bage_0h.gif" class="body_col" align="center">Add</td>
347
              <td align="right" nowrap background="images/bg_bage_0h.gif" class="body_col"><div align="left">Location</div></td>
566
              <td align="right" nowrap background="images/bg_bage_0h.gif" class="body_col"><div align="left">Location</div></td>
348
			  <td align="right" nowrap background="images/bg_bage_0h.gif" class="body_col"><div align="left">Version</div></td>
567
			  <td align="right" nowrap background="images/bg_bage_0h.gif" class="body_col"><div align="left">Version</div></td>
-
 
568
              <td align="right" background="images/bg_bage_0h.gif" class="body_col"><div align="center">Hide</div></td>
349
              <td align="right" background="images/bg_bage_0h.gif" class="body_col"><div align="left">Comments<img src="images/spacer.gif" width="1" height="18" align="absmiddle"></div>                </td>
569
              <td align="right" background="images/bg_bage_0h.gif" class="body_col"><div align="left">Comments<img src="images/spacer.gif" width="1" height="18" align="absmiddle"></div>                </td>
350
              </tr>
570
              </tr>
-
 
571
			  <%If NOT IsEmpty(strAdd) Then%>
351
			
572
			  <tr>
-
 
573
			   <td align="center" nowrap><INPUT type=checkbox name="checkalladd" value="Check All" onClick="checkAllAdd(<%=strHide%>);"></td>
-
 
574
			   <td nowrap class="body_row">&nbsp;</td>
-
 
575
			   <td nowrap class="body_row">&nbsp;</td>
-
 
576
			   <td align="center" nowrap><INPUT type=checkbox name="checkallhide" value="Check All" onClick="checkAllHide(<%=strAdd%>);"></td>
-
 
577
			   <td nowrap class="body_row">&nbsp;</td>
-
 
578
			  </tr>
-
 
579
			<%End If%>
352
			<%
580
			<%
353
			While (NOT rsQry.BOF) AND (NOT rsQry.EOF)
581
			While (NOT rsQry.BOF) AND (NOT rsQry.EOF)
-
 
582
 
-
 
583
			
-
 
584
			Set rsTemp = OraDatabase.DbCreateDynaset( "SELECT * FROM HIDE_PRODUCTS WHERE OS_ID="& rsQry("os_id") &" AND PROD_ID="& rsQry("prod_id"), ORADYN_DEFAULT )
-
 
585
			
-
 
586
			If rsTemp.RecordCount = 0 Then
-
 
587
			
354
			%>
588
			%>
355
			<%If currPkg_id <> rsQry("pkg_id") Then%>
589
			<%If currPkg_id <> rsQry("pkg_id") Then%>
356
            <tr>
590
            <tr>
357
			  <td colspan="2" nowrap><div align="left"><span class="body_row"><img src="icons/i_product.gif" width="19" height="19" hspace="2" align="absmiddle"><%=rsQry("prod_name")%></span></div></td>
591
			  <td colspan="2" nowrap><div align="left"><span class="body_row"><img src="icons/i_product.gif" width="19" height="19" hspace="2" align="absmiddle"><%=rsQry("prod_name")%></span></div></td>
358
              <td nowrap class="body_row">&nbsp;</td>
592
              <td nowrap class="body_row">&nbsp;</td>
-
 
593
              <td nowrap class="body_row"><div align="center"></div></td>
359
              <td nowrap class="body_row"></td>
594
              <td nowrap class="body_row"></td>
360
              </tr>
595
              </tr>
361
			<tr>
596
			<tr>
362
              <td colspan="4" background="images/bg_table_border.gif"><img src="images/spacer.gif" width="1" height="1"></td>
597
              <td colspan="5" background="images/bg_table_border.gif"><img src="images/spacer.gif" width="1" height="1"></td>
363
            </tr>
598
            </tr>
364
			<%currPkg_id = rsQry("pkg_id")%>
599
			<%currPkg_id = rsQry("pkg_id")%>
365
			<%End If%>
600
			<%End If%>
366
			
601
			
367
            <tr>
602
            <tr>
368
              <td align="center" nowrap><input type="checkbox" name="add_<%=rsQry("os_id") &"_"& rsQry("prod_id")%>" value="<%=rsQry("prod_id")%>"> </td>
603
              <td align="center" nowrap><input type="checkbox" name="add_<%=rsQry("os_id") &"_"& rsQry("prod_id")%>" value="<%=rsQry("prod_id")%>"> </td>
369
              <td nowrap class="body_row"><img hspace="2" src="icons/<%=rsQry("node_icon")%>" align="absmiddle" border="0"><%=rsQry("prod_location")%></td>
604
              <td nowrap class="body_row"><img hspace="2" src="icons/<%=rsQry("node_icon")%>" align="absmiddle" border="0"><%=rsQry("prod_location")%></td>
370
              <td nowrap class="body_row"><img src="icons/i_patch_small.gif" width="16" height="16" border="0" align="absmiddle"><%=rsQry("prod_version")%></td>
605
              <td nowrap class="body_row"><img src="icons/i_patch_small.gif" width="16" height="16" border="0" align="absmiddle"><%=rsQry("prod_version")%></td>
-
 
606
              <td align="center" nowrap><input type="checkbox" name="hide_<%=rsQry("os_id") &"_"& rsQry("prod_id")%>" value="<%=rsQry("prod_id")%>"> </td>
371
              <td nowrap class="body_row"><span class="body_row"><%=rsQry("comments")%></span></td>
607
              <td nowrap class="body_row"><span class="body_row"><%=rsQry("comments")%></span></td>
372
              </tr>
608
              </tr>
373
			<tr>
609
			<tr>
374
              <td colspan="4" background="images/bg_table_border.gif"><img src="images/spacer.gif" width="1" height="1"></td>
610
              <td colspan="5" background="images/bg_table_border.gif"><img src="images/spacer.gif" width="1" height="1"></td>
375
            </tr>
611
            </tr>
-
 
612
			<%
-
 
613
			End If
-
 
614
			
-
 
615
			rsTemp.Close()
-
 
616
			Set rsTemp = nothing
-
 
617
			
-
 
618
			%>
376
			
619
			
377
            <%rsQry.MoveNext
620
            <%rsQry.MoveNext
378
			Wend
621
			Wend
379
			%>
622
			%>
380
			
623
			
381
			<%End If%>
624
			<%End If%>
382
			
625
			
383
			<tr>
626
			<tr>
384
              <td colspan="4" background="images/bg_table_border.gif"><img src="images/spacer.gif" width="1" height="3"></td>
627
              <td colspan="5" background="images/bg_table_border.gif"><img src="images/spacer.gif" width="1" height="3"></td>
385
            </tr>
628
            </tr>
386
          </table>
629
          </table>
387
		  
630
		  
388
		  
631
		  
389
		  <%
632
		  <%