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

       <%End If%></legend>
       <a name="UNIT_TESTS"></a>
       <table width="100%" border="0" cellspacing="1" cellpadding="2">
          <tr>
             <td align="right" valign="bottom">
+               <%If ( scriptName = "fixed_issues.asp" ) Then%>
+                  <%If objAccessControl.UserLogedIn AND (pageIsEditable OR (pkgInfoHash.Item("dlocked") = "Y")) Then%>
-               <%If pageIsEditable Then%>
+                     <a href='javascript:;' onClick="MM_openBrWindow('_wform_unit_test.asp?pv_id=<%=parPv_id%>&rtag_id=<%=parRtag_id%>','UnitTest','resizable=yes,width=700,height=550')" class="txt_linked">New Test<img src="images/i_new.gif" width="13" height="13" hspace="2" border="0" align="absmiddle" alt="Add new test."></a>
-                  <a href='javascript:;' onClick="MM_openBrWindow('_wform_unit_test.asp?pv_id=<%=parPv_id%>&rtag_id=<%=parRtag_id%>','UnitTest','resizable=yes,width=700,height=550')" class="txt_linked">New Test<img src="images/i_new.gif" width="13" height="13" hspace="2" border="0" align="absmiddle" alt="Add new test."></a>
+                  <%End If%>
                   <%If (NOT testCheckTestsFound) AND (testCheckMSG_ID = 0)  Then%>
                      <a href='_not_done_unit_test.asp?pv_id=<%=parPv_id%>&rtag_id=<%=parRtag_id%>&notdone=Y' class='txt_linked'>Click here if Not Done!<img src="images/i_new.gif" width="13" height="13" hspace="2" border="0" align="absmiddle" alt="Add new test."></a>
                   <%End If%>
                <%End If%>
             </td>
                   <td nowrap background="images/bg_form_lightbluedark.gif" class="sublbox_txt" valign="top" align="center"><%=FormatAccepted( rsQry("test_accepted"), rsQry("test_id") )%></td>
                   <td nowrap background="images/bg_form_lightgray.gif" class="form_item" valign="top"><%If NOT IsNull(rsQry("reviewee")) Then%><%=EuroDate ( rsQry("acceptance_date") )%><br>by <a href="mailto:<%=rsQry("reviewee_email")%>" class="txt_linked"><%=rsQry("reviewee")%></a><%End If%></td>
                   <td background="images/bg_form_lightgray.gif" class="form_item" valign="top"><%=NewLine_To_BR( To_HTML( rsQry("review_comments") ))%></td>
+                  <%
-                  <%If NOT pageIsEditable Then%>
+                  If (  (    pageIsEditable _
+                         AND (scriptName = "fixed_issues.asp") _
+                         AND (IsNull(rsQry("test_accepted")) OR (rsQry("test_accepted") = enumUNIT_TEST_NOTACCEPTED))) _
+                      OR _
+                        (    objAccessControl.UserLogedIn _
-                     <td background="images/bg_form_lightgray.gif" valign="top"></td>
+                         AND (scriptName = "fixed_issues.asp") _
+                         AND (pkgInfoHash.Item("dlocked") = "Y") _
+                         AND (IsNull(rsQry("test_accepted")) OR (rsQry("test_accepted") = enumUNIT_TEST_NOTACCEPTED)) _
+                         AND (rsQry("test_type_id") <> CStr(enumTEST_TYPE_AUTOBUILD_UTF))) ) Then
-                  <%Else%>
+                  %>
                      <td background="images/bg_form_lightgray.gif" valign="top"><%If NOT IsNull(rsQry("test_id")) Then%><a href="_remove_unit_test.asp?test_id=<%=rsQry("test_id")%>&pv_id=<%=parPv_id%>&rtag_id=<%=parRtag_id%>" onClick="return confirmDelete('this unit test');"><img src="images/i_delete.gif" alt="Remove this test." width="13" height="12" hspace="3" border="0"></a><%End If%></td>
+                  <%Else%>
+                     <td background="images/bg_form_lightgray.gif" valign="top"></td>
                   <%End If%>
                </tr>
+               <%
-               <%rsQry.MoveNext
+               rsQry.MoveNext
-            WEnd%>
+            WEnd
+            %>
             <tr>
                <td class="form_field"></td>
                <td class="form_field"></td>
                <td class="form_field"></td>
                <td class="form_field"></td>
                <td class="form_field"></td>
+               <td class="form_field" align="center">
-               <td class="form_field" align="center"><%If (testCheckTestsFound) AND (testCheckMSG_ID = 0) AND ( scriptName = "fixed_issues.asp" ) AND pageIsEditable Then%><input type="submit" name="Apply" value="Apply" class="form_btn"><%End If%></td>
+                  <%If (testCheckTestsFound) AND (testCheckMSG_ID = 0) AND ( scriptName = "fixed_issues.asp" ) AND pageIsEditable Then%>
+                     <input type="submit" name="Apply" value="Apply" class="form_btn">
+                  <%End If%>
+               </td>
                <td class="form_field"></td>
                <td class="form_field"></td>
                <td class="form_field"></td>
             </tr>
             <input name="pv_id" type="hidden" value="<%=parPv_id%>">
    <fieldset class="fset"><legend class="body_colb"><img src='images/s_code_review.gif' width='21' height='23' hspace='4' border='0' align='absmiddle'>Code Review</legend>
       <a name="CODE_REVIEW" id="CODE_REVIEW"></a>
       <%Set rsQry = OraDatabase.DbCreateDynaset( SQL_CodeReview ( parPv_id ), cint(0))%>
       <table width="100%" border="0" cellspacing="1" cellpadding="2">
          <tr>
-            <td align="right" valign="bottom"><%If ( scriptName = "fixed_issues.asp" ) Then%>
+            <td align="right" valign="bottom">
-               <%If pageIsEditable Then%>
+               <%If ( scriptName = "fixed_issues.asp" ) Then%>
+                  <%If objAccessControl.UserLogedIn AND (pageIsEditable OR (pkgInfoHash.Item("dlocked") = "Y")) Then%>
-                  <a href='javascript:;' onClick="MM_openBrWindow('_wform_update_code_review.asp?pv_id=<%=parPv_id%>&rtag_id=<%=parRtag_id%>','CodeReviewEdit','scrollbars=yes,resizable=yes,width=950,height='+ ( screen.height - 100 ) +',top=0,left=0')" class="txt_linked">Edit<img src="images/i_edit.gif" width="12" height="12" hspace="2" border="0" align="absmiddle"></a>
+                     <a href='javascript:;' onClick="MM_openBrWindow('_wform_update_code_review.asp?pv_id=<%=parPv_id%>&rtag_id=<%=parRtag_id%>','CodeReviewEdit','scrollbars=yes,resizable=yes,width=950,height='+ ( screen.height - 100 ) +',top=0,left=0')" class="txt_linked">Edit<img src="images/i_edit.gif" width="12" height="12" hspace="2" border="0" align="absmiddle"></a>
-               <%End If%>
+                  <%End If%>
-               <%If rsQry.RecordCount > 0 Then%>
+                  <%If rsQry.RecordCount > 0 Then%>
-                  <%If NOT IsNull(rsQry("date_of_review")) Then%>
+                     <%If NOT IsNull(rsQry("date_of_review")) Then%>
-                     &nbsp;
+                        &nbsp;
-                     <a href='javascript:;' onClick="MM_openBrWindow('_wform_code_review.asp?pv_id=<%=parPv_id%>&rtag_id=<%=parRtag_id%>','CodeReviewView','scrollbars=yes,resizable=yes,width=950,height='+ ( screen.height - 100 ) +',top=0,left=0')" class="txt_linked">View<img src="images/i_open.gif" width="12" height="12" hspace="2" border="0" align="absmiddle"></a>
+                        <a href='javascript:;' onClick="MM_openBrWindow('_wform_code_review.asp?pv_id=<%=parPv_id%>&rtag_id=<%=parRtag_id%>','CodeReviewView','scrollbars=yes,resizable=yes,width=950,height='+ ( screen.height - 100 ) +',top=0,left=0')" class="txt_linked">View<img src="images/i_open.gif" width="12" height="12" hspace="2" border="0" align="absmiddle"></a>
+                     <%End If%>
                   <%End If%>
-               <%End If%>
                <%End If%>
             </td>
          </tr>
       </table>
       <%If ((NOT rsQry.BOF) AND (NOT rsQry.EOF)) Then%>
       <%Call GetCodeReviewURLs( parPv_id, rsCodeReviewURL )%>
       <table width="100%" border="0" cellspacing="1" cellpadding="2">
          <tr>
             <td align="left" valign="top" class="body_colb">Code Review URL for this version</td>
             <td align="right" valign="top" <%If NOT IsNull(rsCodeReviewURL("url")) Then Response.Write("colspan='5'")%>>
-               <%If pageIsEditable Then%>
+               <%If (scriptName = "fixed_issues.asp") AND objAccessControl.UserLogedIn AND (pageIsEditable OR (pkgInfoHash.Item("dlocked") = "Y")) Then%>
                   <a href="javascript:;" onclick="MM_openBrWindow('_wform_edit_code_review_url.asp?pv_id=<%=parPv_id%>&rtag_id=<%=parRtag_id%>','CodeReviewURLEdit','scrollbars=no,resizable=yes,width=930,height=185,top=0,left=0')" class="txt_linked">New<img src="images/i_new.gif" width="13" height="13" hspace="2" border="0" align="absmiddle"></a>
                <%End If%>
             </td>
          </tr>
          <%If IsNull(rsCodeReviewURL("full_url")) Then %>
                         <td background="images/bg_form_lightgray.gif" class="form_item" valign="top"><a href="<%=rsCodeReviewURL("full_url")%>" target="_blank" class="txt_linked"><%=rsCodeReviewURL("full_url")%></a></td>
                      <%End If%>
                      <td background="images/bg_form_lightgray.gif" class="form_item" valign="top"><%=rsCodeReviewURL("reason")%></td>
                      <td background="images/bg_form_lightgray.gif" class="form_item" valign="top"><%=rsCodeReviewURL("date_of_review")%></td>
                      <td background="images/bg_form_lightgray.gif" class="form_item" valign="top"><%=rsCodeReviewURL("last_modified")%></td>
-                     <%If pageIsEditable Then%>
+                     <%If (scriptName = "fixed_issues.asp") AND objAccessControl.UserLogedIn AND (pageIsEditable OR (pkgInfoHash.Item("dlocked") = "Y")) Then%>
                         <td background="images/bg_form_lightgray.gif" class="form_item" valign="top"><a href="javascript:;" onclick="MM_openBrWindow('_wform_edit_code_review_url.asp?pv_id=<%=parPv_id%>&rtag_id=<%=parRtag_id%>&cr_id=<%=rsCodeReviewURL("cr_id")%>','CodeReviewURLEdit','scrollbars=no,resizable=yes,width=930,height=185')" class="txt_linked"><img src="images/i_edit.gif" width="12" height="12" hspace="2" border="0" align="absmiddle" alt="Edit this code review URL"></a></td>
                         <td background="images/bg_form_lightgray.gif" class="form_item" valign="top"><a href="_remove_code_review_url.asp?cr_id=<%=rsCodeReviewURL("cr_id")%>&pv_id=<%=parPv_id%>&rtag_id=<%=parRtag_id%>" onclick="return confirmDelete('this code review URL from Release Manager');"><img src="images/i_delete.gif" width="13" height="12" hspace="2" border="0" alt="Delete this code review URL"></a></td>
                      <%Else%>
                         <td background="images/bg_form_lightgray.gif" class="form_item" valign="top"></td>
                         <td background="images/bg_form_lightgray.gif" class="form_item" valign="top"></td>
          Call LastPvId(pkgInfoHash.Item ("pv_id"))
          While rsQry("comments") = "Rippled Build."
             Call LastPvId(rsQry("last_pv_id"))
          Wend
          Dim sOldPkgVersion
+         Dim oldDlocked
-         Call Get_Pkg_Short_Info ( rsQry("pv_id"), NULL, NULL, sOldPkgVersion, NULL, NULL, NULL )
+         Call Get_Pkg_Short_Info ( rsQry("pv_id"), NULL, NULL, sOldPkgVersion, NULL, NULL, oldDlocked )
          Call GetCodeReviewURLs( rsQry("pv_id"), rsCodeReviewURL )
          %>
          <table width="100%" border="0" cellspacing="1" cellpadding="2">
             <tr>
                <td align="left" valign="top" class="body_colb" <%If NOT IsNull(rsCodeReviewURL("url")) Then Response.Write("colspan='6'")%>>Code Review URL for last non-ripple build (<a class="lbl_link" href="fixed_issues.asp?pv_id=<%=rsQry("pv_id")%>"><%=sOldPkgVersion%></a>)</td>
                            <td background="images/bg_form_lightgray.gif" class="form_item" valign="top"><a href="<%=rsCodeReviewURL("full_url")%>" target="_blank" class="txt_linked"><%=rsCodeReviewURL("full_url")%></a></td>
                         <%End If%>
                         <td background="images/bg_form_lightgray.gif" class="form_item" valign="top"><%=rsCodeReviewURL("reason")%></td>
                         <td background="images/bg_form_lightgray.gif" class="form_item" valign="top"><%=rsCodeReviewURL("date_of_review")%></td>
                         <td background="images/bg_form_lightgray.gif" class="form_item" valign="top"><%=rsCodeReviewURL("last_modified")%></td>
-                        <%If pageIsEditable Then%>
+                        <%If (scriptName = "fixed_issues.asp") AND objAccessControl.UserLogedIn AND (pageIsEditable OR (oldDlocked = "Y")) Then%>
                            <td background="images/bg_form_lightgray.gif" class="form_item" valign="top"><a href="javascript:;" onclick="MM_openBrWindow('_wform_edit_code_review_url.asp?pv_id=<%=rsCodeReviewURL("pv_id")%>&rtag_id=<%=parRtag_id%>&cr_id=<%=rsCodeReviewURL("cr_id")%>','CodeReviewURLEdit','scrollbars=no,resizable=yes,width=930,height=185')" class="txt_linked"><img src="images/i_edit.gif" width="12" height="12" hspace="2" border="0" align="absmiddle" alt="Edit this code review URL"></a></td>
                            <td background="images/bg_form_lightgray.gif" class="form_item" valign="top"><a href="_remove_code_review_url.asp?cr_id=<%=rsCodeReviewURL("cr_id")%>&pv_id=<%=rsCodeReviewURL("pv_id")%>&rtag_id=<%=parRtag_id%>" onclick="return confirmDelete('this code review URL from Release Manager');"><img src="images/i_delete.gif" width="13" height="12" hspace="2" border="0" alt="Delete this code review URL"></a></td>
                         <%Else%>
                            <td background="images/bg_form_lightgray.gif" class="form_item" valign="top"></td>
                            <td background="images/bg_form_lightgray.gif" class="form_item" valign="top"></td>

Subversion Repositories DevTools

(root)/ManagerSuite/Release_Manager/trunk/_release_notes.asp @ 157 – Rev 145 → 157