Subversion Repositories DevTools

Rev

Rev 6696 | Rev 7286 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 6696 Rev 7029
Line 276... Line 276...
276
 
276
 
277
   selectedFound = False
277
   selectedFound = False
278
 
278
 
279
   numPackages = 0
279
   numPackages = 0
280
 
280
 
281
   If (NNop_code = OP_CODE_1_TEST_BUILD_PACKAGE) Then
281
   If (NNop_code = OP_CODE_1_TEST_BUILD_PACKAGE ) Then
282
      ' Get list of packages from from work_in_progress table
282
      ' Get list of packages from from work_in_progress table
283
      Query_String = "SELECT pk.pkg_id, pk.pkg_name, pv.pkg_version, wip.pv_id "&_
283
      Query_String = "SELECT pk.pkg_id, pk.pkg_name, pv.pkg_version, wip.pv_id "&_
284
                     "  FROM work_in_progress wip, release_tags rt, packages pk, package_versions pv "&_
284
                     "  FROM work_in_progress wip, release_tags rt, packages pk, package_versions pv "&_
285
                     " WHERE wip.rtag_id = "& Cstr(NNrtag_id) &_
285
                     " WHERE wip.rtag_id = "& Cstr(NNrtag_id) &_
286
                     "   AND wip.rtag_id = rt.rtag_id"&_
286
                     "   AND wip.rtag_id = rt.rtag_id"&_
287
                     "   AND ((rt.official = 'N') OR (rt.official = 'C') OR (rt.official = 'R'))"&_
287
                     "   AND ((rt.official = 'N') OR (rt.official = 'C') OR (rt.official = 'R'))"&_
288
                     "   AND wip.pv_id = pv.pv_id"&_
288
                     "   AND wip.pv_id = pv.pv_id"&_
289
                     "   AND pk.pkg_id = pv.pkg_id"&_
289
                     "   AND pk.pkg_id = pv.pkg_id"&_
290
                     " ORDER BY UPPER(pkg_name)"
290
                     " ORDER BY UPPER(pkg_name)"
291
 
291
 
-
 
292
   ElseIf ( NNop_code = OP_CODE_2_FUTURE_BUILD) Then
-
 
293
      ' Get list of packages from from Pending Approval table
-
 
294
      Query_String = "SELECT pk.pkg_id, pk.pkg_name, pv.pkg_version, wip.pv_id "&_
-
 
295
                     "  FROM planned wip, release_tags rt, packages pk, package_versions pv "&_
-
 
296
                     " WHERE wip.rtag_id = "& Cstr(NNrtag_id) &_
-
 
297
                     "   AND wip.rtag_id = rt.rtag_id"&_
-
 
298
                     "   AND ((rt.official = 'N') OR (rt.official = 'C') OR (rt.official = 'R'))"&_
-
 
299
                     "   AND wip.pv_id = pv.pv_id"&_
-
 
300
                     "   AND pk.pkg_id = pv.pkg_id"&_
-
 
301
                     " ORDER BY UPPER(pkg_name)"
292
   Else
302
    Else
293
      ' Get list of packages from from release_content table
303
      ' Get list of packages from from release_content table
294
      Query_String = "SELECT pk.pkg_id, pk.pkg_name, pv.pkg_version, rc.pv_id "&_
304
      Query_String = "SELECT pk.pkg_id, pk.pkg_name, pv.pkg_version, rc.pv_id "&_
295
                     "  FROM release_content rc, release_tags rt, packages pk, package_versions pv "&_
305
                     "  FROM release_content rc, release_tags rt, packages pk, package_versions pv "&_
296
                     " WHERE rc.rtag_id = "& Cstr(NNrtag_id) &_
306
                     " WHERE rc.rtag_id = "& Cstr(NNrtag_id) &_
297
                     "   AND rc.rtag_id = rt.rtag_id"&_
307
                     "   AND rc.rtag_id = rt.rtag_id"&_
Line 304... Line 314...
304
	Set rsTemp = OraDatabase.DbCreateDynaset( Query_String, cint(0))
314
	Set rsTemp = OraDatabase.DbCreateDynaset( Query_String, cint(0))
305
 
315
 
306
   ' modify the control heading to indicate the source of the package version list
316
   ' modify the control heading to indicate the source of the package version list
307
   If (NNop_code = OP_CODE_1_TEST_BUILD_PACKAGE) Then
317
   If (NNop_code = OP_CODE_1_TEST_BUILD_PACKAGE) Then
308
      s = "<td class='nowrap'>WIP Package</td>"
318
      s = "<td class='nowrap'>WIP Package</td>"
-
 
319
   ElseIf (NNop_code = OP_CODE_2_FUTURE_BUILD) Then
-
 
320
      s = "<td class='nowrap'>Pending Package</td>"
309
   Else
321
   Else
310
      s = "<td class='nowrap'>Released Package</td>"
322
      s = "<td class='nowrap'>Released Package</td>"
311
   End If
323
   End If
312
 
324
 
313
   s = s + "<td><select id='pv_id' name='pv_id' class='form_item' onchange='Refresh_Page()'>"
325
   s = s + "<td><select id='pv_id' name='pv_id' class='form_item' onchange='Refresh_Page()'>"