Subversion Repositories DevTools

Rev

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

Rev 5072 Rev 5081
Line 50... Line 50...
50
Dim SSsql, retVal, rsCQ, DEVIiss
50
Dim SSsql, retVal, rsCQ, DEVIiss
51
Dim a, b, c, d, pkgversion, errormsg, ChangeASource, ChangeAUpdate, ChangeBSource, ChangeBUpdate, pvCollectionA, pvCollectionB
51
Dim a, b, c, d, pkgversion, errormsg, ChangeASource, ChangeAUpdate, ChangeBSource, ChangeBUpdate, pvCollectionA, pvCollectionB
52
Dim source_change, scFlag
52
Dim source_change, scFlag
53
Dim changeType
53
Dim changeType
54
Dim pendingAdditions
54
Dim pendingAdditions
-
 
55
Dim isaSdk                  ' Target is an SDK based package
55
 
56
 
56
'------------ Constants Declaration -----------
57
'------------ Constants Declaration -----------
57
Const LIMG_UPDATED = "<img src='images/i_updated.gif' width='11' height='11' border='0' hspace='5' align='absmiddle' title='Updated'>"
58
Const LIMG_UPDATED = "<img src='images/i_updated.gif' width='11' height='11' border='0' hspace='5' align='absmiddle' title='Updated'>"
58
Const LIMG_RIPPLED = "<img src='images/i_rippled.gif' width='11' height='11' border='0' hspace='5' align='absmiddle' title='Rippled'>"
59
Const LIMG_RIPPLED = "<img src='images/i_rippled.gif' width='11' height='11' border='0' hspace='5' align='absmiddle' title='Rippled'>"
59
Const LIMG_ADDED = "<img src='images/i_added.gif' width='11' height='11' border='0' hspace='5' align='absmiddle' title='Added'>"
60
Const LIMG_ADDED = "<img src='images/i_added.gif' width='11' height='11' border='0' hspace='5' align='absmiddle' title='Added'>"
Line 67... Line 68...
67
Const LCOLOR_BLANK = "#FFFFFF"
68
Const LCOLOR_BLANK = "#FFFFFF"
68
Const LIMG_MERGE = "<img src='images/bt_move_all_right.gif' title='Click to merge.' border='0'>"
69
Const LIMG_MERGE = "<img src='images/bt_move_all_right.gif' title='Click to merge.' border='0'>"
69
Const LIMG_MERGE_WARN = "<img src='images/bt_move_warn_right.gif' title='Right hand side version is newer.' border='0'>"
70
Const LIMG_MERGE_WARN = "<img src='images/bt_move_warn_right.gif' title='Right hand side version is newer.' border='0'>"
70
Const LIMG_REMOVE = "<img src='images/bt_remove.gif' title='Remove this version from release.' border='0'>"
71
Const LIMG_REMOVE = "<img src='images/bt_remove.gif' title='Remove this version from release.' border='0'>"
71
Const LIMG_UNDO = "<img src='images/bt_undo.gif' title='Undo merge/remove.' border='0'>"
72
Const LIMG_UNDO = "<img src='images/bt_undo.gif' title='Undo merge/remove.' border='0'>"
-
 
73
Const LIMG_SDK = "<img src='images/i_sdkpkg.png' width='18' height='18' border='0' title='Package is imported from an SDK and cannot be modified'>"
72
'------------ Variable Init -------------------
74
'------------ Variable Init -------------------
73
parRtagA = Request("rtagA")
75
parRtagA = Request("rtagA")
74
parRtagB = Request("rtagB")
76
parRtagB = Request("rtagB")
75
Set objRelCollectorA = CreateObject("Scripting.Dictionary")
77
Set objRelCollectorA = CreateObject("Scripting.Dictionary")
76
Set objRelCollectorB = CreateObject("Scripting.Dictionary")
78
Set objRelCollectorB = CreateObject("Scripting.Dictionary")
Line 1069... Line 1071...
1069
                                                    btnRemove = LIMG_REMOVE
1071
                                                    btnRemove = LIMG_REMOVE
1070
                                                    colorA = LCOLOR_NOT_CHANGED
1072
                                                    colorA = LCOLOR_NOT_CHANGED
1071
                                                    colorB = LCOLOR_NOT_CHANGED
1073
                                                    colorB = LCOLOR_NOT_CHANGED
1072
 
1074
 
1073
                                                    changeType = rsQry("change_type")
1075
                                                    changeType = rsQry("change_type")
-
 
1076
                                                    isaSdk = rsQry("PKG_SDK_B")
1074
 
1077
 
1075
                                                    Select Case changeType
1078
                                                    Select Case changeType
1076
                                                        Case "U"
1079
                                                        Case "U"
1077
                                                            colorA = LCOLOR_CHANGED
1080
                                                            colorA = LCOLOR_CHANGED
1078
                                                            colorB = LCOLOR_CHANGED
1081
                                                            colorB = LCOLOR_CHANGED
Line 1203... Line 1206...
1203
                                                                    <DIV id="PVA<%=rowId%>" style="background:<%=colorA%>; padding:5px;">
1206
                                                                    <DIV id="PVA<%=rowId%>" style="background:<%=colorA%>; padding:5px;">
1204
                                                                        <%=rsQry("pkg_name_a") &" "& rsQry("pkg_version_a")%>
1207
                                                                        <%=rsQry("pkg_name_a") &" "& rsQry("pkg_version_a")%>
1205
                                                                    </DIV>
1208
                                                                    </DIV>
1206
                                                                    <input type="hidden" id="UNDOCOLORA_<%=rowId%>" value="<%=colorA%>">
1209
                                                                    <input type="hidden" id="UNDOCOLORA_<%=rowId%>" value="<%=colorA%>">
1207
                                                                </td>
1210
                                                                </td>
-
 
1211
 
-
 
1212
                                                                <%
-
 
1213
                                                                Dim pkgADisplayControl
-
 
1214
                                                                pkgADisplayControl = objRelCollectorB.Item("official") <> "Y"
-
 
1215
                                                                If IsNull( changeType ) OR (changeType = "A")  OR (changeType = "0") Then pkgADisplayControl = FALSE
-
 
1216
                                                                If isaSdk Then pkgADisplayControl = FALSE
-
 
1217
                                                                %>
1208
                                                                <td bgcolor="#F5F5F5">
1218
                                                                <td bgcolor="#F5F5F5">
1209
                                                                    <%If objRelCollectorB.Item("official") <> "Y" Then%>
1219
                                                                    <%If pkgADisplayControl Then%>
1210
                                                                        <DIV id="IMGMERGE<%=rowId%>" <%If (changeType = "A")  OR IsNull( changeType ) Then%>style="display:none;"<%End If%>><a href="javascript:;" onClick="MergePackage( '<%=rsQry("pv_id_a")%>', '<%=rsQry("pv_id_b")%>', '<%=rowId%>' );"><%=btnMerge%></a></DIV>
1220
                                                                        <DIV id="IMGMERGE<%=rowId%>"><a href="javascript:;" onClick="MergePackage( '<%=rsQry("pv_id_a")%>', '<%=rsQry("pv_id_b")%>', '<%=rowId%>' );"><%=btnMerge%></a></DIV>
1211
                                                                    <%End If%>
1221
                                                                    <%End If%>
1212
                                                                </td>
1222
                                                                </td>
-
 
1223
 
1213
                                                                <td bgcolor="#E4E9EC">
1224
                                                                <td bgcolor="#E4E9EC">
1214
                                                                    <DIV id="IMGSTATE<%=rowId%>" ><%=ChangeTypeIcon%></DIV>
1225
                                                                    <DIV id="IMGSTATE<%=rowId%>" ><%=ChangeTypeIcon%></DIV>
1215
                                                                    <input type="hidden" id="CHANGETYPE_<%=rowId%>" value="<%=changeType%>">
1226
                                                                    <input type="hidden" id="CHANGETYPE_<%=rowId%>" value="<%=changeType%>">
1216
                                                                </td>
1227
                                                                </td>
-
 
1228
 
-
 
1229
                                                                <%
-
 
1230
                                                                Dim pkgBDisplayControl
-
 
1231
                                                                pkgBDisplayControl = objRelCollectorB.Item("official") <> "Y"
-
 
1232
                                                                If changeType = "R" Then pkgBDisplayControl = FALSE
-
 
1233
                                                                If isaSdk Then pkgBDisplayControl = FALSE
-
 
1234
                                                                %>
1217
                                                                <td bgcolor="#F5F5F5">
1235
                                                                <td bgcolor="#F5F5F5">
1218
                                                                    <%If objRelCollectorB.Item("official") <> "Y" Then%>
1236
                                                                    <%If pkgBDisplayControl Then%>
1219
                                                                        <DIV id="IMGREMOVE<%=rowId%>" <%If changeType = "R" Then%>style="display:none;"<%End If%>><a href="javascript:;" onClick="RemovePackage( '<%=rsQry("pv_id_a")%>', '<%=rsQry("pv_id_b")%>', '<%=rowId%>' );"><%=btnRemove%></a></DIV>
1237
                                                                        <DIV id="IMGREMOVE<%=rowId%>" ><a href="javascript:;" onClick="RemovePackage( '<%=rsQry("pv_id_a")%>', '<%=rsQry("pv_id_b")%>', '<%=rowId%>' );"><%=btnRemove%></a></DIV>
-
 
1238
                                                                    <%ElseIf isaSdk Then %> 
-
 
1239
                                                                        <DIV ><%=LIMG_SDK%></DIV>
1220
                                                                    <%End If%>
1240
                                                                    <%End If%>
1221
                                                                </td>
1241
                                                                </td>
-
 
1242
 
1222
                                                                <td class="body_row" nowrap>
1243
                                                                <td class="body_row" nowrap>
1223
                                                                    <DIV id="PVB<%=rowId%>" style="background:<%=colorB%>; padding:5px;">
1244
                                                                    <DIV id="PVB<%=rowId%>" style="background:<%=colorB%>; padding:5px;">
1224
                                                                        <%If IsNull(rsQry("pv_id_b")) Then %>
1245
                                                                        <%If IsNull(rsQry("pv_id_b")) Then %>
1225
                                                                            <%If Is_Pending_Sub(Request("rtagB"), rsQry("pv_id_a")) Then%>
1246
                                                                            <%If Is_Pending_Sub(Request("rtagB"), rsQry("pv_id_a")) Then%>
1226
                                                                                (removal pending<%=Quick_Help("RemovalPending")%>)
1247
                                                                                (removal pending<%=Quick_Help("RemovalPending")%>)
Line 1242... Line 1263...
1242
                                                                    <input type="hidden" id="UNDOCOLORB_<%=rowId%>" value="<%=colorB%>">
1263
                                                                    <input type="hidden" id="UNDOCOLORB_<%=rowId%>" value="<%=colorB%>">
1243
                                                                    <input type="hidden" name="addpkg" id="ADDPKG_<%=rowId%>" value="">
1264
                                                                    <input type="hidden" name="addpkg" id="ADDPKG_<%=rowId%>" value="">
1244
                                                                    <input type="hidden" name="removepkg" id="REMOVEPKG_<%=rowId%>" value="">
1265
                                                                    <input type="hidden" name="removepkg" id="REMOVEPKG_<%=rowId%>" value="">
1245
                                                                    <input type="hidden" id="UNDOPKG_<%=rowId%>" value="<%=rsQry("pkg_name_b") &" "& rsQry("pkg_version_b")%>">
1266
                                                                    <input type="hidden" id="UNDOPKG_<%=rowId%>" value="<%=rsQry("pkg_name_b") &" "& rsQry("pkg_version_b")%>">
1246
                                                                </td>
1267
                                                                </td>
-
 
1268
 
1247
                                                                <td bgcolor="#F5F5F5">
1269
                                                                <td bgcolor="#F5F5F5">
1248
                                                                    <DIV id="IMGUNDO<%=rowId%>" style="display:none;" >
1270
                                                                    <DIV id="IMGUNDO<%=rowId%>" style="display:none;" >
1249
                                                                        <a href="javascript:;" onClick="UndoPackage( '<%=rowId%>' );"><%=LIMG_UNDO%></a>
1271
                                                                        <a href="javascript:;" onClick="UndoPackage( '<%=rowId%>' );"><%=LIMG_UNDO%></a>
1250
                                                                    </DIV>
1272
                                                                    </DIV>
1251
                                                                </td>
1273
                                                                </td>