Changeset 18357

Show
Ignore:
Timestamp:
11/14/08 11:34:01 (2 months ago)
Author:
dpatil
Message:

bug fixes for bug303, bug339, bug378, bug359, bug460, bug375, bug289, bug403

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/core/db/oracle/create-scripts/versions/8.5.0/update_system_properties.sql

    r18355 r18357  
    12111211values (2000,'en','text','prm.directory.resource.roster.removeperson.businessspaceadmingroup.message','You can not remove the last remaining member of the workspace administrator role. The business may only be disabled.','','A',0,1); 
    12121212 
     1213insert into PN_PROPERTY (CONTEXT_ID, LANGUAGE, PROPERTY_TYPE, PROPERTY, PROPERTY_VALUE, RECORD_STATUS, IS_SYSTEM_PROPERTY, IS_TRANSLATABLE_PROPERTY, PROPERTY_VALUE_CLOB) 
     1214values (2000, 'en', 'text', 'prm.global.javascript.verifyselection.noprojectsinlist.error.message', 'There are no projects in the list', 'A', 0, 1, null); 
     1215 
    12131216commit; 
    12141217prompt 0 records loaded 
  • trunk/core/web/css/noframes.css

    r18353 r18357  
    528528        overflow: auto;  
    529529} 
    530 /* PROJECTS Left Heading */ 
     530/* METHODOLOGY Left Heading */ 
    531531#leftheading-methodology { 
    532532        background: url('jspRootUrl/images/menu/projects/leftheading_projects.png'); 
  • trunk/core/web/jsp/business/CreateBusiness2Processing.jsp

    r16384 r18357  
    7272        methodologyProvider.applyMethodology(businessWizard.getMethodologyID(), businessWizard.getID() ); 
    7373        } 
    74     pageContext.forward("BusinessPortfolio.jsp?portfolio=true"); 
     74    response.sendRedirect("BusinessPortfolio.jsp?portfolio=true"); 
    7575%> 
  • trunk/core/web/jsp/business/subbusiness/Main.jsp

    r18047 r18357  
    132132        <tb:band name="standard" showAll="true"> 
    133133                <tb:button type="create" label='<%= PropertyProvider.get("prm.business.subbusiness.create.button.tooltip") %>' /> 
    134                 <tb:button type="properties" label='<%= PropertyProvider.get("prm.business.subbusiness.properties.button.tooltip") %>' /> 
    135134        </tb:band> 
    136135</tb:toolbar> 
  • trunk/core/web/jsp/document/ContainerProperties.jsp

    r18047 r18357  
    138138<tb:toolbar style="tooltitle" groupTitle="prm.global.tool.document.name"> 
    139139        <tb:setAttribute name="leftTitle"> 
    140                 <history:history target="main"
     140                <history:history
    141141                        <history:page display='<%=PropertyProvider.get("prm.document.containerproperties.page.history")%>' 
    142142                                                  jspPage='<%=SessionManager.getJSPRootURL() + "/document/Main.jsp"%>' 
  • trunk/core/web/jsp/document/CreateContainer.jsp

    r18323 r18357  
    7575<%-- Setup the space stylesheets and js files --%> 
    7676<template:getSpaceCSS /> 
    77 <style type="text/css"> body {background: none}</style> 
     77 
    7878<template:import type="javascript" src="/src/checkComponentForms.js" /> 
    7979<template:import type="javascript" src="/src/errorHandler.js" /> 
     
    121121 
    122122 
    123 <body class="main" onLoad="setup();"
     123<body class="main" onLoad="setup();" style="background: none;"
    124124 
    125125<div class=pageHeader align="left"> 
  • trunk/core/web/jsp/portfolio/PersonalPortfolio.jsp

    r18306 r18357  
    185185                var field = theForm.elements["selected"]; 
    186186                var flag = false; 
    187                 if(!field) { 
    188                         field = document.getElementById('channelIFrame').contentWindow.document.getElementById('iFrameForm').elements['selected']; 
    189                         flag = verifySelectionForField(field, 'multiple', '<%=PropertyProvider.get ("prm.global.javascript.verifyselection.noselection.error.message")%>'); 
     187                if(field != null) { 
     188                        if(!field) { 
     189                                field = document.getElementById('channelIFrame').contentWindow.document.getElementById('iFrameForm').elements['selected']; 
     190                                flag = verifySelectionForField(field, 'multiple', '<%=PropertyProvider.get ("prm.global.javascript.verifyselection.noselection.error.message")%>'); 
     191                        } else { 
     192                                flag = verifySelection(theForm, 'multiple', '<%=PropertyProvider.get("prm.global.javascript.verifyselection.noselection.error.message")%>'); 
     193                        } 
    190194                } else { 
    191                         flag = verifySelection(theForm, 'multiple', '<%=PropertyProvider.get("prm.global.javascript.verifyselection.noselection.error.message")%>'); 
     195                        extAlert(errorTitle, "<display:get name='prm.global.javascript.verifyselection.noprojectsinlist.error.message'/>" , Ext.MessageBox.ERROR); 
    192196                } 
    193197                if (flag) { 
     
    196200                        var link_win = openwin_linker(redirect_url); 
    197201                        link_win.focus(); 
    198                 } 
     202                }               
    199203        } 
    200204 
     
    202206                var field = theForm.elements["selected"]; 
    203207                var flag = false; 
    204                 if(!field) { 
    205                         field = document.getElementById('channelIFrame').contentWindow.document.getElementById('iFrameForm').elements['selected']; 
    206                         flag = verifySelectionForField(field, 'multiple', '<%=PropertyProvider.get ("prm.global.javascript.verifyselection.noselection.error.message")%>'); 
     208                if(field != null) { 
     209                        if(!field) { 
     210                                field = document.getElementById('channelIFrame').contentWindow.document.getElementById('iFrameForm').elements['selected']; 
     211                                flag = verifySelectionForField(field, 'multiple', '<%=PropertyProvider.get ("prm.global.javascript.verifyselection.noselection.error.message")%>'); 
     212                        } else { 
     213                                flag = verifySelection(theForm, 'multiple', '<%=PropertyProvider.get("prm.global.javascript.verifyselection.noselection.error.message")%>'); 
     214                        } 
    207215                } else { 
    208                         flag = verifySelection(theForm, 'multiple', '<%=PropertyProvider.get("prm.global.javascript.verifyselection.noselection.error.message")%>'); 
     216                        extAlert(errorTitle, "<display:get name='prm.global.javascript.verifyselection.noprojectsinlist.error.message'/>" , Ext.MessageBox.ERROR); 
    209217                } 
    210218                if (flag) { 
  • trunk/core/web/jsp/roster/MemberAdd1.jsp

    r18047 r18357  
    183183</tb:toolbar> 
    184184 
    185 <div id='content'> 
     185<div id='scrollwidecontent'> 
    186186 
    187187<form name="memberadd" action="<%=SessionManager.getJSPRootURL()%>/roster/MemberAdd1Processing.jsp" onsubmit="javascript:return onFormSubmit();" method="post"> 
  • trunk/core/web/jsp/schedule/baseline/View.jsp

    r18047 r18357  
    6767                </history:history> 
    6868        </tb:setAttribute> 
    69         <tb:band name="standard" showAll="true"> 
    70                 <tb:button type="refresh"/> 
    71         </tb:band> 
     69        <tb:band name="standard" showAll="true" /> 
    7270</tb:toolbar> 
    7371 
  • trunk/core/web/jsp/security/group/GroupListView.jsp

    r18047 r18357  
    145145<template:getSpaceNavBar /> 
    146146 
    147 <tb:toolbar style="tooltitle" showAll="true" groupTitle="all.global.toolbar.standard.security"> 
     147<tb:toolbar style="tooltitle" showAll="true" groupTitle="prm.directory.directory.tab.roles.title"> 
    148148        <tb:setAttribute name="leftTitle"> 
    149149                <history:history> 
  • trunk/core/web/src/directory-Panel.js

    r18355 r18357  
    292292                if(columnIndex == 1 && grid.getStore().getAt(7).get('value') != 'Active'){ 
    293293                        grid.getColumnModel().setEditable(columnIndex, false); 
    294                         extAlert('Error', 'You can not edit to '+grid.getStore().getAt(7).get('value')+' user', Ext.MessageBox.ERROR); 
     294                        extAlert('Error', 'You cannot edit an '+grid.getStore().getAt(7).get('value')+' user', Ext.MessageBox.ERROR); 
    295295                } else if(rowIndex==7 && columnIndex == 1){ 
    296296                        grid.getColumnModel().setEditable(columnIndex, false);