Changeset 18306

Show
Ignore:
Timestamp:
11/06/08 07:17:54 (2 months ago)
Author:
dpatil
Message:

punch lists and bugs:

several punch list items and bugs fixed.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r18305 r18306  
    11091109 
    11101110insert into PN_PROPERTY (CONTEXT_ID, LANGUAGE, PROPERTY_TYPE, PROPERTY, PROPERTY_VALUE, RECORD_STATUS, IS_SYSTEM_PROPERTY, IS_TRANSLATABLE_PROPERTY, PROPERTY_VALUE_CLOB) 
    1111 values (2000, 'en', 'text', 'prm.form.list.search.button.tooltip', 'Search Records', 'A', 0, 1, null); 
     1111values (2000, 'en', 'text', 'prm.form.list.search.button.tooltip', 'Search Form', 'A', 0, 1, null); 
     1112 
     1113insert into PN_PROPERTY (CONTEXT_ID, LANGUAGE, PROPERTY_TYPE, PROPERTY, PROPERTY_VALUE, RECORD_STATUS, IS_SYSTEM_PROPERTY, IS_TRANSLATABLE_PROPERTY, PROPERTY_VALUE_CLOB) 
     1114values (2000, 'en', 'text', 'prm.global.javascript.general.schedule.taskedit.error.message', 'Error while editing task ', 'A', 0, 1, null); 
     1115 
     1116 
    11121117 
    11131118commit; 

  • trunk/core/web/WEB-INF/tomcat/web.xml

    r18250 r18306  
    9393        <filter-name>sessionAccessFilter</filter-name> 
    9494        <url-pattern>*.jsp</url-pattern> 
    95         <!--<dispatcher>REQUEST</dispatcher> 
    96         <dispatcher>FORWARD</dispatcher> 
    97         <dispatcher>INCLUDE</dispatcher>--> 
    9895    </filter-mapping> 
    9996    <filter-mapping> 
    10097        <filter-name>sessionAccessFilter</filter-name> 
    10198        <url-pattern>*.htm</url-pattern> 
    102         <!--<dispatcher>REQUEST</dispatcher> 
    103         <dispatcher>FORWARD</dispatcher> 
    104         <dispatcher>INCLUDE</dispatcher>--> 
    10599    </filter-mapping> 
    106100    <filter-mapping> 
    107101        <filter-name>sessionAccessFilter</filter-name> 
    108102        <url-pattern>/servlet/*</url-pattern> 
    109         <!--<dispatcher>REQUEST</dispatcher> 
    110         <dispatcher>FORWARD</dispatcher> 
    111         <dispatcher>INCLUDE</dispatcher>--> 
    112103    </filter-mapping> 
    113104    <filter-mapping> 
    114105        <filter-name>sessionAccessFilter</filter-name> 
    115106        <url-pattern>/resource/*</url-pattern> 
    116         <!--<dispatcher>REQUEST</dispatcher> 
    117         <dispatcher>FORWARD</dispatcher> 
    118         <dispatcher>INCLUDE</dispatcher>--> 
    119107    </filter-mapping>   
    120108    <filter-mapping> 
    121109        <filter-name>sessionAccessFilter</filter-name> 
    122110        <url-pattern>/blog/*</url-pattern> 
    123         <!--<dispatcher>REQUEST</dispatcher> 
    124         <dispatcher>FORWARD</dispatcher> 
    125         <dispatcher>INCLUDE</dispatcher>--> 
    126111    </filter-mapping>   
    127112    <filter-mapping> 
    128113        <filter-name>sessionAccessFilter</filter-name> 
    129114        <url-pattern>/wiki/*</url-pattern> 
    130         <!--<dispatcher>REQUEST</dispatcher> 
    131         <dispatcher>FORWARD</dispatcher> 
    132         <dispatcher>INCLUDE</dispatcher>--> 
    133115    </filter-mapping> 
    134116     
    …… 
    136118        <filter-name>sessionAccessFilter</filter-name> 
    137119        <url-pattern>/assignments/*</url-pattern> 
    138         <!--<dispatcher>REQUEST</dispatcher> 
    139         <dispatcher>FORWARD</dispatcher> 
    140         <dispatcher>INCLUDE</dispatcher>--> 
    141120    </filter-mapping> 
    142121     
    …… 
    144123        <filter-name>sessionAccessFilter</filter-name> 
    145124        <url-pattern>/personal/*</url-pattern> 
    146         <!--<dispatcher>REQUEST</dispatcher> 
    147         <dispatcher>FORWARD</dispatcher> 
    148         <dispatcher>INCLUDE</dispatcher>--> 
    149125    </filter-mapping> 
    150126     
    …… 
    152128        <filter-name>sessionAccessFilter</filter-name> 
    153129        <url-pattern>/project/*</url-pattern> 
    154         <!--<dispatcher>REQUEST</dispatcher> 
    155         <dispatcher>FORWARD</dispatcher> 
    156         <dispatcher>INCLUDE</dispatcher>--> 
    157130    </filter-mapping> 
    158131         
    …… 
    160133        <filter-name>securityFilter</filter-name> 
    161134        <url-pattern>*.jsp</url-pattern> 
    162 <!--            <dispatcher>REQUEST</dispatcher>--> 
    163 <!--        <dispatcher>FORWARD</dispatcher>--> 
    164 <!--            <dispatcher>INCLUDE</dispatcher>--> 
     135    </filter-mapping> 
     136    <filter-mapping> 
     137        <filter-name>securityFilter</filter-name> 
     138        <url-pattern>/servlet/ScheduleController/*</url-pattern> 
    165139    </filter-mapping> 
    166140    <filter-mapping> 
    …… 
    426400        <url-pattern>/servlet/SearchAssignments</url-pattern> 
    427401    </servlet-mapping>   
    428     <!-- <servlet-mapping> 
    429          <servlet-name>JSPClassServlet</servlet-name> 
    430          <url-pattern>*.jsp</url-pattern> 
    431     </servlet-mapping>--> 
    432402    <servlet-mapping> 
    433403        <servlet-name>springapp</servlet-name> 

  • trunk/core/web/html/project/Dashboard.html

    r18299 r18306  
    7878                                     <br/> 
    7979                                     <span> 
    80                                          <a href="javascript:modify();">Modify Project</a> 
     80                                         <a href="javascript:modify();"><t:Message value="prm.project.main.modify.button.tooltip" /></a> 
    8181                                     </span> 
    8282                                     <br/> 
    8383                                     <span> 
    84                                          <a href="javascript:properties();">View Information</a> 
     84                                         <a href="javascript:properties();"><t:Message value="prm.project.main.properties.button.tooltip" /></a> 
    8585                                     </span> 
    8686                                     <br/> 

  • trunk/core/web/jsp/business/Main.jsp

    r18296 r18306  
    181181<div id='content'> 
    182182<br/> 
     183 
     184 
     185<table border="0" width="97%" cellpadding="2" cellspacing="0"> 
    183186<%-- Display project logo, if it exists --%> 
    184187<% if (businessSpace.getLogoID() != null) { %> 
    185         <td valign="top" rowspan="3"> 
     188<tr>  
     189        <td valign="top" align="right" > 
    186190                <IMG SRC="<%=SessionManager.getJSPRootURL()%>/servlet/ViewDocument?id=<%=businessSpace.getLogoID()%>&module=<%=net.project.base.Module.BUSINESS_SPACE%>">                      
    187191                &nbsp; 
    188192        </td> 
     193</tr>    
    189194<% } %> 
    190  
    191 <table border="0" width="100%" cellpadding="2" cellspacing="0"> 
    192195<tr>       
    193196    <td valign="top" align="left" class="tableContent"><c:out value="${businessSpace.description}" /></td> 

  • trunk/core/web/jsp/form/FormEdit.jsp

    r18296 r18306  
    167167</tb:toolbar> 
    168168 
    169 <br clear=all><br> 
    170  
    171169<div id='scrollwidecontent'> 
    172170 

  • trunk/core/web/jsp/form/FormList.jsp

    r18305 r18306  
    8181        var blogItFor = 'formDataItems'+'<%=user.getCurrentSpace().getSpaceType().getName().replaceAll("'", "&acute;")%>'; 
    8282        var objectType = 'form_data'; 
    83         var workSpaceName = '<%= ((net.project.project.ProjectSpaceBean) session.getAttribute("projectSpace")).getName().replaceAll("'", "&acute;") %>'; 
     83        var workSpaceName = '<%= user.getCurrentSpace().getName().replaceAll("'", "&acute;") %>'; 
    8484                 
    8585function setup() { 

  • trunk/core/web/jsp/form/include/FormEdit.jsp

    r18249 r18306  
    150150var blogItFor = 'formDataItems'+'<%=user.getCurrentSpace().getSpaceType().getName().replaceAll("'", "&acute;")%>'; 
    151151var objectType = 'form_data'; 
    152 var workSpaceName = '<%= ((net.project.project.ProjectSpaceBean) session.getAttribute("projectSpace")).getName().replaceAll("'", "&acute;") %>'; 
     152var workSpaceName = '<%= user.getCurrentSpace().getName().replaceAll("'", "&acute;") %>'; 
    153153objectId = '<%=id%>'; 
    154154var moduleId = <%=Module.FORM%>; 

  • trunk/core/web/jsp/personal/Setup.jsp

    r18047 r18306  
    124124</tr> 
    125125<tr> 
     126<td class="tableContentFontOnly"><a href="<%=SessionManager.getJSPRootURL()%>/form/designer/Main.jsp?module=<%=Module.FORM%>&action=<%=net.project.security.Action.MODIFY%>&referer=personal/Setup.jsp"><%= PropertyProvider.get("prm.project.setup.manageforms.link")%></a></td> 
     127<td class="tableContentFontOnly"><%= PropertyProvider.get("prm.project.setup.channel.formsedit.label")%></td> 
     128</tr> 
     129<tr> 
    126130<td colspan=2>&nbsp;</td> 
    127131</tr> 

  • trunk/core/web/jsp/portfolio/PersonalPortfolio.jsp

    r18241 r18306  
    186186                var flag = false; 
    187187                if(!field) { 
    188                         field = document.getElementById('idChanneliFrame').contentWindow.document.getElementById('iFrameForm').elements['selected']; 
     188                        field = document.getElementById('channelIFrame').contentWindow.document.getElementById('iFrameForm').elements['selected']; 
    189189                        flag = verifySelectionForField(field, 'multiple', '<%=PropertyProvider.get ("prm.global.javascript.verifyselection.noselection.error.message")%>'); 
    190190                } else { 
    …… 
    193193                if (flag) { 
    194194                        var m_url = JSPRootURL + "/portfolio/PersonalPortfolioDelete.jsp?selected="+ getSelectedValueLocal() +"&module=<%= Module.PROJECT_SPACE %>"+"&action=<%= net.project.security.Action.VIEW %>&portfolio=true"; 
    195                         //var redirect_url = JSPRootURL +"/project/Main.jsp?id="+ getSelectedValueLocal()+"&page="+ escape(m_url); 
    196                         var link_win = openwin_linker(m_url); 
     195                        var redirect_url = JSPRootURL +"/project/Main.jsp?id="+ getSelectedValueLocal()+"&page="+ escape(m_url); 
     196                        var link_win = openwin_linker(redirect_url); 
    197197                        link_win.focus(); 
    198198                } 
    …… 
    203203                var flag = false; 
    204204                if(!field) { 
    205                         field = document.getElementById('idChanneliFrame').contentWindow.document.getElementById('iFrameForm').elements['selected']; 
     205                        field = document.getElementById('channelIFrame').contentWindow.document.getElementById('iFrameForm').elements['selected']; 
    206206                        flag = verifySelectionForField(field, 'multiple', '<%=PropertyProvider.get ("prm.global.javascript.verifyselection.noselection.error.message")%>'); 
    207207                } else { 
    …… 
    217217                var field = theForm.elements["selected"]; 
    218218                if(!field) { 
    219                         field = document.getElementById('idChanneliFrame').contentWindow.document.getElementById('iFrameForm').elements['selected']; 
     219                        field = document.getElementById('channelIFrame').contentWindow.document.getElementById('iFrameForm').elements['selected']; 
    220220                        var idval = field.value; 
    221221                        for (var i = 0; i < field.length; i++) { 

  • trunk/core/web/jsp/portfolio/xsl/personal-portfolio-view.xsl

    r18262 r18306  
    1414 
    1515<xsl:template match="PersonalPortfolioViewResults"> 
    16  
     16<form id="iFrameForm"> 
    1717<table cellpadding="0" cellspacing="0" border="0" width="100%"> 
    1818        <tr class="tableHeader" align="left" valign="top"> 
    …… 
    5050        <xsl:apply-templates select="PortfolioEntries/ProjectPortfolioEntry" /> 
    5151</table> 
     52</form> 
    5253</xsl:template> 
    5354 

  • trunk/core/web/jsp/registration/ForgottenInfoDomainSelectionController.jsp

    r17141 r18306  
    7171        // Get domains for current configuration 
    7272        net.project.security.domain.UserDomainCollection domainCollection = new net.project.security.domain.UserDomainCollection(); 
    73         domainCollection.load(); 
    7473        String configurationID = PropertyProvider.getActiveConfigurationID(); 
    7574        domainCollection.loadForConfigurationID(configurationID); 

  • trunk/core/web/jsp/schedule/TaskEdit.jsp

    r18047 r18306  
    143143    var goSubmit = true; 
    144144 
     145<% if (action.equals(String.valueOf(Action.CREATE))) { %>     
     146        // this is to avoid error when the task is beaing created and again user tries to modify it using back button 
     147        window.history.forward(1); 
     148<%      } %> 
     149         
    145150function setup() { 
    146151        load_menu('<%=spaceID%>'); 

  • trunk/core/web/jsp/template/PreAuthentication.jsp

    r18267 r18306  
    7575function bodyOnLoad(functionsToExecute) { 
    7676    setVar("JSPRootURL", "<%=SessionManager.getJSPRootURL()%>"); 
    77     setVar("_sid", ""); 
    78     setVar("_styp", ""); 
     77    setVar("_sid", "", 1, "<%=SessionManager.getJSPRootURL()%>"); 
     78    setVar("_styp", "", 1, "<%=SessionManager.getJSPRootURL()%>"); 
    7979    if (functionsToExecute) { 
    8080        return eval(functionsToExecute); 

  • trunk/core/web/jsp/toolbar/include/Main.jsp

    r18274 r18306  
    123123function _setupSpaceModule(){ 
    124124                        //      name,    value,                                                                 expires, path,  domain, secure 
    125 Set_Cookie( '_sid',      '<%=user.getCurrentSpace().getID()%>', '',      '/',         '',     '' ); 
    126 Set_Cookie( '_styp',     '<%=user.getCurrentSpace().getType()%>', '',    '/',         '',     '' ); 
     125Set_Cookie( '_sid',      '<%=user.getCurrentSpace().getID()%>', '',      '<%=SessionManager.getJSPRootURL()%>',       '',     '' ); 
     126Set_Cookie( '_styp',     '<%=user.getCurrentSpace().getType()%>', '',    '<%=SessionManager.getJSPRootURL()%>',       '',     '' ); 
    127127//Set_Cookie( 'mid',     '<%=user.getCurrentSpace().getID()%>', '',      '/',   '',     '' );    
    128128} 

  • trunk/core/web/src/components/myAssignments-treeGrid.js

    r18240 r18306  
    1 var rootTitle ='<a href="'+JSPRootURL+'/personal/Main.jsp?module='+moduleId+'" id="ux-maximgb-treegrid-brditem-" class="ux-maximgb-treegrid-brditem">'+userDisplayName+' </a>/ Assignments' 
     1var rootTitle ='<a href="'+JSPRootURL+'/personal/Main.jsp?page='+ JSPRootURL + '/assignments/My?module='+moduleId+'" id="ux-maximgb-treegrid-brditem-" class="ux-maximgb-treegrid-brditem">'+userDisplayName+' </a>/ Assignments' 
    22var assignmentTreeGrid ; 
    33var collapsed = true;