Changeset 256
- Timestamp:
- 03/03/06 10:39:48
- Files:
-
- trunk/calendar3/calCore/src/org/bedework/calcore/hibernate/UserAuthUWDbImpl.java (modified) (1 diff)
- trunk/calendar3/calsvc/src/org/bedework/calsvc/CalSvc.java (modified) (2 diffs)
- trunk/calendar3/webadmin/src/org/bedework/webadmin/category/PEUpdateCategoryAction.java (modified) (1 diff)
- trunk/calendar3/webadmin/src/org/bedework/webadmin/location/PEUpdateLocationAction.java (modified) (1 diff)
- trunk/calendar3/webadmin/src/org/bedework/webadmin/sponsor/PEUpdateSponsorAction.java (modified) (1 diff)
- trunk/calendar3/webcommon/src/org/bedework/webcommon/calendars/UpdateCalendarAction.java (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/calendar3/calCore/src/org/bedework/calcore/hibernate/UserAuthUWDbImpl.java
r42 r256 607 607 } 608 608 609 getSess().saveOrUpdate(prefs);609 sess.saveOrUpdate(prefs); 610 610 } 611 611 trunk/calendar3/calsvc/src/org/bedework/calsvc/CalSvc.java
r235 r256 690 690 691 691 public void updateCalendar(BwCalendar val) throws CalFacadeException { 692 // Ensure it's not in prefs if it's a folder 693 if (!val.getCalendarCollection()) { 694 if (pars.getPublicAdmin()) { 695 /* Remove from preferences */ 696 getUserAuth().removeCalendar(null, val); 697 } 698 } 699 692 700 getCal().updateCalendar(val); 693 701 } … … 700 708 } 701 709 702 /* Remove from preferences */ 703 getUserAuth().removeCalendar(null, val); 710 if (pars.getPublicAdmin()) { 711 /* Remove from preferences */ 712 getUserAuth().removeCalendar(null, val); 713 } 704 714 705 715 /* Attempt to delete trunk/calendar3/webadmin/src/org/bedework/webadmin/category/PEUpdateCategoryAction.java
r55 r256 117 117 } 118 118 119 form.assignAddingCategory(false); 119 120 // form.updatePrefs(null, null, null, null); 120 121 trunk/calendar3/webadmin/src/org/bedework/webadmin/location/PEUpdateLocationAction.java
r55 r256 127 127 } 128 128 129 form.assignAddingLocation(false); 129 130 updateAuthPrefs(form, null, null, loc, null); 130 131 trunk/calendar3/webadmin/src/org/bedework/webadmin/sponsor/PEUpdateSponsorAction.java
r55 r256 127 127 } 128 128 129 form.assignAddingSponsor(false); 129 130 updateAuthPrefs(form, null, sp, null, null); 130 131 trunk/calendar3/webcommon/src/org/bedework/webcommon/calendars/UpdateCalendarAction.java
r252 r256 124 124 } 125 125 126 updateAuthPrefs(form, null, null, null, cal); 126 if (cal.getCalendarCollection()) { 127 updateAuthPrefs(form, null, null, null, cal); 128 } 127 129 128 130 if (add) {
