Changeset 402
- Timestamp:
- Feb 23, 2010, 2:07:15 PM (14 years ago)
- Location:
- trunk/grails-app
- Files:
-
- 9 added
- 14 edited
-
controllers/ContactDetailedController.groovy (added)
-
domain/Contact.groovy (added)
-
domain/ContactType.groovy (added)
-
domain/Manufacturer.groovy (modified) (1 diff)
-
domain/Person.groovy (modified) (4 diffs)
-
domain/Site.groovy (modified) (1 diff)
-
domain/Supplier.groovy (modified) (1 diff)
-
i18n/messages.properties (modified) (1 diff)
-
services/ContactService.groovy (added)
-
services/CreateDataService.groovy (modified) (2 diffs)
-
views/contactDetailed (added)
-
views/contactDetailed/create.gsp (added)
-
views/contactDetailed/edit.gsp (added)
-
views/contactDetailed/list.gsp (added)
-
views/contactDetailed/show.gsp (added)
-
views/manufacturerDetailed/edit.gsp (modified) (2 diffs)
-
views/manufacturerDetailed/show.gsp (modified) (1 diff)
-
views/person/edit.gsp (modified) (2 diffs)
-
views/person/show.gsp (modified) (1 diff)
-
views/siteDetailed/edit.gsp (modified) (2 diffs)
-
views/siteDetailed/show.gsp (modified) (1 diff)
-
views/supplierDetailed/edit.gsp (modified) (2 diffs)
-
views/supplierDetailed/show.gsp (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/grails-app/domain/Manufacturer.groovy
r397 r402 5 5 boolean isActive = true 6 6 7 static hasMany = [inventoryItems: InventoryItem, addresses: Address] 7 static hasMany = [contacts: Contact, 8 addresses: Address, 9 inventoryItems: InventoryItem] 8 10 9 11 static belongsTo = [InventoryItem] -
trunk/grails-app/domain/Person.groovy
r399 r402 6 6 entries: Entry, 7 7 tasks: Task, 8 contacts: Contact, 8 9 addresses: Address] 9 10 … … 15 16 String firstName 16 17 String lastName 17 String employeeID 18 String employeeID = '' 18 19 19 20 /* Set after login by 'welcome' action, default to 12 hours, aka "sess.setMaxInactiveInterval(seconds) */ … … 36 37 firstName(blank: false) 37 38 lastName(blank: false) 38 employeeID( blank: true, nullable:true)39 employeeID() 39 40 description() 40 41 department(nullable:true) … … 45 46 pass(blank: false, minSize:4) //minSize:7 46 47 sessionTimeout(min:60, max:43200) 47 48 48 } 49 49 -
trunk/grails-app/domain/Site.groovy
r397 r402 9 9 siteExtendedAttributes: SiteExtendedAttribute, 10 10 inventoryStores: InventoryStore, 11 contacts: Contact, 11 12 addresses: Address] 12 13 -
trunk/grails-app/domain/Supplier.groovy
r397 r402 5 5 boolean isActive = true 6 6 7 static hasMany = [inventoryItems: InventoryItem, addresses: Address] 7 static hasMany = [contacts: Contact, 8 addresses: Address, 9 inventoryItems: InventoryItem] 8 10 9 11 static belongsTo = [InventoryItem] -
trunk/grails-app/i18n/messages.properties
r397 r402 1 1 address.owner.not.found=An owner (Person, Site, Manufacturer or Supplier) must be supplied to create an address. 2 contact.owner.not.found=An owner (Person, Site, Manufacturer or Supplier) must be supplied to create contact details. 2 3 3 4 asset.tree.import.success=Asset tree imported. -
trunk/grails-app/services/CreateDataService.groovy
r399 r402 61 61 createBaseManufacturerTypes() 62 62 createBaseAddressTypes() 63 createBaseContactTypes() 63 64 64 65 // Tasks … … 527 528 } 528 529 530 def createBaseContactTypes() { 531 532 // ContactType 533 def contactTypeInstance 534 535 // ContactType #1 536 contactTypeInstance = new ContactType(name: "Email", 537 description: "Email address.") 538 saveAndTest(contactTypeInstance) 539 540 // ContactType #2 541 contactTypeInstance = new ContactType(name: "Alternate Email", 542 description: "Alternate email address.") 543 saveAndTest(contactTypeInstance) 544 545 // ContactType #3 546 contactTypeInstance = new ContactType(name: "Mobile", 547 description: "Modile phone number.") 548 saveAndTest(contactTypeInstance) 549 550 // ContactType #4 551 contactTypeInstance = new ContactType(name: "Work Phone", 552 description: "Work phone number.") 553 saveAndTest(contactTypeInstance) 554 555 // ContactType #5 556 contactTypeInstance = new ContactType(name: "Home Phone", 557 description: "Home phone number.") 558 saveAndTest(contactTypeInstance) 559 560 // ContactType #6 561 contactTypeInstance = new ContactType(name: "Work Fax", 562 description: "Work fax number.") 563 saveAndTest(contactTypeInstance) 564 565 // ContactType #7 566 contactTypeInstance = new ContactType(name: "Home Fax", 567 description: "Home fax number.") 568 saveAndTest(contactTypeInstance) 569 570 // ContactType #8 571 contactTypeInstance = new ContactType(name: "Web Site", 572 description: "Web site address.") 573 saveAndTest(contactTypeInstance) 574 575 // ContactType #9 576 contactTypeInstance = new ContactType(name: "Person", 577 description: "Contact person.") 578 saveAndTest(contactTypeInstance) 579 } 580 529 581 def createDemoSuppliers() { 530 582 -
trunk/grails-app/views/manufacturerDetailed/edit.gsp
r397 r402 66 66 <tr class="prop"> 67 67 <td valign="top" class="name"> 68 <label for="addresses">Contact:</label> 69 </td> 70 <td valign="top" class="value"> 71 <ul> 72 <g:each var="i" in="${manufacturerInstance?.contacts}"> 73 <li><g:link controller="contactDetailed" action="show" id="${i.id}"> 74 ${i?.encodeAsHTML()} 75 </g:link></li> 76 </g:each> 77 </ul> 78 <g:link controller="contactDetailed" params="['manufacturer.id':manufacturerInstance?.id]" action="create">+Add Contact</g:link> 79 </td> 80 </tr> 81 82 <tr class="prop"> 83 <td valign="top" class="name"> 68 84 <label for="addresses">Addresses:</label> 69 85 </td> … … 76 92 </g:each> 77 93 </ul> 78 <g:link controller="addressDetailed" params="['manufacturer.id':manufacturerInstance?.id]" action="create"> Add Address</g:link>94 <g:link controller="addressDetailed" params="['manufacturer.id':manufacturerInstance?.id]" action="create">+Add Address</g:link> 79 95 </td> 80 96 </tr> -
trunk/grails-app/views/manufacturerDetailed/show.gsp
r397 r402 55 55 56 56 </tr> 57 58 <tr class="prop"> 59 <td valign="top" class="name">Contact:</td> 60 61 <td valign="top" class="value"> 62 <ul> 63 <g:each var="i" in="${manufacturerInstance.contacts}"> 64 <li><g:link controller="contactDetailed" action="show" id="${i.id}">${i?.encodeAsHTML()}</g:link></li> 65 </g:each> 66 </ul> 67 </td> 68 69 </tr> 70 57 71 58 72 <tr class="prop"> -
trunk/grails-app/views/person/edit.gsp
r399 r402 85 85 <tr class="prop"> 86 86 <td valign="top" class="name"> 87 <label for="addresses">Contact:</label> 88 </td> 89 <td valign="top" class="value"> 90 <ul> 91 <g:each var="i" in="${person?.contacts}"> 92 <li><g:link controller="contactDetailed" action="show" id="${i.id}"> 93 ${i?.encodeAsHTML()} 94 </g:link></li> 95 </g:each> 96 </ul> 97 <g:link controller="contactDetailed" params="['person.id':person?.id]" action="create">+Add Contact</g:link> 98 </td> 99 </tr> 100 101 <tr class="prop"> 102 <td valign="top" class="name"> 87 103 <label for="addresses">Addresses:</label> 88 104 </td> 89 105 <td valign="top" class="value"> 90 106 <ul> 91 <g:each var="i" in="${person?.addresses ?}">107 <g:each var="i" in="${person?.addresses}"> 92 108 <li><g:link controller="addressDetailed" action="show" id="${i.id}"> 93 109 ${i?.encodeAsHTML()} … … 95 111 </g:each> 96 112 </ul> 97 <g:link controller="addressDetailed" params="['person.id':person?.id]" action="create"> Add Address</g:link>113 <g:link controller="addressDetailed" params="['person.id':person?.id]" action="create">+Add Address</g:link> 98 114 </td> 99 115 </tr> -
trunk/grails-app/views/person/show.gsp
r399 r402 47 47 <td valign="top" class="name">Description:</td> 48 48 <td valign="top" class="value">${person.description?.encodeAsHTML()}</td> 49 </tr> 50 51 <tr class="prop"> 52 <td valign="top" class="name">Contact:</td> 53 54 <td valign="top" class="value"> 55 <ul> 56 <g:each var="i" in="${person.contacts}"> 57 <li><g:link controller="contactDetailed" action="show" id="${i.id}">${i?.encodeAsHTML()}</g:link></li> 58 </g:each> 59 </ul> 60 </td> 61 49 62 </tr> 50 63 -
trunk/grails-app/views/siteDetailed/edit.gsp
r397 r402 77 77 </td> 78 78 </tr> 79 79 80 <tr class="prop"> 81 <td valign="top" class="name"> 82 <label for="addresses">Contact:</label> 83 </td> 84 <td valign="top" class="value"> 85 <ul> 86 <g:each var="i" in="${siteInstance?.contacts}"> 87 <li><g:link controller="contactDetailed" action="show" id="${i.id}"> 88 ${i?.encodeAsHTML()} 89 </g:link></li> 90 </g:each> 91 </ul> 92 <g:link controller="contactDetailed" params="['site.id':siteInstance?.id]" action="create">+Add Contact</g:link> 93 </td> 94 </tr> 95 80 96 <tr class="prop"> 81 97 <td valign="top" class="name"> … … 89 105 </g:each> 90 106 </ul> 91 <g:link controller="addressDetailed" params="['site.id':siteInstance?.id]" action="create"> Add Address</g:link>107 <g:link controller="addressDetailed" params="['site.id':siteInstance?.id]" action="create">+Add Address</g:link> 92 108 93 109 </td> -
trunk/grails-app/views/siteDetailed/show.gsp
r397 r402 66 66 67 67 </tr> 68 69 <tr class="prop"> 70 <td valign="top" class="name">Contact:</td> 71 72 <td valign="top" class="value"> 73 <ul> 74 <g:each var="i" in="${siteInstance.contacts}"> 75 <li><g:link controller="contactDetailed" action="show" id="${i.id}">${i?.encodeAsHTML()}</g:link></li> 76 </g:each> 77 </ul> 78 </td> 79 80 </tr> 68 81 69 82 <tr class="prop"> -
trunk/grails-app/views/supplierDetailed/edit.gsp
r397 r402 66 66 <tr class="prop"> 67 67 <td valign="top" class="name"> 68 <label for="addresses">Contact:</label> 69 </td> 70 <td valign="top" class="value"> 71 <ul> 72 <g:each var="i" in="${supplierInstance?.contacts}"> 73 <li><g:link controller="contactDetailed" action="show" id="${i.id}"> 74 ${i?.encodeAsHTML()} 75 </g:link></li> 76 </g:each> 77 </ul> 78 <g:link controller="contactDetailed" params="['supplier.id':supplierInstance?.id]" action="create">+Add Contact</g:link> 79 </td> 80 </tr> 81 82 <tr class="prop"> 83 <td valign="top" class="name"> 68 84 <label for="addresses">Addresses:</label> 69 85 </td> … … 76 92 </g:each> 77 93 </ul> 78 <g:link controller="addressDetailed" params="['supplier.id':supplierInstance?.id]" action="create"> Add Address</g:link>94 <g:link controller="addressDetailed" params="['supplier.id':supplierInstance?.id]" action="create">+Add Address</g:link> 79 95 </td> 80 96 </tr> -
trunk/grails-app/views/supplierDetailed/show.gsp
r397 r402 55 55 56 56 </tr> 57 57 58 <tr class="prop"> 59 <td valign="top" class="name">Contact:</td> 60 61 <td valign="top" class="value"> 62 <ul> 63 <g:each var="i" in="${supplierInstance.contacts}"> 64 <li><g:link controller="contactDetailed" action="show" id="${i.id}">${i?.encodeAsHTML()}</g:link></li> 65 </g:each> 66 </ul> 67 </td> 68 69 </tr> 70 58 71 <tr class="prop"> 59 72 <td valign="top" class="name">Addresses:</td>
Note: See TracChangeset
for help on using the changeset viewer.
