| Line 480... |
Line 480... |
| 480 |
|
480 |
|
| 481 |
' Business Rules restricting the use of the merge feature...
|
481 |
' Business Rules restricting the use of the merge feature...
|
| 482 |
' Bypass merge if the destination release is in closed or archive mode, or if user does not have
|
482 |
' Bypass merge if the destination release is in closed or archive mode, or if user does not have
|
| 483 |
' merge permissions
|
483 |
' merge permissions
|
| 484 |
If releaseMode <> enumDB_RELEASE_IN_CLOSED_MODE AND releaseMode <> enumDB_RELEASE_IN_ARCHIVE_MODE _
|
484 |
If releaseMode <> enumDB_RELEASE_IN_CLOSED_MODE AND releaseMode <> enumDB_RELEASE_IN_ARCHIVE_MODE _
|
| 485 |
AND (objAccessControl.IsActive("MergeRelease")) THEN
|
485 |
AND (canActionControlInProject("MergeRelease")) THEN
|
| 486 |
|
486 |
|
| 487 |
Set dAddPkgList = CreateObject("Scripting.Dictionary")
|
487 |
Set dAddPkgList = CreateObject("Scripting.Dictionary")
|
| 488 |
Set dRemovePkgList = CreateObject("Scripting.Dictionary")
|
488 |
Set dRemovePkgList = CreateObject("Scripting.Dictionary")
|
| 489 |
|
489 |
|
| 490 |
'--- Get Add Packages ---
|
490 |
'--- Get Add Packages ---
|
| Line 940... |
Line 940... |
| 940 |
</td>
|
940 |
</td>
|
| 941 |
<td width="1" align="right" bgcolor="#DAD7C8" nowrap>
|
941 |
<td width="1" align="right" bgcolor="#DAD7C8" nowrap>
|
| 942 |
<table width="100%" border="0" cellspacing="0" cellpadding="0">
|
942 |
<table width="100%" border="0" cellspacing="0" cellpadding="0">
|
| 943 |
<tr>
|
943 |
<tr>
|
| 944 |
<td>
|
944 |
<td>
|
| 945 |
<%If (objRelCollectorB.Item("official") <> "Y" AND objRelCollectorB.Item("official") <> "C" ) AND (objAccessControl.IsActive("MergeRelease")) Then%>
|
945 |
<%If (objRelCollectorB.Item("official") <> "Y" AND objRelCollectorB.Item("official") <> "C" ) AND (canActionControlInProject("MergeRelease")) Then%>
|
| 946 |
<input type="submit" name="btn" value="Merge" class="form_btn_comp" style="margin-right:10px;" <%If (parRtagA = "") OR (parRtagB = "")Then%>disabled<%End If%>>
|
946 |
<input type="submit" name="btn" value="Merge" class="form_btn_comp" style="margin-right:10px;" <%If (parRtagA = "") OR (parRtagB = "")Then%>disabled<%End If%>>
|
| 947 |
<%End If%>
|
947 |
<%End If%>
|
| 948 |
</td>
|
948 |
</td>
|
| 949 |
<td>
|
949 |
<td>
|
| 950 |
<%If (objRelCollectorB.Item("official") = "C" ) AND (objAccessControl.IsActive("MergeReleaseForCCB")) Then%>
|
950 |
<%If (objRelCollectorB.Item("official") = "C" ) AND (canActionControlInProject("MergeReleaseForCCB")) Then%>
|
| 951 |
<input type="submit" name="btn" value="Merge" class="form_btn_comp" style="margin-right:10px;" <%If (parRtagA = "") OR (parRtagB = "")Then%>disabled<%End If%>>
|
951 |
<input type="submit" name="btn" value="Merge" class="form_btn_comp" style="margin-right:10px;" <%If (parRtagA = "") OR (parRtagB = "")Then%>disabled<%End If%>>
|
| 952 |
<%End If%>
|
952 |
<%End If%>
|
| 953 |
</td>
|
953 |
</td>
|
| 954 |
<td>
|
954 |
<td>
|
| 955 |
<input type="submit" name="btn" value="Exit" class="form_btn_comp">
|
955 |
<input type="submit" name="btn" value="Exit" class="form_btn_comp">
|