Changeset 397 for trunk/grails-app
- Timestamp:
- Feb 22, 2010, 6:29:13 PM (15 years ago)
- Location:
- trunk/grails-app
- Files:
-
- 9 added
- 14 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/grails-app/domain/Manufacturer.groovy
r373 r397 5 5 boolean isActive = true 6 6 7 static hasMany = [inventoryItems: InventoryItem ]7 static hasMany = [inventoryItems: InventoryItem, addresses: Address] 8 8 9 9 static belongsTo = [InventoryItem] -
trunk/grails-app/domain/Person.groovy
r343 r397 5 5 taskModifications: TaskModification, 6 6 entries: Entry, 7 tasks: Task] 7 tasks: Task, 8 addresses: Address] 8 9 9 10 static belongsTo = [Authority] -
trunk/grails-app/domain/Site.groovy
r332 r397 8 8 static hasMany = [sections: Section, 9 9 siteExtendedAttributes: SiteExtendedAttribute, 10 inventoryStores: InventoryStore] 10 inventoryStores: InventoryStore, 11 addresses: Address] 11 12 12 13 // static belongsTo = [] -
trunk/grails-app/domain/Supplier.groovy
r373 r397 5 5 boolean isActive = true 6 6 7 static hasMany = [inventoryItems: InventoryItem ]7 static hasMany = [inventoryItems: InventoryItem, addresses: Address] 8 8 9 9 static belongsTo = [InventoryItem] -
trunk/grails-app/i18n/messages.properties
r360 r397 1 address.owner.not.found=An owner (Person, Site, Manufacturer or Supplier) must be supplied to create an address. 2 1 3 asset.tree.import.success=Asset tree imported. 2 4 asset.tree.import.failure=Could not create asset tree from supplied file, failed on line {0}. -
trunk/grails-app/services/CreateDataService.groovy
r394 r397 58 58 createBaseUnitsOfMeasure() 59 59 createBasePeriods() 60 createBaseSupplierType() 61 createBaseManufacturerType() 60 createBaseSupplierTypes() 61 createBaseManufacturerTypes() 62 createBaseAddressTypes() 62 63 63 64 // Tasks … … 470 471 } 471 472 472 def createBaseSupplierType () {473 def createBaseSupplierTypes() { 473 474 474 475 // SupplierType … … 486 487 } 487 488 488 def createBaseManufacturerType () {489 def createBaseManufacturerTypes() { 489 490 490 491 // ManufacturerType … … 501 502 saveAndTest(manufacturerTypeInstance) 502 503 504 } 505 506 def createBaseAddressTypes() { 507 508 // AddressType 509 def addressTypeInstance 510 511 // AddressType #1 512 addressTypeInstance = new AddressType(name: "Postal", 513 description: "A postal address.") 514 saveAndTest(addressTypeInstance) 515 516 // AddressType #2 517 addressTypeInstance = new AddressType(name: "Physical", 518 description: "A physical address.") 519 saveAndTest(addressTypeInstance) 520 521 // AddressType #3 522 addressTypeInstance = new AddressType(name: "Postal & Physical", 523 description: "An address that is both the postal and physical address.") 524 saveAndTest(addressTypeInstance) 525 526 // AddressType #4 527 addressTypeInstance = new AddressType(name: "Invoice", 528 description: "An address to send invoices to.") 529 saveAndTest(addressTypeInstance) 530 531 // AddressType #5 532 addressTypeInstance = new AddressType(name: "Delivery", 533 description: "An address to send deliveries to.") 534 saveAndTest(addressTypeInstance) 503 535 } 504 536 -
trunk/grails-app/views/manufacturerDetailed/edit.gsp
r374 r397 63 63 </td> 64 64 </tr> 65 66 <tr class="prop"> 67 <td valign="top" class="name"> 68 <label for="addresses">Addresses:</label> 69 </td> 70 <td valign="top" class="value"> 71 <ul> 72 <g:each var="i" in="${manufacturerInstance?.addresses?}"> 73 <li><g:link controller="manufacturerDetailed" action="show" id="${i.id}"> 74 ${i?.encodeAsHTML()} 75 </g:link></li> 76 </g:each> 77 </ul> 78 <g:link controller="addressDetailed" params="['manufacturer.id':manufacturerInstance?.id]" action="create">Add Address</g:link> 79 </td> 80 </tr> 65 81 66 82 <tr class="prop"> -
trunk/grails-app/views/manufacturerDetailed/show.gsp
r374 r397 57 57 58 58 <tr class="prop"> 59 <td valign="top" class="name">Addresses:</td> 60 61 <td valign="top" class="value"> 62 <ul> 63 <g:each var="i" in="${manufacturerInstance.addresses}"> 64 <li><g:link controller="addressDetailed" action="show" id="${i.id}">${i?.encodeAsHTML()}</g:link></li> 65 </g:each> 66 </ul> 67 </td> 68 69 </tr> 70 71 <tr class="prop"> 59 72 <td valign="top" class="name">Inventory Items:</td> 60 73 -
trunk/grails-app/views/person/edit.gsp
r295 r397 98 98 99 99 <tr class="prop"> 100 <td valign="top" class="name"> 101 <label for="addresses">Addresses:</label> 102 </td> 103 <td valign="top" class="value"> 104 <ul> 105 <g:each var="i" in="${person?.addresses?}"> 106 <li><g:link controller="addressDetailed" action="show" id="${i.id}"> 107 ${i?.encodeAsHTML()} 108 </g:link></li> 109 </g:each> 110 </ul> 111 <g:link controller="addressDetailed" params="['person.id':person?.id]" action="create">Add Address</g:link> 112 </td> 113 </tr> 114 115 <tr class="prop"> 100 116 <td valign="top" class="name"><label for="employeeID">employee ID:</label></td> 101 117 <td valign="top" class="value ${hasErrors(bean:person,field:'employeeID','errors')}"> -
trunk/grails-app/views/person/show.gsp
r295 r397 60 60 61 61 <tr class="prop"> 62 <td valign="top" class="name">Addresses:</td> 63 64 <td valign="top" class="value"> 65 <ul> 66 <g:each var="i" in="${person.addresses}"> 67 <li><g:link controller="addressDetailed" action="show" id="${i.id}">${i?.encodeAsHTML()}</g:link></li> 68 </g:each> 69 </ul> 70 </td> 71 72 </tr> 73 74 <tr class="prop"> 62 75 <td valign="top" class="name">Employee ID:</td> 63 76 <td valign="top" class="value">${person.employeeID}</td> -
trunk/grails-app/views/siteDetailed/edit.gsp
r385 r397 73 73 </g:each> 74 74 </ul> 75 <g:link controller="inventoryStoreDetailed" params="['site.id':siteInstance?.id]" action="create">Add InventoryStore</g:link> 75 <g:link controller="inventoryStoreDetailed" params="['site.id':siteInstance?.id]" action="create">Add Inventory Store</g:link> 76 77 </td> 78 </tr> 79 80 <tr class="prop"> 81 <td valign="top" class="name"> 82 <label for="addresses">Addresses:</label> 83 </td> 84 <td valign="top" class="value ${hasErrors(bean:siteInstance,field:'addresses','errors')}"> 85 86 <ul> 87 <g:each var="i" in="${siteInstance?.addresses?}"> 88 <li><g:link controller="addressDetailed" action="show" id="${i.id}">${i?.encodeAsHTML()}</g:link></li> 89 </g:each> 90 </ul> 91 <g:link controller="addressDetailed" params="['site.id':siteInstance?.id]" action="create">Add Address</g:link> 76 92 77 93 </td> -
trunk/grails-app/views/siteDetailed/show.gsp
r385 r397 68 68 69 69 <tr class="prop"> 70 <td valign="top" class="name">Addresses:</td> 71 72 <td valign="top" class="value"> 73 <ul> 74 <g:each var="i" in="${siteInstance.addresses}"> 75 <li><g:link controller="addressDetailed" action="show" id="${i.id}">${i?.encodeAsHTML()}</g:link></li> 76 </g:each> 77 </ul> 78 </td> 79 80 </tr> 81 82 <tr class="prop"> 70 83 <td valign="top" class="name">Sections:</td> 71 84 -
trunk/grails-app/views/supplierDetailed/edit.gsp
r374 r397 63 63 </td> 64 64 </tr> 65 65 66 <tr class="prop"> 67 <td valign="top" class="name"> 68 <label for="addresses">Addresses:</label> 69 </td> 70 <td valign="top" class="value"> 71 <ul> 72 <g:each var="i" in="${supplierInstance?.addresses?}"> 73 <li><g:link controller="supplierDetailed" action="show" id="${i.id}"> 74 ${i?.encodeAsHTML()} 75 </g:link></li> 76 </g:each> 77 </ul> 78 <g:link controller="addressDetailed" params="['supplier.id':supplierInstance?.id]" action="create">Add Address</g:link> 79 </td> 80 </tr> 81 66 82 <tr class="prop"> 67 83 <td valign="top" class="name">Inventory Items:</td> -
trunk/grails-app/views/supplierDetailed/show.gsp
r374 r397 57 57 58 58 <tr class="prop"> 59 <td valign="top" class="name">Addresses:</td> 60 61 <td valign="top" class="value"> 62 <ul> 63 <g:each var="i" in="${supplierInstance.addresses}"> 64 <li><g:link controller="addressDetailed" action="show" id="${i.id}">${i?.encodeAsHTML()}</g:link></li> 65 </g:each> 66 </ul> 67 </td> 68 69 </tr> 70 71 <tr class="prop"> 59 72 <td valign="top" class="name">Inventory Items:</td> 60 73
Note: See TracChangeset
for help on using the changeset viewer.