Subversion Repositories DevTools

Rev

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

Rev 5898 Rev 7022
Line 346... Line 346...
346
   rsTemp.Close
346
   rsTemp.Close
347
   Set rsTemp = nothing
347
   Set rsTemp = nothing
348
 
348
 
349
End Sub
349
End Sub
350
'-------------------------------------------------------------------------------------
350
'-------------------------------------------------------------------------------------
351
Function PRIVATE_MakeApproved (NNrtag_id, NNpv_id)
351
Function PRIVATE_MakeApproved (NNrtag_id, NNpv_id, sScheduled)
352
 
352
 
353
   OraDatabase.Parameters.Add "PV_ID",   NNpv_id,                 ORAPARM_INPUT, ORATYPE_NUMBER
353
   OraDatabase.Parameters.Add "PV_ID",   NNpv_id,                 ORAPARM_INPUT, ORATYPE_NUMBER
354
   OraDatabase.Parameters.Add "RTAG_ID", NNrtag_id,               ORAPARM_INPUT, ORATYPE_NUMBER
354
   OraDatabase.Parameters.Add "RTAG_ID", NNrtag_id,               ORAPARM_INPUT, ORATYPE_NUMBER
355
   OraDatabase.Parameters.Add "USER_ID", objAccessControl.UserId, ORAPARM_INPUT, ORATYPE_NUMBER
355
   OraDatabase.Parameters.Add "USER_ID", objAccessControl.UserId, ORAPARM_INPUT, ORATYPE_NUMBER
-
 
356
   OraDatabase.Parameters.Add "SCHED",   sScheduled,              ORAPARM_INPUT, ORATYPE_VARCHAR2
356
 
357
 
357
   objEH.TryORA ( OraSession )
358
   objEH.TryORA ( OraSession )
358
   On Error Resume Next
359
   On Error Resume Next
359
 
360
 
360
   OraDatabase.ExecuteSQL _
361
   OraDatabase.ExecuteSQL _
361
   "BEGIN "&_
362
   "BEGIN "&_
362
   "   PK_ENVIRONMENT.MAKE_APPROVED ( :PV_ID, :RTAG_ID, :USER_ID ); "&_
363
   "   PK_ENVIRONMENT.MAKE_APPROVED ( :PV_ID, :RTAG_ID, :USER_ID, :SCHED ); "&_
363
   "END; "
364
   "END; "
364
 
365
 
365
   objEH.CatchORA ( OraSession )
366
   objEH.CatchORA ( OraSession )
366
 
367
 
367
   OraDatabase.Parameters.Remove "PV_ID"
368
   OraDatabase.Parameters.Remove "PV_ID"
368
   OraDatabase.Parameters.Remove "RTAG_ID"
369
   OraDatabase.Parameters.Remove "RTAG_ID"
369
   OraDatabase.Parameters.Remove "USER_ID"
370
   OraDatabase.Parameters.Remove "USER_ID"
-
 
371
   OraDatabase.Parameters.Remove "SCHED"
370
 
372
 
371
   ' return TRUE if operation was successful, else FALSE
373
   ' return TRUE if operation was successful, else FALSE
372
   If objEH.LastOraFailed Then
374
   If objEH.LastOraFailed Then
373
      PRIVATE_MakeApproved = FALSE
375
      PRIVATE_MakeApproved = FALSE
374
   Else
376
   Else
Line 377... Line 379...
377
 
379
 
378
End Function
380
End Function
379
'-------------------------------------------------------------------------------------
381
'-------------------------------------------------------------------------------------
380
' This function is called from _make_approved.asp, which is loaded when the btnApprovePackage
382
' This function is called from _make_approved.asp, which is loaded when the btnApprovePackage
381
' action button is pressed. It is also called as part of the bulk release operation.
383
' action button is pressed. It is also called as part of the bulk release operation.
382
Function PUBLIC_ApproveRelease(NNrtag_id, NNpv_id, ByRef retParameters, isBulk)
384
Function PUBLIC_ApproveRelease(NNrtag_id, NNpv_id, ByRef retParameters, isBulk, sScheduled)
383
 
385
 
384
   Dim retERRmsg
386
   Dim retERRmsg
385
   Dim retALRTmsg
387
   Dim retALRTmsg
386
   Dim pkgType
388
   Dim pkgType
387
 
389
 
Line 393... Line 395...
393
   ' default return value
395
   ' default return value
394
   PUBLIC_ApproveRelease = FALSE
396
   PUBLIC_ApproveRelease = FALSE
395
 
397
 
396
   If ( NNrtag_id <> "") AND (NNpv_id <> "") Then
398
   If ( NNrtag_id <> "") AND (NNpv_id <> "") Then
397
 
399
 
398
     ' -- Check not about to replace an SDK
-
 
399
 
-
 
400
 
-
 
401
     '-- Get Package details
400
     '-- Get Package details
402
     Call Get_Pkg_Info ( NNpv_id, NNrtag_id )
401
     Call Get_Pkg_Info ( NNpv_id, NNrtag_id )
403
 
402
 
404
     ' Only process the package if it is still pending approval
403
     ' Only process the package if it is still pending approval
405
     ' If the package has already been released, then we don't want to mark it as ready to build- again
404
     ' If the package has already been released, then we don't want to mark it as ready to build- again
Line 413... Line 412...
413
 
412
 
414
            If PRIVATE_Is_Allowed_To_Approve_AutoBuild(NNrtag_id) Then
413
            If PRIVATE_Is_Allowed_To_Approve_AutoBuild(NNrtag_id) Then
415
               '-- Approve Automatic-build package
414
               '-- Approve Automatic-build package
416
               Call CheckRequirementsForMakeApproved ( NNpv_id, NNrtag_id, pkgType, retERRmsg, retALRTmsg, retParameters )
415
               Call CheckRequirementsForMakeApproved ( NNpv_id, NNrtag_id, pkgType, retERRmsg, retALRTmsg, retParameters )
417
               If IsNull(retERRmsg) Then
416
               If IsNull(retERRmsg) Then
418
                  If PRIVATE_MakeApproved (NNrtag_id, NNpv_id) = TRUE Then
417
                  If PRIVATE_MakeApproved (NNrtag_id, NNpv_id, sScheduled) = TRUE Then
419
 
418
 
420
                      If ( RaiseWIPExists = TRUE ) AND ( isBulk = FALSE ) Then
419
                      If ( RaiseWIPExists = TRUE ) AND ( isBulk = FALSE ) Then
421
                         Call RaiseMsg ( enum_MSG_PACKAGE_WIP_EXISTS&"?rtag_id="& NNrtag_id & "&pv_id="& NNpv_id & "", NNpv_id )
420
                         Call RaiseMsg ( enum_MSG_PACKAGE_WIP_EXISTS&"?rtag_id="& NNrtag_id & "&pv_id="& NNpv_id & "", NNpv_id )
422
                         ' RaiseMsg redirects loaded web page, so no return
421
                         ' RaiseMsg redirects loaded web page, so no return
423
                         ' Deal with BulkMakeRelease elsewhere
422
                         ' Deal with BulkMakeRelease elsewhere
Line 618... Line 617...
618
   Set pkgIdsAndPvIds = nothing
617
   Set pkgIdsAndPvIds = nothing
619
 
618
 
620
   ' Now process each new and valid Auto/Manual build item in the string array
619
   ' Now process each new and valid Auto/Manual build item in the string array
621
   RaiseWIPExists = FALSE
620
   RaiseWIPExists = FALSE
622
   For Each pvId In remainingList3
621
   For Each pvId In remainingList3
623
      Call PUBLIC_ApproveRelease(NNrtag_id, pvId, retParameters, TRUE)
622
      Call PUBLIC_ApproveRelease(NNrtag_id, pvId, retParameters, TRUE, NULL)
624
   Next
623
   Next
625
   If ( RaiseWIPExists = TRUE ) Then
624
   If ( RaiseWIPExists = TRUE ) Then
626
     Call RaiseMsg ( enum_MSG_PACKAGE_WIP_EXISTS & "?rtag_id="& request("rtag_id") & "&pv_id="& request("pv_id") & "", "" )
625
     Call RaiseMsg ( enum_MSG_PACKAGE_WIP_EXISTS & "?rtag_id="& request("rtag_id") & "&pv_id="& request("pv_id") & "", "" )
627
     ' RaiseMsg redirects loaded web page, so no return
626
     ' RaiseMsg redirects loaded web page, so no return
628
   End If
627
   End If