Changeset 20556

Timestamp:

03/09/10 08:49:45 (5 months ago)

Author:

uroslates

Message:

• Fix for bug-3148
  
• Refactoring Templates related css
  
• Templates: Include Modules is made required
  
• Fixing issue with Edit Template page modules list display(depending on template parent space)
  

Files:

• trunk/core/db/oracle/create-scripts/versions/9.2.0/update_system_properties.sql (modified) (1 diff)
• trunk/core/src/net/project/methodology/MethodologySpace.java (modified) (4 diffs)
• trunk/core/src/net/project/methodology/mvc/MethodologyController.java (modified) (3 diffs)
• trunk/core/src/net/project/view/pages/methodology/MethodologyAjaxHandler.java (modified) (1 diff)
• trunk/core/web/css/extjs/businessTheme.css (modified) (1 diff)
• trunk/core/web/css/methodology/methodologyList.css (modified) (1 diff)
• trunk/core/web/css/methodology/saveAsTemplateBusiness.css (deleted)
• trunk/core/web/css/methodology/saveAsTemplateProject.css (deleted)
• trunk/core/web/jsp/business/Setup.jsp (modified) (2 diffs)
• trunk/core/web/jsp/methodology/MethodologyList.jsp (modified) (3 diffs)
• trunk/core/web/jsp/methodology/PropertiesEdit.jsp (modified) (2 diffs)
• trunk/core/web/jsp/project/Setup.jsp (modified) (2 diffs)
• trunk/core/web/jsp/security/group/GroupRemoveProcessing.jsp (modified) (1 diff)
• trunk/core/web/src/methodology/saveAsTemplate.js (modified) (1 diff)

trunk/core/db/oracle/create-scripts/versions/9.2.0/update_system_properties.sql

@@ -1434 +1434 @@
-      p.property = 'prm.global.tool.template.name';
-
+update pn_property p set
+          p.property_value = 'Template Name is a required field'
+where 
+          p.context_id = 2000 and
+          p.language = 'en' and
+      p.property = 'prm.template.templifyspace.namerequired.message';
+
+insert into PN_PROPERTY (CONTEXT_ID, LANGUAGE, PROPERTY_TYPE, PROPERTY, PROPERTY_VALUE, RECORD_STATUS, IS_SYSTEM_PROPERTY, IS_TRANSLATABLE_PROPERTY, PROPERTY_VALUE_CLOB)
+values (2000, 'en', 'text', 'prm.template.templifyspace.includedmodulesrequired.message', 'Included Modules is a required field', 'A', 0, 1, null);
+      
-insert into PN_PROPERTY (CONTEXT_ID, LANGUAGE, PROPERTY_TYPE, PROPERTY, PROPERTY_VALUE, RECORD_STATUS, IS_SYSTEM_PROPERTY, IS_TRANSLATABLE_PROPERTY, PROPERTY_VALUE_CLOB)
-values (2000, 'en', 'text', 'prm.schedule.workingtimecalendar.defaultbase.name', '{0} Base Calendar', 'A', 0, 1, null);

trunk/core/src/net/project/methodology/MethodologySpace.java

@@ -68 +68 @@
-    private Space parentSpace = null;
-    private String basedOnSpaceID = null;
+    private Space basedOnSpace = null;
-    private String createdByID = null;
-    private String createdBy = null;
@@ -279 +280 @@
-    public void setBasedOnSpaceID(String basedOnSpaceID) {
-        this.basedOnSpaceID = basedOnSpaceID;
+    }
+    
+    public Space getBasedOnSpace() throws PersistenceException {
+        if (this.basedOnSpace == null) {
+            loadBasedOnSpace();
+        }
+        return this.basedOnSpace;
+    }
+    
+    void setBasedOnSpace(Space basedOnSpace) {
+        this.basedOnSpace = basedOnSpace;
-    }
-
@@ -404 +416 @@
-        space.load();
-        setParentSpace(space);
+    }
+    
+    private void loadBasedOnSpace() throws PersistenceException {
+        Space space = SpaceFactory.constructSpaceFromID(this.basedOnSpaceID);
+        space.load();
+        setBasedOnSpace(space);
-    }
-
@@ -661 +679 @@
-        isLoaded = false;
-        basedOnSpaceID = null;
+        basedOnSpace = null;
-        modules = null;
-    }

trunk/core/src/net/project/methodology/mvc/MethodologyController.java

@@ -38 +38 @@
-import net.project.security.User;
-import net.project.space.Space;
+import net.project.space.SpaceTypes;
-import net.project.util.Conversion;
-
@@ -152 +153 @@
-                        model.put("methodologySpaceUseScenario", methodologySpace.getUseScenario());
-                        model.put("methodologySpaceDescription", net.project.util.HTMLUtils.escape(methodologySpace.getDescription()));                 
-
+, methodologySpace.getBasedOnSpace()
-        
-                } catch (Exception e) {
@@ -194 +195 @@
-        }
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-                TreeSet<PnModuleCheckboxModel> cbModules = new TreeSet<PnModuleCheckboxModel>(new Comparator<PnModuleCheckboxModel>() {
-                    // Comparator interface requires defining compare method.

trunk/core/src/net/project/view/pages/methodology/MethodologyAjaxHandler.java

@@ -15 +15 @@
-import net.project.util.StringUtils;
-import net.project.view.pages.base.BasePage;
-import net.project.xml.XMLUtils;
-
-import org.apache.log4j.Logger;

trunk/core/web/css/extjs/businessTheme.css

@@ -1 +1 @@
-/* Overriding ExtJs Window styles */
-
-
-
-
-
-
-
-
-
-
+pnet-window-cls .
+pnet-window-cls .
+pnet-window-cls .
+pnet-window-cls .
+pnet-window-cls .
+pnet-window-cls .
+pnet-window-cls .
+pnet-window-cls .
+pnet-window-cls .
+pnet-window-cls .
-
-
+
-
-/* toolbar items */
-
-
-
-
-
-
+pnet-window-cls .
+pnet-window-cls .
+pnet-window-cls .
+pnet-window-cls .
+pnet-window-cls .
+pnet-window-cls .

trunk/core/web/css/methodology/methodologyList.css

@@ -35 +35 @@
-.loadIndicator { margin-left: 30px; color: #AAAAAA; display: inline; }
-.loadIndicator strong { margin-left: 10px; }
-
-/* Overriding ExtJs Window styles */
-.x-window-tl    { background-image:url(/images/extjs/customized/business/window/left-corners.png); }
-.x-window-tr    { background-image:url(/images/extjs/customized/business/window/right-corners.png); }
-.x-window-tc    { background-image:url(/images/extjs/customized/business/window/top-bottom.png); }
-.x-window-ml    { background-image:url(/images/extjs/customized/business/window/left-right.gif); }
-.x-window-mr    { background-image:url(/images/extjs/customized/business/window/left-right.gif); }
-.x-window-bl    { background-image:url(/images/extjs/customized/business/window/left-corners.png); }
-.x-window-br    { background-image:url(/images/extjs/customized/business/window/right-corners.png); }
-.x-window-bc    { background-image:url(/images/extjs/customized/business/window/top-bottom.png); }
-.x-tool                 { background:transparent url(/images/extjs/customized/business/window/tool-sprites.gif) no-repeat scroll 0 0; }
-.x-window-mc    { background:#B9E8A4 none repeat scroll 0 0; border:1px solid #B9E8A4; }
-body.x-body-masked .x-window-plain .x-window-mc { background:#C2FFB4 none repeat scroll 0 0; }

trunk/core/web/jsp/business/Setup.jsp

@@ -245 +245 @@
-                                </p>
-                                <p id="modulesIncluded">
-non-
+
-                                        <div class="right">
-                                                <ul>
@@ -307 +307 @@
-<script type="text/javascript">
-        var nameRequiredMsg = '<%=PropertyProvider.get("prm.template.templifyspace.namerequired.message")%>';
-// var useScenarioRequiredMsg = '<%=PropertyProvider.get("prm.template.templifyspace.usescenario
+var includedModulesRequiredMsg = '<%=PropertyProvider.get("prm.template.templifyspace.includedmodules
-        var userId = '<%=user.getID()%>';
-        

trunk/core/web/jsp/methodology/MethodologyList.jsp

@@ -163 +163 @@
-<link type="text/css" rel="stylesheet" href="/styles/methodology/saveAsTemplate.css" />
-<link type="text/css" rel="stylesheet" href="/styles/methodology/methodologyList.css" />
-<!-- link type="text/css" rel="stylesheet" href="/styles/methodology/saveAsTemplateBusiness.css" /-->
-<link type="text/css" rel="stylesheet" href="/styles/extjs/businessTheme.css" />
-<link type="text/css" rel="stylesheet" href="/styles/pnetDialogWindow.css" />
@@ -266 +265 @@
-                                        </p>
-                                        <p id="modulesIncluded">
-non-
+
-                                                <div class="right">
-                                                        <ul>
@@ -334 +333 @@
-
-        var nameRequiredMsg = '<%=PropertyProvider.get("prm.template.templifyspace.namerequired.message")%>';
-// var useScenarioRequiredMsg = '<%=PropertyProvider.get("prm.template.templifyspace.usescenario
+var includedModulesRequiredMsg = '<%=PropertyProvider.get("prm.template.templifyspace.includedmodules
-        
-        var userId = '<%=user.getID()%>';

trunk/core/web/jsp/methodology/PropertiesEdit.jsp

@@ -96 +96 @@
-        
-        if(!checkTextbox(myForm.methodologySpaceName,"<%=PropertyProvider.get("prm.template.create.name.required.message")%>")) return false;
-// if(!checkTextbox(myForm.useScenario,"<%=PropertyProvider.get("prm.template.create.usescenario.
+if(!checkCheckBox_NoSelect(myForm.selectedModules, "<%=PropertyProvider.get("prm.template.templifyspace.includedmodules
-        return true;
- }
@@ -218 +218 @@
-                <%-- Methodology Modules --%>
-                <p id="modulesIncluded">
-non-
+
-                        <div class="right">
-

trunk/core/web/jsp/project/Setup.jsp

@@ -246 +246 @@
-                                </p>
-                                <p id="modulesIncluded">
-non-
+
-                                        <div class="right">
-                                                <ul>
@@ -307 +307 @@
-<script type="text/javascript">
-        var nameRequiredMsg = '<%=PropertyProvider.get("prm.template.templifyspace.namerequired.message")%>';
-// var useScenarioRequiredMsg = '<%=PropertyProvider.get("prm.template.templifyspace.usescenario
+var includedModulesRequiredMsg = '<%=PropertyProvider.get("prm.template.templifyspace.includedmodules
-        var userId = '<%=user.getID()%>';
-                

trunk/core/web/jsp/security/group/GroupRemoveProcessing.jsp

@@ -91 +91 @@
-        request.setAttribute("action", Integer.toString(net.project.security.Action.VIEW));
-        ServletSecurityProvider.setAndCheckValues(request);
-%>
-       
-
-<jsp:forward page="GroupListView.jsp" /
+
+// Go back to the Security Console
+
+%

trunk/core/web/src/methodology/saveAsTemplate.js

@@ -128 +128 @@
-        }
-        
-        // Function triggered to handle dialog resizing CSS issues in the dialogs content
-        function dialogResized(win, width, height) {
-                Ext.get('templateDetails').setWidth(width-10);
-                Ext.get('templateDetails').setHeight(height-100);
-        }
-        
-        // Form validation method
-        function processForm(myForm) {
-
+
+
-                return true;
-        }