Permalink
Commits on Oct 2, 2012
  1. Merge pull request #395 from ruthie/morph-from-user-profile

    Tested and it appears to work!
    gkanwar committed Oct 2, 2012
Commits on Sep 9, 2012
  1. Add symlink to templates/program/modules at esp/program/modules/templ…

    …ates for convenience
    luanthe committed Sep 9, 2012
Commits on Aug 27, 2012
Commits on Jul 29, 2012
  1. Fixed problem with settings.CONTACTFORM_EMAIL_ADDRESSES.

    CONTACTFORM_EMAIL_ADDRESSES was being given default values in django_settings.py.
    These default values were based off of default values for DEFAULT_EMAIL_ADDRESSES.
    This meant that, if DEFAULT_EMAIL_ADDRESSES was overridden in local_settings.py
    but CONTACTFORM_EMAIL_ADDRESSES wasn't, CONTACTFORM_EMAIL_ADDRESSES would have
    incorrect values.
    
    Moves the default initialization of CONTACTFORM_EMAIL_ADDRESSES to settings.py,
    that way we can refer to the possibly overridden DEFAULT_EMAIL_ADDRESSES.
    jmoldow committed Jul 29, 2012
Commits on Jul 17, 2012
Commits on Jul 16, 2012
  1. Merge pull request #377 from pteromys/main

    Fixes from Chicago: teacher bios and teacherless classes
    pricem committed Jul 16, 2012
  2. Avoid using CSS float clearing in program management page

    The main program management page (module directory) had a hardcoded
    template making use of the CSS "clear: both" property to create a hard
    newline after the pretty buttons (due to the way jQuery UI renders them,
    you can't make a newline with a <br> tag).  This broke Stanford's layout
    and potentially others since they were using CSS floats for their
    navigational elements, which were being cleared.  Everything after a
    line break had to appear below the bottom of the navigation divs, creating
    a huge empty space.
    
    In this commit the divs with the "clear: both" property and removed and
    instead each block that needs to appear vertically separate are wrapped in
    a div with the "display: inline-block" property.
    pricem committed Jul 16, 2012
Commits on Jul 15, 2012
Commits on Jun 27, 2012
  1. Prevent teacherless classes on category change.

    Symptom:
    Since 7d3d479, changing a class's
    category through the "editclass" view makes a class lose all its
    teachers. Since before then, changing a class's category makes a class
    lose all but one teacher.
    
    Cause:
    We added teachers back to the class by checking cls.teachers(),
    which depends on the anchor, after we modified the anchor. (Before
    that, we just added the currently-editing teacher back to the class.)
    
    Solution:
    Fetch and remember the set of teachers before modifying the class
    anchor.
    
    Remark 1:
    Importantly, the occurence of cls.teachers() introduced in
    b8a88c9 is NOT replaced. If it
    were, then cls.propose() would not be run on new classes since the
    set of existing teachers is empty on a new class.
    
    Remark 2:
    Despite lazy evaluation of QuerySets, it seems to be safe to use one
    here for the teacher list; calling cls.teachers() seems to get
    cls.anchor while constructing the QuerySet, so it doesn't need to
    worry about cls.anchor changing out from under it later. This note
    remains here in case future magic makes it false.
    Andrew Geng committed Jun 27, 2012
  2. Use from_here in the teacher bio display.

    We ask "If no, what is your school/employer?" on the profile form.
    So people just don't put down their school if they checked the
    from_here box.
    
    We may want to modify userview.html as well, if it's determined that
    we care more about what college they go to than exactly what went in
    the "College" box.
    Andrew Geng committed Jun 24, 2012
Commits on Jun 26, 2012
  1. Bugfix to previous commit

    jmoldow committed Jun 26, 2012
  2. Hides closed classes with hide_full_classes Tag

    Maybe there should be a different Tag for this, or the Tag should be
    renamed to hide_full_or_closed_classes.
    jmoldow committed Jun 26, 2012
Commits on Jun 23, 2012
  1. Allow strings for Ajax foreign key field data

    This fixes a problem with the school field on the student profile form.
    Amends commit ce4ba41.
    pricem committed Jun 23, 2012
  2. Invalidate UserBit cache after making someone an admin

    This fixes the MakeAdminTest although the bug may have been nonexistent in
    practice.
    pricem committed Jun 23, 2012
  3. Stop sending error e-mails for other activation errors

    I checked that account activation is working, although we have been
    getting some requests where the username and key present in the URL
    aren't getting translated into GET variables.  See #375.
    pricem committed Jun 23, 2012
  4. Fix TypeError on /myesp/emaillist

    There were a couple of form instantiations that were using an unsupported
    'request' keyword argument.  If you happen to know why that was there,
    please speak up!
    pricem committed Jun 23, 2012
Commits on Jun 20, 2012
Commits on Jun 19, 2012
  1. Update printables tests for new user selection interface

    Recently I made the printables pages use the new comm panel interface
    to select the desired list of users, but I neglected to update the
    tests to submit the slightly different POST data needed by this interface
    to select the same users.  We may have this problem in other places too.
    pricem committed Jun 19, 2012
  2. Adjust RegistrationType.__unicode__() to avoid test errors

    RegistrationTypes display their displayName if it is not empty, and
    their name if it is.  We were checking displayName against the
    empty string, but sometimes (as is the case during testing) it is None.
    This was confusing Django's template renderer because __unicode__() is
    supposed to return a Unicode object but was returning None.
    pricem committed Jun 19, 2012
Commits on Jun 14, 2012
Commits on Jun 13, 2012
  1. Assume full availability if there is no AvailabilityModule

    For programs that are not using the AvailabilityModule (assuming that
    teachers are always available), it's an annoyance when the Web site
    complains the teachers aren't available.  This should fix that by checking
    for the existence of an AvailabilityModule in ESPUser.getAvailableTimes().
    pricem committed Jun 13, 2012
  2. Merge pull request #371 from learning-unlimited/gurtej_fixes

    Fixes for the stable release
    pricem committed Jun 13, 2012
  3. Merge branch 'gurtej_fixes' of github.com:learning-unlimited/ESP-Webs…

    …ite into gurtej_fixes
    
    Conflicts:
    	esp/templates/program/modules/lotterystudentregmodule/student_reg.html
    pricem committed Jun 13, 2012
  4. Fix minor bugs in comm panel

    pricem committed Jun 13, 2012
  5. Disable already-scheduled timeslots on availability form

    This prevents teachers from "backing out" of timeslots in which their
    classes have already been scheduled.  Also, a message is displayed if a
    teacher is somehow scheduled into a timeslot where they aren't available.
    pricem committed Jun 13, 2012