Changeset 17915
- Timestamp:
- 08/20/08 09:34:34 (3 months ago)
- Files:
-
- trunk/core/src/net/project/schedule/ajax/WebConstants.java (modified) (1 diff)
- trunk/core/src/net/project/schedule/ajax/WorkplanRetrieve.java (added)
- trunk/core/web/WEB-INF/tomcat/web.xml (modified) (2 diffs)
- trunk/core/web/WEB-INF/weblogic/web.xml (modified) (2 diffs)
- trunk/core/web/jsp/schedule/Main.jsp (modified) (3 diffs)
- trunk/core/web/src/indentedView.js (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/core/src/net/project/schedule/ajax/WebConstants.java
r17661 r17915 15 15 paramFieldName("fieldName"), // Field Name which will be updated 16 16 paramNewValue("newValue"), // Value to be set at the Field Name 17 18 paramViewTypeName("viewType"), 19 paramIndentedViewValue("indented"), 20 paramFlatViewValue("flat"), 21 17 22 attributeScheduleBean("schedule"), // Schedule bean to which the task will 18 23 // be stored trunk/core/web/WEB-INF/tomcat/web.xml
r17891 r17915 385 385 <servlet-class>net.project.schedule.ajax.WorkplanUpdateValidator</servlet-class> 386 386 </servlet> 387 388 <servlet> 389 <servlet-name>WorkplanRetrieve</servlet-name> 390 <display-name>Retrieve Workplan</display-name> 391 <description>Handles the Ajax requests to retrieve a Workplan</description> 392 <servlet-class>net.project.schedule.ajax.WorkplanRetrieve</servlet-class> 393 </servlet> 387 394 388 395 <servlet> … … 510 517 <url-pattern>/ajax/schedule/WorkplanUpdateValidator</url-pattern> 511 518 </servlet-mapping> 519 520 <servlet-mapping> 521 <servlet-name>WorkplanRetrieve</servlet-name> 522 <url-pattern>/ajax/schedule/WorkplanRetrieve</url-pattern> 523 </servlet-mapping> 512 524 513 525 <servlet-mapping> trunk/core/web/WEB-INF/weblogic/web.xml
r17772 r17915 327 327 </servlet> 328 328 329 <servlet> 330 <servlet-name>WorkplanRetrieve</servlet-name> 331 <display-name>Retrieve Workplan</display-name> 332 <description>Handles the Ajax requests to retrieve a Workplan</description> 333 <servlet-class>net.project.schedule.ajax.WorkplanRetrieve</servlet-class> 334 </servlet> 335 329 336 <servlet-mapping> 330 337 <servlet-name>NonHtmlReportingServlet</servlet-name> … … 441 448 <servlet-name>WorkplanUpdateValidator</servlet-name> 442 449 <url-pattern>/ajax/schedule/WorkplanUpdateValidator</url-pattern> 450 </servlet-mapping> 451 452 <servlet-mapping> 453 <servlet-name>WorkplanRetrieve</servlet-name> 454 <url-pattern>/ajax/schedule/WorkplanRetrieve</url-pattern> 443 455 </servlet-mapping> 444 456 trunk/core/web/jsp/schedule/Main.jsp
r17901 r17915 36 36 net.project.schedule.mvc.handler.taskedit.Helper, 37 37 net.project.base.finder.*, 38 java.net.URLEncoder" 38 java.net.URLEncoder, 39 net.project.schedule.ajax.WebConstants" 39 40 %> 40 41 … … 246 247 247 248 function setup() { 248 Ext.ns('PNET.Schedule');249 249 Ext.BLANK_IMAGE_URL = '/src/extjs/resources/images/default/s.gif'; 250 250 load_menu('<%=user.getCurrentSpace().getID()%>'); … … 285 285 setTreeGridRecordDefinition(indentedView); 286 286 indentedView.setConfigurationReader('id', 'id'); 287 indentedView.setDataStore(JSPRootURL + '/schedule/include/storeIndentedListProvider.jsp?module=' + scheduleModule); 287 var parameters = {}; 288 parameters.<%=WebConstants.paramViewTypeName.toString()%> = "<%=WebConstants.paramIndentedViewValue%>"; 289 indentedView.setDataStoreUrl(JSPRootURL + '/ajax/schedule/WorkplanRetrieve?viewType=indented'); 288 290 setTreeGridColumns(indentedView); 289 291 indentedView.init('schedule-grid'); trunk/core/web/src/indentedView.js
r17901 r17915 4 4 var _colModel = null; 5 5 var _configurationReader = null; 6 var _dataStore = null;6 var _dataStoreUrl = null; 7 7 var _treeGrid = null; 8 8 var _records = new Array(); … … 56 56 } 57 57 58 this.getDataStore = function(){59 if(null != _dataStore ){60 return _dataStore ;61 } 62 }; 63 64 this.setDataStore = function(dataStore){65 _dataStore = dataStore;58 this.getDataStoreUrl = function(){ 59 if(null != _dataStoreUrl){ 60 return _dataStoreUrl; 61 } 62 }; 63 64 this.setDataStoreUrl = function(dataStore){ 65 _dataStoreUrl = dataStore; 66 66 }; 67 67 … … 162 162 TreeGrid.prototype.init = function init(renderTo){ 163 163 that.setRenderTo(renderTo); 164 165 // Create the data store 164 166 165 var record = Ext.data.Record.create([ 167 166 {name: 'id'}, … … 177 176 ,{name: '_is_leaf', type: 'bool'} 178 177 ]); 179 178 var httpProxy = new Ext.data.HttpProxy({ 179 url: that.getDataStoreUrl() 180 ,method: 'POST' 181 }); 182 183 // Create the data store 180 184 var store = new Ext.ux.maximgb.treegrid.NestedSetStore({ 181 autoLoad : true182 ,reader: new Ext.data.JsonReader(that.getConfigurationReader(), that.getRecords())183 ,url: that.getDataStore()185 autoLoad : true 186 ,reader: new Ext.data.JsonReader(that.getConfigurationReader(), that.getRecords()) 187 ,proxy: httpProxy 184 188 }); 185 189
