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

 <!--#include file="common/common_subs.asp"-->
 <!--#include file="common/_form_window_common.asp"-->
 <%
 ' Set rfile parameter. This is a return page after Login
 Call objPMod.StoreParameter ( "rfile", "rtree.asp" )
-objPMod.PersistInQryString("proj_id")
 '------------ ACCESS CONTROL ------------------
 %>
 <!--#include file="_access_control_login.asp"-->
 <!--#include file="_access_control_general.asp"-->
 <!--#include file="_access_control_project.asp"-->
 <%
 '------------ Variable Definition -------------
 Dim objSortHelper
 Dim rsQry
-Dim parProjId
-Dim parSourceRtagId
-Dim   State
+Dim State
 Dim ctrlDisabled
+Dim returnUrl
 '------------ Constants Declaration -----------
 '------------ Variable Init -------------------
-parProjId = Request("proj_id")
-objPMod.PersistInQryString("proj_id")
 If NOT objAccessControl.IsActive("CreateNewRelease") Then
    ctrlDisabled = "disabled"
 Else
    ctrlDisabled = ""
 End If
+' Maintain the page to goto after we process this one
+'   Go back from whence we came
+' Grab the referre on the first call so that postback does not confuse us
+returnUrl = Request("returnUrl")
+If returnUrl = "" Then
+    returnUrl = Request.ServerVariables ("HTTP_REFERER")
+End If
 '----------------------------------------------
 %>
 <%
 '--------------------------------------------------------------------------------------------------------------------------
 Sub GetFormDetails ( nRtagId, ByRef outobjDetails )
    Dim rsQry, query
    OraDatabase.Parameters.Add "RTAG_ID",  nRtagId,    ORAPARM_INPUT, ORATYPE_NUMBER
    query = _
    " SELECT rt.* "&_
-   "  FROM RELEASE_TAGS rt"&_
+   " FROM   RELEASE_TAGS rt"&_
-   " WHERE rt.RTAG_ID = :RTAG_ID"
+   " WHERE  rt.RTAG_ID = :RTAG_ID"
    Set rsQry = OraDatabase.DbCreateDynaset( query, ORADYN_DEFAULT )
    OraDatabase.Parameters.Remove "RTAG_ID"
    If rsQry.RecordCount > 0 Then
       outobjDetails.Item ("rtag_id") = rsQry("rtag_id")
+      outobjDetails.Item ("proj_id") = rsQry("proj_id")
       outobjDetails.Item ("rtag_name") = rsQry("rtag_name")
       outobjDetails.Item ("description") = rsQry("description")
       outobjDetails.Item ("parent_rtag_id") = rsQry("parent_rtag_id")
       outobjDetails.Item ("config_spec_branch") = rsQry("config_spec_branch")
       outobjDetails.Item ("owner_email") = rsQry("owner_email")
    Else
       Err.Raise 8, "Sub GetFormDetails in "& ScriptName, "Empty record set returned. nRtagId="& nRtagId
    End If
    rsQry.Close
    Set rsQry = Nothing
 End Sub
 '--------------------------------------------------------------------------------------------------------------------------
 Sub UpdateReleaseDetails ()
    If objForm.IsValidOnPostBack Then
       ' --- Form is Valid ---
       If objAccessControl.IsActive("CreateNewRelease") Then
          Call UpdateReleaseDetails()
          If objEH.Finally Then
-            Call OpenInWindow ( "rtree.asp?DONE=OK&"& objPMod.ComposeURL() )
+            Call OpenInWindow ( returnUrl )
          End If
       Else
-         Call OpenInWindow ( "rtree.asp?DONE=OK&"& objPMod.ComposeURL() )
+         Call OpenInWindow ( returnUrl )
       End If
    End If
 End If
 '----------------------------------------------
                <td align="right" valign="top"  background="images/lbox_bg_blue.gif"><img src="images/lbox_tr_cnr_b.gif" width="13" height="13"></td>
             </tr>
             <tr>
                <td bgcolor="#FFFFFF"><img src="images/h_trsp_dot.gif" width="10" height="100"></td>
                <td bgcolor="#FFFFFF" valign="top">
-                  <%
-                  If parSourceRtagId <> "" Then
-                     Call Messenger ( "New release will be created from <br>"& objFormCollector.Item("location"), 3, "100%" )
-                  End If
-                  %>
                   <!-- MESSAGE +++++++++++++++++++++++++++++++++++++++++++++++++++ -->
                   <!--#include file="messages/_msg_inline.asp"-->
                   <!-- +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
                   <br>
                   <table width="100%"  border="0" cellspacing="2" cellpadding="0">
                      </tr>
                      <tr>
                         <td nowrap class="form_iname" valign="top">Parent Release </td>
                         <td valign="top" nowrap class="form_iname">
                            <%
-                           OraDatabase.Parameters.Add "PROJ_ID", parProjId,    ORAPARM_INPUT, ORATYPE_NUMBER
+                           OraDatabase.Parameters.Add "PROJ_ID", objFormCollector.Item("proj_id"),    ORAPARM_INPUT, ORATYPE_NUMBER
                            Set rsQry = OraDatabase.DbCreateDynaset( GetQuery ("ReleaseVersionTree.sql") , ORADYN_DEFAULT )
                            OraDatabase.Parameters.Remove "PROJ_ID"
                            %>
                         <td width="72%" valign="top" nowrap><%=objFormComponent.TextBox ( "owner_email", objForm.GetValue( "owner_email", objFormCollector.Item("owner_email") ), "class='form_ivalue' size='60'" )%></td>
                         <td width="9%" valign="top"></td>
                      </tr>
                      <tr>
-                        <%If parProjId <> 2 Then%>
+                        <%If objFormCollector.Item("proj_id") <> 2 Then%>
                            <td nowrap class="form_iname" valign="top">Associated MASS REF </td>
                            <td valign="top" nowrap class="form_iname">
                               <%
                               OraDatabase.Parameters.Add "PROJ_ID", 2,   ORAPARM_INPUT, ORATYPE_NUMBER
                <td background="images/bg_action_norm.gif" ></td>
                <td align="right" background="images/bg_action_norm.gif" >
                   <%If objAccessControl.IsActive("CreateNewRelease") Then%>
                      <%=objFormComponent.SubmitButton ( "Submit", "class='form_btn'" )%>&nbsp;
                   <%End If%>
-                  <%=objFormComponent.CancelButton ( "Cancel", "class='form_btn'", "rtree.asp?CANCEL=OK&"& objPMod.ComposeURL() )%>
+                  <%=objFormComponent.CancelButton ( "Cancel", "class='form_btn'", returnUrl )%>
                   <%=objPMod.ComposeHiddenTags()%>
                   <input type="hidden" name="rtag_id_list" value="<%=Request("rtag_id_list")%>">
+                  <input type="hidden" name="returnUrl" value="<%=returnUrl%>">
                   <input type="hidden" name="action" value="true">
                </td>
                <td background="images/bg_action_norm.gif" ><img src="images/h_trsp_dot.gif" width="5" height="30"></td>
             </tr>
             <tr>

Subversion Repositories DevTools

(root)/ManagerSuite/Release_Manager/trunk/form_edit_release.asp @ 5018 – Rev 4867 → 4955