Subversion Repositories DevTools

Rev

Rev 7001 | Rev 7030 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 7001 Rev 7002
Line 5... Line 5...
5
'=====================================================
5
'=====================================================
6
%>
6
%>
7
<!--#include file="_tabs.asp"-->
7
<!--#include file="_tabs.asp"-->
8
<!--#include file="_drawExtensionSelectBox.asp"-->
8
<!--#include file="_drawExtensionSelectBox.asp"-->
9
<!--#include file="class/classSortHelper.asp"-->
9
<!--#include file="class/classSortHelper.asp"-->
10
<script language="JavaScript" src="scripts/remote_scripting.js?ver=<%=VixVerNum%>"></script>
-
 
11
<script type="text/javascript" src="scripts/json2.js?ver=<%=VixVerNum%>"></script>
-
 
12
<!--#include file="_jquery_includes.asp"-->
10
<!--#include file="_jquery_includes.asp"-->
13
<!-- TIPS -->
11
<!-- TIPS -->
14
<script language="JavaScript" src="images/tipster.js?ver=<%=VixVerNum%>"></script>
12
<script language="JavaScript" src="images/tipster.js?ver=<%=VixVerNum%>"></script>
15
<script language="JavaScript" type="text/JavaScript">
13
<script language="JavaScript" type="text/JavaScript">
16
formTips.tips.BuildType = stdTip(200, 'Build Type',
14
formTips.tips.BuildType = stdTip(200, 'Build Type',
Line 309... Line 307...
309
 
307
 
310
newPackage = 0
308
newPackage = 0
311
 
309
 
312
parPage_title = "NEW VERSION"
310
parPage_title = "NEW VERSION"
313
 
311
 
314
If ( parPkgName <> "" ) Then
312
If ( parPkgName <> "" OR IsEmpty(parPv_id) ) Then
315
    newPackage = 1
313
    newPackage = 1
316
    parPv_id = NULL
314
    parPv_id = NULL
317
End if
315
End if
318
    
316
    
319
majorState = ""
317
majorState = ""
Line 346... Line 344...
346
 
344
 
347
    ' Extract version number without extension
345
    ' Extract version number without extension
348
    verNumber = objPkgInfo.Item("pkg_version")
346
    verNumber = objPkgInfo.Item("pkg_version")
349
    verNumber = Mid( verNumber,1, Len(verNumber) - Len(objPkgInfo.Item("v_ext")))
347
    verNumber = Mid( verNumber,1, Len(verNumber) - Len(objPkgInfo.Item("v_ext")))
350
 
348
 
-
 
349
    'Determine current version mechanism: auto, manual
-
 
350
    bIsAuto = objPkgInfo.Item("change_type") <> "F"
351
    bIsCots = HasCotsExtension(objPkgInfo.Item("v_ext"))
351
    bIsCots = HasCotsExtension(objPkgInfo.Item("v_ext"))
352
    'Disable the "Auto" build option if the package is a COTS package and the version doesn't have a patch-build number.
352
    'Disable the "Auto" build option if the package is a COTS package and the version doesn't have a patch-build number.
353
    bDisableAuto = bIsCots and not HasPatchBuildNumber(objPkgInfo.Item("pkg_version"))
353
    bDisableAuto = bIsCots and not HasPatchBuildNumber(objPkgInfo.Item("pkg_version")) and not bIsAuto
354
    'Enable only the "Patch Change" option if the package is a COTS package and the version has a patch-build number.
354
    'Enable only the "Patch Change" option if the package is a COTS package and the version has a patch-build number.
355
    bPatchOnly = bIsCots and not HasWellFormedVersion(objPkgInfo.Item("pkg_version")) and HasPatchBuildNumber(objPkgInfo.Item("pkg_version"))
355
    bPatchOnly = bIsCots and not HasWellFormedVersion(objPkgInfo.Item("pkg_version")) and HasPatchBuildNumber(objPkgInfo.Item("pkg_version"))
356
 
356
 
357
    ' Use existing change type and build type
357
    ' Use existing change type and build type
358
    bIsAuto = objPkgInfo.Item("change_type") <> "F" AND NOT bDisableAuto
358
    If bDisableAuto Then
-
 
359
        bIsAuto = False
-
 
360
    End If
359
 
361
 
360
    majorState = ""
362
    majorState = ""
361
    minorState = ""
363
    minorState = ""
362
    patchState = ""
364
    patchState = ""
363
    If objPkgInfo.Item("change_type") = "M" Then
365
    If objPkgInfo.Item("change_type") = "M" Then
Line 387... Line 389...
387
    'Enable only the "Patch Change" option if the package is a COTS package and the version has a patch-build number.
389
    'Enable only the "Patch Change" option if the package is a COTS package and the version has a patch-build number.
388
    bPatchOnly = bIsCots and not HasWellFormedVersion(objPkgInfo.Item("pkg_version")) and HasPatchBuildNumber(objPkgInfo.Item("pkg_version"))
390
    bPatchOnly = bIsCots and not HasWellFormedVersion(objPkgInfo.Item("pkg_version")) and HasPatchBuildNumber(objPkgInfo.Item("pkg_version"))
389
 
391
 
390
    'if "Auto" build option is disabled then select the Manual option
392
    'if "Auto" build option is disabled then select the Manual option
391
    bIsAuto = NOT bDisableAuto
393
    bIsAuto = NOT bDisableAuto
-
 
394
    If bDisableAuto Then
-
 
395
        objPkgInfo.Item("build_type") = "M"
-
 
396
    End If
392
 
397
 
393
Else
398
Else
394
    ' If New Package and First version
399
    ' If New Package and First version
395
    parPage_title = "NEW PACKAGE and FIRST VERSION"
400
    parPage_title = "NEW PACKAGE and FIRST VERSION"
396
    bIsCots = FALSE
401
    bIsCots = FALSE
Line 601... Line 606...
601
    var f = document.getElementById('NEWversion');
606
    var f = document.getElementById('NEWversion');
602
    if ( f.newPackage.value> 0 || f.renamePackage.value> 0 ) {
607
    if ( f.newPackage.value> 0 || f.renamePackage.value> 0 ) {
603
        reseteMessage();
608
        reseteMessage();
604
        MM_validateForm("--Silent",'FRpkgName','Package Name','RisPackage');
609
        MM_validateForm("--Silent",'FRpkgName','Package Name','RisPackage');
605
        checkPackageHighlight( ! document.MM_returnValue, 'Name well formed', 'Invalid Characters in name');
610
        checkPackageHighlight( ! document.MM_returnValue, 'Name well formed', 'Invalid Characters in name');
606
        if ( ! document.MM_returnValue ) return;
611
        if ( ! document.MM_returnValue ) return jQuery.Deferred().resolve();;
607
 
612
 
608
        MM_showProgressBar();
613
        MM_showProgressBar();
609
        return jQuery.get('_json_checkPackage.asp',{
614
        return jQuery.get('_json_checkPackage.asp',{
610
                       packageName :  document.getElementById('FRpkgName').value,
615
                       packageName :  document.getElementById('FRpkgName').value,
611
                       Opr : 'checkName'
616
                       Opr : 'checkName'
Line 860... Line 865...
860
</script>
865
</script>
861
 
866
 
862
<script>
867
<script>
863
 
868
 
864
<%If NOT bInIframe Then %>
869
<%If NOT bInIframe Then %>
865
    function Dependency()
870
    function Dependency() {
866
    {
-
 
867
    <%If parRename <> "" Then%>
871
    <%If parRename <> "" Then%>
868
       parent.window.close();
872
       parent.window.close();
869
    <%ElseIf newPackage> 0 Then%>
873
    <%ElseIf newPackage> 0 Then%>
870
       parent.window.location.href="<%=rFile%>?rtag_id=<%=parRtag_id%>";
874
       parent.window.location.href="<%=rFile%>?rtag_id=<%=parRtag_id%>";
871
    <%Else%>
875
    <%Else%>
872
       parent.window.location.href="<%=rFile%>?rtag_id=<%=parRtag_id%>&pv_id=<%=parPv_id%>";
876
       parent.window.location.href="<%=rFile%>?rtag_id=<%=parRtag_id%>&pv_id=<%=parPv_id%>";
873
    <%End If%>
877
    <%End If%>
874
    }
878
    }
875
 
879
 
876
    function resizeFrame()
880
    function resizeFrame() {
877
    {
-
 
878
    }
881
    }
879
<%Else%>
882
<%Else%>
880
    function Dependency()
883
    function Dependency() {
881
    {
-
 
882
		parent.closeIFrame();
884
		parent.closeIFrame();
883
    }
885
    }
884
 
886
 
885
    function resizeFrame()
887
    function resizeFrame() {
886
    {
-
 
887
        parent.resizeIframe();
888
        parent.resizeIframe();
888
    }
889
    }
889
<%End If%>
890
<%End If%>
890
 
891
 
891
////////////////////////////////////////////////////////////////////////////////////////////////////////
892
////////////////////////////////////////////////////////////////////////////////////////////////////////
Line 927... Line 928...
927
                                    parent.window.close();
928
                                    parent.window.close();
928
                                    window.opener.document.location='<%=rFile%>?rtag_id=<%=parRtag_id%>&pv_id=<%=parPv_id%>';
929
                                    window.opener.document.location='<%=rFile%>?rtag_id=<%=parRtag_id%>&pv_id=<%=parPv_id%>';
929
                                <%Else%>
930
                                <%Else%>
930
                                    window.parent.location.reload(false);
931
                                    window.parent.location.reload(false);
931
                                <%End If%>
932
                                <%End If%>
932
                                return true;
933
                                return false;
933
                            }
934
                            }
934
                        });
935
                        });
935
                    <%Else%>
936
                    <%Else%>
936
                        f.action='_new_version.asp';
937
                        f.action='_new_version.asp';
937
                        parent.window.location.href='<%=rFile%>?rtag_id=<%=parRtag_id%>&pv_id=<%=parPv_id%>';
938
                        f.submit();
938
                        return true;
939
                        return false;
939
                    <%End If%>
940
                    <%End If%>
940
                }
941
                }
941
                // Hide progress bar that is exposed because the previous tests were OK
942
                // Hide progress bar that is exposed because the previous tests were OK
942
                MM_hideProgressBar();
943
                MM_hideProgressBar();
943
                resizeFrame();
944
                resizeFrame();