Changeset 299

Show
Ignore:
Timestamp:
03/23/06 15:43:30
Author:
douglm
Message:

Disable saving of filters in restore until we need them (and it works correctly)

Fix switching admin group

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/calendar3/calCore/src/org/bedework/calcore/hibernate/Calendars.java

    r207 r299  
    7979   * @throws CalFacadeException 
    8080   */ 
    81   public Calendars(Calintf cal, AccessUtil access, BwUser user,  
     81  public Calendars(Calintf cal, AccessUtil access,  
    8282                   int currentMode, boolean ignoreCreator, boolean debug) 
    8383                  throws CalFacadeException { 
    84     super(cal, access, user, currentMode, ignoreCreator, debug); 
     84    super(cal, access, currentMode, ignoreCreator, debug); 
    8585 
    8686    publicCalendarRootPath = "/" + getSyspars().getPublicCalendarRoot(); 
    …… 
    209209 
    210210    sess.namedQuery("getCalendarByPath"); 
    211     sess.setString("path", userCalendarRootPath + "/" + user.getAccount()); 
     211    sess.setString("path", userCalendarRootPath + "/" + getUser().getAccount()); 
    212212    sess.cacheableQuery(); 
    213213 
    …… 
    221221 
    222222    sess.namedQuery("getUserCalendarCollections"); 
    223     sess.setEntity("owner", user); 
     223    sess.setEntity("owner", getUser()); 
    224224    sess.cacheableQuery(); 
    225225 
    …… 
    242242 
    243243    sess.namedQuery("getUserCalendarCollections"); 
    244     sess.setEntity("owner", user); 
     244    sess.setEntity("owner", getUser()); 
    245245    sess.cacheableQuery(); 
    246246 
    …… 
    345345 
    346346    val.setPath(path); 
    347     val.setOwner(user); 
     347    val.setOwner(getUser()); 
    348348    val.setCalendar(parent); 
    349349    parent.addChild(val); 

  • trunk/calendar3/calCore/src/org/bedework/calcore/hibernate/CalintfHelper.java

    r207 r299  
    7777  protected AccessUtil access; 
    7878 
    79   protected BwUser user; 
    80  
    8179  protected int currentMode = CalintfUtil.guestMode; 
    8280   
    …… 
    9391   */ 
    9492  public CalintfHelper(Calintf cal, AccessUtil access, 
    95                        BwUser user, int currentMode, boolean ignoreCreator,  
     93                       int currentMode, boolean ignoreCreator,  
    9694                       boolean debug) { 
    9795    this.cal = cal; 
    9896    this.access = access; 
    99     this.user = user; 
    10097    this.currentMode = currentMode; 
    10198    this.ignoreCreator = ignoreCreator; 
    …… 
    109106  protected BwSystem getSyspars() throws CalFacadeException { 
    110107    return cal.getSyspars(); 
     108  } 
     109   
     110  protected BwUser getUser() throws CalFacadeException { 
     111    return cal.getUser(); 
    111112  } 
    112113 

  • trunk/calendar3/calCore/src/org/bedework/calcore/hibernate/CalintfImpl.java

    r207 r299  
    311311    access.setAuthUser(authUser); 
    312312 
    313     events = new Events(this, access, this.user, currentMode,  
     313    events = new Events(this, access, currentMode,  
    314314                        ignoreCreator, debug); 
    315315 
    316     calendars = new Calendars(this, access, this.user, currentMode,  
     316    calendars = new Calendars(this, access, currentMode,  
    317317                              ignoreCreator, debug); 
    318318 
    319     categories = new EventProperties(this, access, this.user, currentMode,  
     319    categories = new EventProperties(this, access, currentMode,  
    320320                                     ignoreCreator,  
    321321                                     "word", BwCategory.class.getName(), 
    322322                                     "getCategoryRefs", 
    323323                                     -1, debug); 
    324     locations = new EventProperties(this, access, this.user, currentMode,  
     324    locations = new EventProperties(this, access, currentMode,  
    325325                                    ignoreCreator,  
    326326                                    "address", BwLocation.class.getName(), 
    327327                                    "getLocationRefs", 
    328328                                     CalFacadeDefs.maxReservedLocationId, debug); 
    329     sponsors = new EventProperties(this, access, this.user, currentMode,  
     329    sponsors = new EventProperties(this, access, currentMode,  
    330330                                   ignoreCreator,  
    331331                                   "name", BwSponsor.class.getName(), 

  • trunk/calendar3/calCore/src/org/bedework/calcore/hibernate/EventProperties.java

    r207 r299  
    9595   * @param debug 
    9696   */ 
    97   public EventProperties(Calintf cal, AccessUtil access, BwUser user, 
     97  public EventProperties(Calintf cal, AccessUtil access,  
    9898                         int currentMode, boolean ignoreCreator, 
    9999                         String keyFieldName, 
    …… 
    102102                         int minId,  
    103103                         boolean debug) { 
    104     super(cal, access, user, currentMode, ignoreCreator, debug); 
     104    super(cal, access, currentMode, ignoreCreator, debug); 
    105105 
    106106    this.keyFieldName = keyFieldName; 

  • trunk/calendar3/calCore/src/org/bedework/calcore/hibernate/Events.java

    r261 r299  
    6262import org.bedework.calfacade.BwRecurrenceInstance; 
    6363import org.bedework.calfacade.BwSynchState; 
    64 import org.bedework.calfacade.BwUser; 
    6564import org.bedework.calfacade.CalFacadeDefs; 
    6665import org.bedework.calfacade.CalFacadeUtil; 
    …… 
    105104   * @param debug 
    106105   */ 
    107   public Events(Calintf cal, AccessUtil access, BwUser user,  
     106  public Events(Calintf cal, AccessUtil access,  
    108107                int currentMode, boolean ignoreCreator, boolean debug) { 
    109     super(cal, access, user, currentMode, ignoreCreator, debug); 
     108    super(cal, access, currentMode, ignoreCreator, debug); 
    110109  } 
    111110 
    …… 
    469468    } 
    470469 
    471     if (mstr.getOwner().equals(user) && mstr.getRecurring()) { 
     470    if (mstr.getOwner().equals(getUser()) && mstr.getRecurring()) { 
    472471      // Our own and a recurring event - retrieve the instance 
    473472      // from the recurrences table 
    …… 
    669668    } 
    670669 
    671     return user.equals(val.getCreator()); 
     670    return getUser().equals(val.getCreator()); 
    672671  } 
    673672 
    …… 
    718717                           BwRecurrenceInstance inst) throws CalFacadeException { 
    719718    BwEventAnnotation override = proxy.getRef(); 
    720     override.setOwner(user); 
     719    override.setOwner(getUser()); 
    721720 
    722721    getSess().saveOrUpdate(override); 
    …… 
    10261025    HibSession sess = getSess(); 
    10271026    if (setUser) { 
    1028       sess.setEntity("user", user); 
     1027      sess.setEntity("user", getUser()); 
    10291028    } 
    10301029 
    …… 
    11231122      override.setDuration(BwDateTime.makeDuration(start, end).toString()); 
    11241123      override.setCreator(mstr.getCreator()); 
    1125       override.setOwner(user); 
     1124      override.setOwner(getUser()); 
    11261125 
    11271126      return new BwEventProxy(override); 
    …… 
    11441143 
    11451144      if (instOverride != null) { 
    1146         if (instOverride.getOwner().equals(user)) { 
     1145        if (instOverride.getOwner().equals(getUser())) { 
    11471146          // It's our own override. 
    11481147          override = instOverride; 
    …… 
    11701169        override.setDuration(BwDateTime.makeDuration(start, end).toString()); 
    11711170        override.setCreator(mstr.getCreator()); 
    1172         override.setOwner(user); 
     1171        override.setOwner(getUser()); 
    11731172 
    11741173        override.getRecurrence().setRecurrenceId(inst.getRecurrenceId()); 

  • trunk/calendar3/calFacade/src/org/bedework/calfacade/filter/BwCategoryFilter.java

    r2 r299  
    6565    sb.append(", name="); 
    6666    sb.append(getName()); 
     67    sb.append(", parent="); 
     68    if (parent == null) { 
     69      sb.append("null"); 
     70    } else { 
     71      sb.append(parent.getId()); 
     72    } 
    6773    sb.append("}"); 
    6874 

  • trunk/calendar3/dumprestore/src/org/bedework/dumprestore/restore/HibRestore.java

    r297 r299  
    411411 
    412412  public void restoreFilter(BwFilter o) throws Throwable { 
    413     openHibSess(); 
    414  
    415     hibSave(o); 
    416  
    417     closeHibSess(); 
     413    if (false) { 
     414      // XXX need fixing and we're not using them yet 
     415      openHibSess(); 
     416       
     417      hibSave(o); 
     418       
     419      closeHibSess(); 
     420    } 
    418421  } 
    419422