WebSVN – DevTools – Diff – /ManagerSuite/Release_Manager/trunk/web/_form_new_version_page.asp

 '=====================================================
 %>
 <!--#include file="_tabs.asp"-->
 <!--#include file="_drawExtensionSelectBox.asp"-->
 <!--#include file="class/classSortHelper.asp"-->
-<script language="JavaScript" src="scripts/remote_scripting.js?ver=<%=VixVerNum%>"></script>
-<script type="text/javascript" src="scripts/json2.js?ver=<%=VixVerNum%>"></script>
 <!--#include file="_jquery_includes.asp"-->
 <!-- TIPS -->
 <script language="JavaScript" src="images/tipster.js?ver=<%=VixVerNum%>"></script>
 <script language="JavaScript" type="text/JavaScript">
 formTips.tips.BuildType = stdTip(200, 'Build Type',
 newPackage = 0
 parPage_title = "NEW VERSION"
-If ( parPkgName <> "" ) Then
+If ( parPkgName <> "" OR IsEmpty(parPv_id) ) Then
     newPackage = 1
     parPv_id = NULL
 End if
 majorState = ""
     ' Extract version number without extension
     verNumber = objPkgInfo.Item("pkg_version")
     verNumber = Mid( verNumber,1, Len(verNumber) - Len(objPkgInfo.Item("v_ext")))
+    'Determine current version mechanism: auto, manual
+    bIsAuto = objPkgInfo.Item("change_type") <> "F"
     bIsCots = HasCotsExtension(objPkgInfo.Item("v_ext"))
     'Disable the "Auto" build option if the package is a COTS package and the version doesn't have a patch-build number.
-    bDisableAuto = bIsCots and not HasPatchBuildNumber(objPkgInfo.Item("pkg_version"))
+    bDisableAuto = bIsCots and not HasPatchBuildNumber(objPkgInfo.Item("pkg_version")) and not bIsAuto
     'Enable only the "Patch Change" option if the package is a COTS package and the version has a patch-build number.
     bPatchOnly = bIsCots and not HasWellFormedVersion(objPkgInfo.Item("pkg_version")) and HasPatchBuildNumber(objPkgInfo.Item("pkg_version"))
     ' Use existing change type and build type
-    bIsAuto = objPkgInfo.Item("change_type") <> "F" AND NOT bDisableAuto
+    If bDisableAuto Then
+        bIsAuto = False
+    End If
     majorState = ""
     minorState = ""
     patchState = ""
     If objPkgInfo.Item("change_type") = "M" Then
     'Enable only the "Patch Change" option if the package is a COTS package and the version has a patch-build number.
     bPatchOnly = bIsCots and not HasWellFormedVersion(objPkgInfo.Item("pkg_version")) and HasPatchBuildNumber(objPkgInfo.Item("pkg_version"))
     'if "Auto" build option is disabled then select the Manual option
     bIsAuto = NOT bDisableAuto
+    If bDisableAuto Then
+        objPkgInfo.Item("build_type") = "M"
+    End If
 Else
     ' If New Package and First version
     parPage_title = "NEW PACKAGE and FIRST VERSION"
     bIsCots = FALSE
     var f = document.getElementById('NEWversion');
     if ( f.newPackage.value> 0 || f.renamePackage.value> 0 ) {
         reseteMessage();
         MM_validateForm("--Silent",'FRpkgName','Package Name','RisPackage');
         checkPackageHighlight( ! document.MM_returnValue, 'Name well formed', 'Invalid Characters in name');
-        if ( ! document.MM_returnValue ) return;
+        if ( ! document.MM_returnValue ) return jQuery.Deferred().resolve();;
         MM_showProgressBar();
         return jQuery.get('_json_checkPackage.asp',{
                        packageName :  document.getElementById('FRpkgName').value,
                        Opr : 'checkName'
 </script>
 <script>
 <%If NOT bInIframe Then %>
-    function Dependency()
+    function Dependency() {
-    {
     <%If parRename <> "" Then%>
        parent.window.close();
     <%ElseIf newPackage> 0 Then%>
        parent.window.location.href="<%=rFile%>?rtag_id=<%=parRtag_id%>";
     <%Else%>
        parent.window.location.href="<%=rFile%>?rtag_id=<%=parRtag_id%>&pv_id=<%=parPv_id%>";
     <%End If%>
+    }
-    function resizeFrame()
+    function resizeFrame() {
-    {
+    }
 <%Else%>
-    function Dependency()
+    function Dependency() {
-    {
 		parent.closeIFrame();
+    }
-    function resizeFrame()
+    function resizeFrame() {
-    {
         parent.resizeIframe();
+    }
 <%End If%>
 ////////////////////////////////////////////////////////////////////////////////////////////////////////
                                     parent.window.close();
                                     window.opener.document.location='<%=rFile%>?rtag_id=<%=parRtag_id%>&pv_id=<%=parPv_id%>';
                                 <%Else%>
                                     window.parent.location.reload(false);
                                 <%End If%>
-                                return true;
+                                return false;
+                            }
                         });
                     <%Else%>
                         f.action='_new_version.asp';
-                        parent.window.location.href='<%=rFile%>?rtag_id=<%=parRtag_id%>&pv_id=<%=parPv_id%>';
+                        f.submit();
-                        return true;
+                        return false;
                     <%End If%>
+                }
                 // Hide progress bar that is exposed because the previous tests were OK
                 MM_hideProgressBar();
                 resizeFrame();

Subversion Repositories DevTools

(root)/ManagerSuite/Release_Manager/trunk/web/_form_new_version_page.asp – Rev 7001 → 7002