WebSVN – DevTools – Diff – /ManagerSuite/Release_Manager/trunk/wAddDaemonInstruction.asp

 <!--#include file="common/globals.asp"-->
 <!--#include file="common/formating.asp"-->
 <!--#include file="common/qstr.asp"-->
 <!--#include file="common/common_subs.asp"-->
 <!--#include file="common/_form_window_common.asp"-->
+<!--#include file="common/common_dbedit.asp"-->
 <!--#include file="common/daemon_instructions.asp"-->
 <%
 '------------ ACCESS CONTROL ------------------
 %>
 <!--#include file="_access_control_general.asp"-->
 <!--#include file="_access_control_login.asp"-->
 <%
 '------------ VARIABLE DEFINITION -------------
-Dim rsQry
 Dim sMessage
-Dim Query_String
 Dim parProj_id
 Dim parPv_id
 Dim parOp_code
 Dim parRepeat
 Dim parInst_id
 Dim parSchDateTime
 Dim parRfile
 Dim bHideRepeat
+Dim bHidePackages
+Dim bPreventSubmit
+Dim parSortOrder
 '------------ CONSTANTS DECLARATION -----------
 '------------ VARIABLE INIT -------------------
 sMessage = NULL
+bPreventSubmit = False
-// collect all parameters from query string
+' collect all parameters from query string
 parOp_code = Request("op_code")
 parProj_id = Request("proj_id")
 parPv_id = Request("pv_id")
 parRepeat = Request("repeat")
 parInst_id = Request("inst_id")
 parSchDateTime = Request("sdt")
 parRfile = Request("rfile")
+parSortOrder = Request("sort")
-Set objFormCollector = CreateObject("Scripting.Dictionary")
+If IsNull(parSortOrder) OR parSortOrder = "" Then
+   parSortOrder = "0"
+End If
-' assume Repeat radio button is going to be visible
+Set objFormCollector = CreateObject("Scripting.Dictionary")
-bHideRepeat = False
 '------------ CONDITIONS ----------------------
 '----------------------------------------------
 %>
 <%
 ' Formulate the HTML for a combo box listing all the daemon instruction operations, and select the one that matches
 ' the op-code passed in as a parameter. If the parameter value could not be found, correct it to the first valid op-code
 ' in the list.
 '------------------------------------------------------------------------------------------------------------------------------------------
 Function Get_OpCodes ( NNop_code )
-   Dim op_code_array
+   Dim op_code_str_array
-   Dim op_code
+   Dim op_code_str
-   Dim op_code_id
+   Dim op_code_val
 	Dim selectedFound
    Dim tempLINK
    Dim s
-   selectedFound = false
+   selectedFound = False
-   op_code_array = array(OP_CODE_0_STR)   ' add new strings in here when new instruction constants are defined in conf.asp
+   ' Get the op-codes in terms of human readable string names - these will be used in the drop down select list
+   Call GetDaemonInstructionOperationNameArray(op_code_str_array)
-   s = "<td width='6%' align='left'>Operation</td>"
+   s = "<td width='20%' align='left'>Operation</td>"
    s = s + "<td align='left'><select name='op_code_list' id='op_code_list' class='form_item' onchange=""MM_jumpMenu('parent',this,0)"">"
-   op_code_id  = 0
+   For each op_code_str in op_code_str_array
-   For each op_code in op_code_array
+      ' get equivalent op-code value for this op-code string
+      op_code_val = DaemonInstructionOperationValue(op_code_str)
       tempLINK = scriptName & "?inst_id="& parInst_id &_
-                              "&op_code="& Cstr(op_code_id) &_
+                              "&op_code="& op_code_val &_
                               "&rtag_id=" & parRtag_id &_
                               "&pv_id=" & parPv_id &_
+                              "&sort=" & parSortOrder &_
                               "&sdt="& parSchDateTime &_
                               "&repeat="& parRepeat &_
                               "&rfile="& parRfile
-      If ((NNop_code = cstr(op_code_id)) OR (NNop_code = "0")) AND (selectedFound = False) Then
+      If ((NNop_code = op_code_val) OR (NNop_code = "0")) AND (selectedFound = False) Then
-         s = s + "<option value='"& tempLINK &"' selected>"& op_code &"</option>"
+         s = s + "<option value='"& tempLINK &"' selected>"& op_code_str &"</option>"
          selectedFound = True
-         NNop_code = op_code_id
+         NNop_code = op_code_val
       Else
-         s = s + "<option value='"& tempLINK &"'>"& op_code &"</option>"
+         s = s + "<option value='"& tempLINK &"'>"& op_code_str &"</option>"
       End If
-      op_code_id = op_code_id + 1
    Next
-   ' TODO - what if selectedFound is still FALSE, shouldn't we fixup NNop_code to something ?
    s = s + "</select></td>"
    Get_OpCodes = s
 End Function
 '------------------------------------------------------------------------------------------------------------------------------------------
 ' Formulate the HTML for a combo box listing all the Projects, and select the one that matches
       tempLINK = scriptName & "?inst_id="& parInst_id &_
                               "&op_code="& parOp_code &_
                               "&proj_id=" & rsTemp.Fields("proj_id") &_
                               "&sdt="& parSchDateTime &_
                               "&repeat="& parRepeat &_
+                              "&sort=" & parSortOrder &_
                               "&rfile="& parRfile
       If ((NNproj_id = Cstr(rsTemp.Fields("proj_id"))) OR (NNproj_id = "0")) AND (selectedFound = False) Then
          s = s + "<option value='"& tempLINK &"' selected>"& projName &"</option>"
          selectedFound = True
    End If
    rsTemp.Close
    Set rsTemp = nothing
-   If ReleasesAvailable(NNproj_id) = False Then
-      s = s + "<a style=color:Red>WARNING: Project has no active release(s)</a>"
-   End If
    s = s + "</td>"
    Get_Projects = s
 End Function
 ' Formulate the HTML for a combo box listing all the Release for a specified project, and select the one that matches
 ' the release-tag passed in as a parameter. If the parameter value could not be found, correct it to the first valid release-tag
 ' in the list.
 '------------------------------------------------------------------------------------------------------------------------------------------
 Function Get_Releases ( NNproj_id, NNrtag_id )
-   Dim rsTemp, Query_String, releaseName, tempLINK, selectedFound, s
+   Dim rsTemp, Query_String, releaseName, tempLINK, selectedFound, s, numReleases
    selectedFound = False
+   numReleases = 0
    Query_String = "SELECT rtag_id, rtag_name "&_
                   "  FROM release_tags rt"&_
                   " WHERE rt.proj_id = "& NNproj_id &_
                   "   AND ((rt.official = 'N') OR (rt.official = 'C') OR (rt.official = 'R'))"&_
                   " ORDER BY UPPER(rtag_name)"
                               "&op_code="& parOp_code &_
                               "&proj_id="& NNproj_id &_
                               "&rtag_id="& rsTemp.Fields("rtag_id") &_
                               "&sdt="& parSchDateTime &_
                               "&repeat="& parRepeat &_
+                              "&sort=" & parSortOrder &_
                               "&rfile="& parRfile
       If ((NNrtag_id = CStr(rsTemp.Fields("rtag_id"))) OR (NNrtag_id = "0")) AND (selectedFound = False) Then
             s = s + "<option value='"& tempLINK &"' selected>"& releaseName &"</option>"
          selectedFound = True
          NNrtag_id = Cstr(rsTemp.Fields("rtag_id"))
       Else
          s = s + "<option value='"& tempLINK &"'>"& releaseName &"</option>"
       End If
+      numReleases = numReleases + 1
       rsTemp.MoveNext
    WEnd
    s = s + "</select>"
    ' Correct for a situation where selectedFound is still FALSE.
       Else
          NNrtag_id = "0"
       End If
    End If
+   ' If no releases were found then replace drop down list with some warning text and disable form submission
+   If numReleases = 0 Then
+      bPreventSubmit = True
+      s = "<td>Release</td><td><a style=color:Red>WARNING: No active releases found. The operation cannot be performed.</a></td>"
+   Else
+      ' If the selected release does not have a daemon configuration, append some warning text to the right of the drop down list.
+      If DaemonsAvailable(NNrtag_id) = False Then
+         s = s + "<a style=color:Red>WARNING: Release has no build daemon(s)</a>"
+      End If
+   End If
    rsTemp.Close
    Set rsTemp = nothing
-   If DaemonsAvailable(NNrtag_id) = False Then
-      s = s + "<a style=color:Red>WARNING: Release has no build daemon(s)</a>"
-   End If
    s = s + "</td>"
    Get_Releases = s
 End Function
 '------------------------------------------------------------------------------------------------------------------------------------------
 ' Formulate the HTML for a combo box listing all the Package Versions in a specified release, and select the one that matches
 ' the pv_id passed in as a parameter. If the parameter value could not be found, correct it to the first valid pv_id
 ' in the list.
+' This function must deal with op-codes that want to read package versions from the work_in_progress table, and op-codes
+' that need to read package versions from the release_content table.
+' The function should only be called if a package versions drop down list is required for the form.
 '------------------------------------------------------------------------------------------------------------------------------------------
-Function Get_Packages ( NNrtag_id, NNpv_id )
+Function Get_Packages ( NNrtag_id, NNpv_id, NNop_code )
-   Dim rsTemp, Query_String, pkgName, tempLINK, selectedFound, s
+   Dim rsTemp, Query_String, pkgName, tempLINK, selectedFound, s, numPackages
    selectedFound = False
+   numPackages = 0
+   If (NNop_code = OP_CODE_1_TEST_BUILD_PACKAGE) Then
+      ' Get list of packages from from work_in_progress table
+      Query_String = "SELECT pk.pkg_id, pk.pkg_name, pv.pkg_version, wip.pv_id "&_
+                     "  FROM work_in_progress wip, release_tags rt, packages pk, package_versions pv "&_
+                     " WHERE wip.rtag_id = "& Cstr(NNrtag_id) &_
+                     "   AND wip.rtag_id = rt.rtag_id"&_
+                     "   AND ((rt.official = 'N') OR (rt.official = 'C') OR (rt.official = 'R'))"&_
+                     "   AND wip.pv_id = pv.pv_id"&_
+                     "   AND pk.pkg_id = pv.pkg_id"&_
+                     " ORDER BY UPPER(pkg_name)"
+   Else
+      ' Get list of packages from from release_content table
-   Query_String = "SELECT pk.pkg_id, pk.pkg_name, pv.pkg_version, rc.pv_id "&_
+      Query_String = "SELECT pk.pkg_id, pk.pkg_name, pv.pkg_version, rc.pv_id "&_
-                  "  FROM release_content rc, release_tags rt, packages pk, package_versions pv "&_
+                     "  FROM release_content rc, release_tags rt, packages pk, package_versions pv "&_
-                  " WHERE rc.rtag_id = "& Cstr(NNrtag_id) &_
+                     " WHERE rc.rtag_id = "& Cstr(NNrtag_id) &_
-                  "   AND rc.rtag_id = rt.rtag_id"&_
+                     "   AND rc.rtag_id = rt.rtag_id"&_
-                  "   AND ((rt.official = 'N') OR (rt.official = 'C') OR (rt.official = 'R'))"&_
+                     "   AND ((rt.official = 'N') OR (rt.official = 'C') OR (rt.official = 'R'))"&_
-                  "   AND rc.pv_id = pv.pv_id"&_
+                     "   AND rc.pv_id = pv.pv_id"&_
-                  "   AND pk.pkg_id = pv.pkg_id"&_
+                     "   AND pk.pkg_id = pv.pkg_id"&_
-                  " ORDER BY UPPER(pkg_name)"
+                     " ORDER BY UPPER(pkg_name)"
+   End If
 	Set rsTemp = OraDatabase.DbCreateDynaset( Query_String, cint(0))
+   ' modify the control heading to indicate the source of the package version list
+   If (NNop_code = OP_CODE_1_TEST_BUILD_PACKAGE) Then
-   s = "<td>Package</td>"
+      s = "<td>WIP Package</td>"
+   Else
+      s = "<td>Released Package</td>"
+   End If
    s = s + "<td><select id='pv_id_list' name='pv_id_list' class='form_item' onChange=""MM_jumpMenu('parent',this,0)"">"
    While ((NOT rsTemp.BOF) AND (NOT rsTemp.EOF))
       pkgName = rsTemp.Fields("pkg_name") & " " & rsTemp.Fields("pkg_version")
       tempLINK = scriptName & "?inst_id="& parInst_id &_
-                              "&op_code="& parOp_code &_
+                              "&op_code="& NNop_code &_
                               "&proj_id="& parProj_id &_
                               "&rtag_id="& NNrtag_id &_
                               "&pv_id="&   rsTemp.Fields("pv_id") &_
                               "&sdt="& parSchDateTime &_
                               "&repeat="& parRepeat &_
+                              "&sort=" & parSortOrder &_
                               "&rfile="& parRfile
       If ((NNpv_id = Cstr(rsTemp.Fields("pv_id"))) OR (NNpv_id = "0")) AND (selectedFound = False) Then
          s = s + "<option value='"& tempLINK &"' selected>"& pkgName &"</option>"
          selectedFound = True
          NNpv_id = CStr(rsTemp.Fields("pv_id"))
       Else
          s = s + "<option value='"& tempLINK &"'>"& pkgName &"</option>"
       End If
+      numPackages = numPackages + 1
       rsTemp.MoveNext
    WEnd
    s = s + "</select></td>"
    ' Correct for a situation where selectedFound is still FALSE.
       Else
          NNpv_id = "0"
       End If
    End If
+   ' replace drop down list with a warning if no package versions were found, and ensure that the user cannot submit the form
+   If numPackages = 0 Then
+      bPreventSubmit = True
+      If (NNop_code = OP_CODE_1_TEST_BUILD_PACKAGE) Then
+         s = "<td>Package</td><td><a style=color:Red>WARNING: No WIP package versions found. The operation cannot be performed.</a></td>"
+      Else
+         s = "<td>Package</td><td><a style=color:Red>WARNING: No released package versions found. The operation cannot be performed.</a></td>"
+      End If
+   End If
    rsTemp.Close
    Set rsTemp = nothing
    Get_Packages = s
 End Function
 ' calling Get_Projects() to generate the project drop down list.
 If parProj_id = "0" AND NOT IsNull(parRtag_id) AND parRtag_id <> "" AND parRtag_id <> "0" Then
    parProj_id = Get_Proj_ID(parRtag_id)
 End If
-' Clear pv_id if the Daemon Instruction does not require one
+' Hide the Package drop-down list if the Daemon Instruction does not require it
-If parOp_code <> OP_CODE_0_RIPPLE_BUILD_PACKAGE Then
+If DaemonInstructionNeedsPV_ID(parOp_code) Then
+   bHidePackages = False
+Else
+   bHidePackages = True
    parPv_id = "0"
 End If
+' NOTE: from this moment on, any real use of parPv_id has to be guarded by examination of bHidePackages
 ' Hide the Repeat buttons if the Daemon Instruction does not require them
-If parOp_code = OP_CODE_0_RIPPLE_BUILD_PACKAGE Then
+If DaemonInstructionNeedsRepeat(parOp_code) Then
+   bHideRepeat = False
+Else
    bHideRepeat = True
 End If
 ' Call some 'Get' procedures without HTML generation to determine the values of parProj_id, par_Rtag_id, and parPv_id
 ' in case they are not currently present in the query string. This will then allow the use of the ReleasesAvailable() and
 ' DaemonsAvailable() functions further below to hide the form submit button.
 ' It will also support the submit action itself when it takes place during the editing of an existing record where
 ' the user changes (for example) the project without making any changes to release or package and so those items
 ' are nullified and must be reset to something other than their original values that came through the query string
 ' when the edit form was just opened.
 Call Get_Projects(parProj_id)                  ' Ensures parProj_id has a good value
 Call Get_Releases(parProj_id, parRtag_id)      ' Ensures parRtag_id has a good value
-' PV_IDs are only relevant for certain op-codes
-If parOp_code = OP_CODE_0_RIPPLE_BUILD_PACKAGE Then
+If NOT bHidePackages Then
-   Call Get_Packages (parRtag_id, parPv_id )
+   Call Get_Packages (parRtag_id, parPv_id, parOp_code)
 End If
 ' Check if form submit is happening
 If CBool(Request("action")) Then
    If NOT bEditEnabled Then
       ' redirect to an error message
       Call RaiseMsg(enum_MSG_ERROR, "You have been denied permission to add/update daemon instructions for the specified release.")
    End If
-   ' Setup the repeat seconds count according to the radio button value
+   ' do daemon instruction validation, continuing only if it passes
-   If IsNull(Request("repeat_inst")) OR Request("repeat_inst") = "" OR Request("repeat_inst") = "No" Then
+   If ValidateDaemonInstruction(parOp_code, parRtag_id, parPv_id) = True Then
-      RepeatSeconds = 0
-   Else
-      RepeatSeconds = 86400
-   End If
-   ' If user has not entered a scheduled time, set the scheduled date/time to now
+      ' Setup the repeat seconds count according to the radio button value
-   ScheduledDateTime = Request("scheduled_time")
-   If IsNull(ScheduledDateTime) OR ScheduledDateTime = "" Then
+      If IsNull(Request("repeat_inst")) OR Request("repeat_inst") = "" OR Request("repeat_inst") = "No" Then
-      ScheduledDateTime = ORA_SYSDATETIME
+         RepeatSeconds = 0
-   Else
+      Else
-      ScheduledDateTime = "TO_DATE( '"& ScheduledDateTime &"','DD-MM-YYYY HH24:MI:SS' )"
+         RepeatSeconds = 86400
-   End If
+      End If
+      ' If user has not entered a scheduled time, set the scheduled date/time to now
+      ScheduledDateTime = Request("scheduled_time")
-   If parOp_code <> OP_CODE_0_RIPPLE_BUILD_PACKAGE Then
+      If IsNull(ScheduledDateTime) OR ScheduledDateTime = "" Then
+         ScheduledDateTime = ORA_SYSDATETIME
-      parPv_id = "NULL"
+      Else
+         ScheduledDateTime = "TO_DATE( '"& ScheduledDateTime &"','DD-MM-YYYY HH24:MI:SS' )"
-   End If
+      End If
-   ' if the page has been provided an inst_id, we must be editing an existing record so we do an update
+      ' nullify parPv_id for the SQL, if the instruction op-code does not require one
-   If (NOT IsNull(parInst_id)) AND (parInst_id <> "") Then
-      ' We are updating an existing record
-      objEH.TryORA ( OraSession )
-      On Error Resume Next
-      OraDatabase.ExecuteSQL "BEGIN PK_BUILDAPI.update_daemon_inst( "& parInst_id & ", " &_
-                                                                       parOp_code & ", " &_
-                                                                       parRtag_id & ", " &_
-                                                                       parPv_id & ", " &_
-                                                                       ScheduledDateTime & ", " &_
-                                                                       CStr(RepeatSeconds) & ", " &_
-                                                                       ORA_SYSDATETIME & ", " &_
-                                                                       objAccessControl.UserId & "); END;"
-      objEH.CatchORA ( OraSession )
-      If objEH.Finally Then
+      If bHidePackages Then
-         If parRfile = "admin_daemon_instructions.asp" Then
-            Call OpenInParentWindow (parRfile)
-         Else
-            Call OpenInParentWindow (parRfile & "?rtag_id=" & parRtag_id & "&pv_id=" & parPv_id)
-         End If
-         Call CloseWindow()
+         parPv_id = "NULL"
       End If
+      ' if the page has been provided an inst_id, we must be editing an existing record so we do an update
+      If (NOT IsNull(parInst_id)) AND (parInst_id <> "") Then
+         ' We are updating an existing record
+         objEH.TryORA ( OraSession )
+         On Error Resume Next
+         OraDatabase.ExecuteSQL "BEGIN PK_BUILDAPI.update_daemon_inst( "& parInst_id & ", " &_
+                                                                        parOp_code & ", " &_
+                                                                        parRtag_id & ", " &_
+                                                                        parPv_id & ", " &_
+                                                                        ScheduledDateTime & ", " &_
+                                                                        CStr(RepeatSeconds) & ", " &_
+                                                                        ORA_SYSDATETIME & ", " &_
+                                                                        objAccessControl.UserId & "); END;"
+         objEH.CatchORA ( OraSession )
+         If objEH.Finally Then
+            If parRfile = "admin_daemon_instructions.asp" Then
+               Call OpenInParentWindow (parRfile & "?sort=" & parSortOrder)
+            Else
+               Call OpenInParentWindow (parRfile & "?rtag_id=" & parRtag_id & "&pv_id=" & parPv_id)
+            End If
+            Call CloseWindow()
+         End If
-   Else ' We are adding a new record
+      Else ' We are adding a new record
-      objEH.TryORA ( OraSession )
+         objEH.TryORA ( OraSession )
-      On Error Resume Next
+         On Error Resume Next
-      OraDatabase.ExecuteSQL "BEGIN PK_BUILDAPI.insert_daemon_inst( "& parOp_code & ", " &_
+         OraDatabase.ExecuteSQL "BEGIN PK_BUILDAPI.insert_daemon_inst( "& parOp_code & ", " &_
-                                                                       parRtag_id & ", " &_
+                                                                        parRtag_id & ", " &_
-                                                                       parPv_id & ", " &_
+                                                                        parPv_id & ", " &_
-                                                                       ScheduledDateTime & ", " &_
+                                                                        ScheduledDateTime & ", " &_
-                                                                       CStr(RepeatSeconds) & ", " &_
+                                                                        CStr(RepeatSeconds) & ", " &_
-                                                                       ORA_SYSDATETIME & ", " &_
+                                                                        ORA_SYSDATETIME & ", " &_
-                                                                       objAccessControl.UserId & "); END;"
+                                                                        objAccessControl.UserId & "); END;"
-      objEH.CatchORA ( OraSession )
+         objEH.CatchORA ( OraSession )
-      If objEH.Finally Then
+         If objEH.Finally Then
-         If parRfile = "admin_daemon_instructions.asp" Then
+            If parRfile = "admin_daemon_instructions.asp" Then
-            Call OpenInParentWindow (parRfile)
+               Call OpenInParentWindow (parRfile & "?sort=" & parSortOrder)
-         Else
+            Else
-            Call OpenInParentWindow (parRfile & "?rtag_id=" & parRtag_id & "&pv_id=" & parPv_id)
+               Call OpenInParentWindow (parRfile & "?rtag_id=" & parRtag_id & "&pv_id=" & parPv_id)
+            End If
+            Call CloseWindow()
          End If
-         Call CloseWindow()
       End If
    End If
 End If
 '----------------------------------------------
    s += '?inst_id=' + document.getElementById('inst_id').value;
    s += '&op_code=' + document.getElementById('op_code').value;
    s += '&proj_id=' + document.getElementById('proj_id').value;
    s += '&rtag_id=' + document.getElementById('rtag_id').value;
    s += '&pv_id='   + document.getElementById('pv_id').value;
+   s += '&sort='    + document.getElementById('sortOrder').value;
    s += '&sdt='     + document.getElementById('scheduled_time').value;
    s += '&repeat='  + newRepeat;
    s += '&rfile='   + document.getElementById('rfile').value;
    document.location = s;
                                    "?inst_id="& parInst_id &_
                                    "&op_code="& parOp_code &_
                                    "&proj_id="& parProj_id &_
                                    "&rtag_id="& parRtag_id &_
                                    "&pv_id="&   parPv_id &_
+                                   "&sort="&    parSortOrder &_
                                    "&rfile="& parRfile
          objFormComponent.OnSubmit = "ShowProgress();"
          Call objFormComponent.FormStart()
             <td background="images/bg_login.gif">
                <table width="50%"  border="0" cellspacing="0" cellpadding="0">
                   <tr>
                      <td><%=ProgressBar()%></td>
                      <td align="right">
-                        <%If ReleasesAvailable(parProj_id) AND DaemonsAvailable(parRtag_id) Then%>
+                        <%If ReleasesAvailable(parProj_id) AND DaemonsAvailable(parRtag_id) AND NOT bPreventSubmit Then%>
                            <input name="btn" type="submit" class="form_btn" value="Add/Update">
                         <%Else%>
-                           <input name="btn" type="submit" class="form_btn_disabled" value="Add/Update D" disabled="disabled" >
+                           <input name="btn" type="submit" class="form_btn_disabled" value="Add/Update" disabled="disabled" >
                         <%End If%>
                         <input name="btn" type="reset" class="form_btn" value="Cancel" onClick="self.close();">
                      </td>
                   </tr>
                <!-- NEW PRODUCT ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
                <%Call Messenger ( sMessage , 3, "100%" )%>
                <!-- MESSAGE +++++++++++++++++++++++++++++++++++++++++++++++++++ -->
                <!--#include file="messages/_msg_inline.asp"-->
                <table width="100%" border="0">
                   <tr>
                      <td width="1%">
                         <%=Get_OpCodes(parOp_code)%>
                      </td>
                   </tr>
                            <%=Get_Releases(parProj_id, parRtag_id)%>
                         </div>
                      </td>
                   </tr>
-                  <%If parOp_code = "0" Then%>
+                  <%If NOT bHidePackages Then%>
                   <tr>
                      <td>
                         <div id="SelectPackageVersion" style="visibility:visible">
-                           <%=Get_Packages ( parRtag_id, parPv_id )%>
+                           <%=Get_Packages ( parRtag_id, parPv_id, parOp_code )%>
                         </div>
                      </td>
                   </tr>
                   <%End If%>
                         <input type="hidden" id="proj_id"     name="proj_id"      value="<%=parProj_id%>">
                         <input type="hidden" id="rtag_id"     name="rtag_id"      value="<%=parRtag_id%>">
                         <input type="hidden" id="pv_id"       name="pv_id"        value="<%=parPv_id%>">
                         <input type="hidden" id="repeat_secs" name="repeat_secs"  value="<%=parRepeat%>">
                         <input type="hidden" id="rfile"       name="rfile"        value="<%=parRfile%>">
+                        <input type="hidden" id="sortOrder"   name="sortOrder"    value="<%=parSortOrder%>">
                      </td>
                   </tr>
                </table>
             </td>
          </tr>

Subversion Repositories DevTools

(root)/ManagerSuite/Release_Manager/trunk/wAddDaemonInstruction.asp @ 151 – Rev 147 → 149