Commit graph

152 commits

Author SHA1 Message Date
Henrik Levkowetz 143b8cc646 Fixed an issue with [10344], where the numberless /meeting/agenda/ would redirect to a non-existing proceedings URL.
- Legacy-Id: 10360
Note: SVN reference [10344] has been migrated to Git commit 893988e45e
2015-11-01 22:49:07 +00:00
Robert Sparks 893988e45e Return more sensible results for agendas for old meetings. Fixes #1062. Commit ready for merge.
- Legacy-Id: 10344
2015-10-31 07:32:47 +00:00
Henrik Levkowetz 71dec7a692 Moved forward to 6.7.2.dev0 the changes to rename class ScheduledSession to the more correct (but unfortunately also cumbersome) SchedTimeSessAssignment, and rename reverse relationships involving this class appropriately. Accompanying changes in javascript and templates. Migrations to match.
- Legacy-Id: 10297
2015-10-26 22:45:26 +00:00
Henrik Levkowetz a4c49e09df Merged in [10062] from olau@iola.dk:
Summary: Fixed problem with timeslot.location = None in agenda_csv.
 - Legacy-Id: 10070
Note: SVN reference [10062] has been migrated to Git commit 129cccb88f
2015-08-30 09:32:18 +00:00
Ole Laursen 129cccb88f Summary: Fixed problem with timeslot.location = None in agenda_csv.
Commit ready for merge.
 - Legacy-Id: 10062
2015-08-26 07:52:05 +00:00
Henrik Levkowetz fb66c1856f Merged in [9669] from olau@iola.dk:
Summary: Make the meeting agenda code use the historic info available
for groups. In the process, added some select_related/prefetch_related
code to cut the number of database queries in the agenda down from
4000-5000 to about 50. Rewritten agenda CSV code to use Python arrays
rather than a template for improved readability/reuse. Rewritten week
view to assemble its data in Python. Plus a few other minor cleanups,
e.g. lame_description is now gone.
Fixes #1088. Branch
 - Legacy-Id: 10005
Note: SVN reference [9669] has been migrated to Git commit acda84208d
2015-08-10 19:46:11 +00:00
Henrik Levkowetz 83bef1d160 Merged in [9813] from rjsparks@nostrum.com:
Add navigation to the new secretariat agenda tools. Change the buttons at the top of the agenda.html page to links.
 - Legacy-Id: 9825
Note: SVN reference [9813] has been migrated to Git commit 2b7f7dec52
2015-07-20 13:13:09 +00:00
Robert Sparks 2b7f7dec52 Add navigation to the new secretariat agenda tools. Change the buttons at the top of the agenda.html page to links. Commit ready to merge.
- Legacy-Id: 9813
2015-07-19 08:02:09 +00:00
Henrik Levkowetz eb522faa25 Merged in [9789] from lars@netapp.com:
HTML agendas need to be valid HTML5 document.
 - Legacy-Id: 9811
Note: SVN reference [9789] has been migrated to Git commit d633fdc924a0130da98a7dc79768886d95002938
2015-07-18 16:35:32 +00:00
Henrik Levkowetz c41a079d4f Merged in [9735] from lars@netapp.com:
More HTML fixes identified by test-crawl --vnu.
 - Legacy-Id: 9767
Note: SVN reference [9735] has been migrated to Git commit 08d958e7cd9cf4949a688e20046bd61855e00361
2015-07-18 09:18:54 +00:00
Henrik Levkowetz b49a452595 Merged in [9651] from rjsparks@nostrum.com:
Adds a graphical overview of each day by room for the secretariat to assist with scheduling additional meetings.
 - Legacy-Id: 9674
Note: SVN reference [9651] has been migrated to Git commit 06a0e2b6481fe909f6620ed951353eaf437321ec
2015-06-22 19:33:15 +00:00
Ole Laursen acda84208d Summary: Make the meeting agenda code use the historic info available
for groups. In the process, added some select_related/prefetch_related
code to cut the number of database queries in the agenda down from
4000-5000 to about 50. Rewritten agenda CSV code to use Python arrays
rather than a template for improved readability/reuse. Rewritten week
view to assemble its data in Python. Plus a few other minor cleanups,
e.g. lame_description is now gone.

Fixes #1088. Branch ready for merge.
 - Legacy-Id: 9669
2015-06-17 13:37:16 +00:00
Robert Sparks 4e1b3b2888 let the IAB see the new pages
- Legacy-Id: 9600
2015-05-04 15:10:34 +00:00
Robert Sparks 0ba095e229 remove some dead code
- Legacy-Id: 9598
2015-05-04 13:25:57 +00:00
Robert Sparks 17b928b94b checkpoint: added room functional description, backfilled ietf92 meeting data, repaired session material views, added tests
- Legacy-Id: 9596
2015-05-01 22:31:30 +00:00
Robert Sparks 72b85fc1c7 checkpoint: views by type working
- Legacy-Id: 9592
2015-04-30 21:44:45 +00:00
Robert Sparks 1e30120710 checkpoint. Model changes done and UI tweaked to match.
- Legacy-Id: 9588
2015-04-30 15:57:48 +00:00
Robert Sparks 65f0fed7a7 checkpointing some css/html noodling before tearing into models
- Legacy-Id: 9587
2015-04-29 14:39:17 +00:00
Robert Sparks b0ce25aa44 clean merge forward
- Legacy-Id: 9584
2015-04-27 20:24:40 +00:00
Henrik Levkowetz d59af2aa0f Adapt session_draft_list() code to handle the case when there is multiple agendas for a given group acronym. Fixes some server 500 results when trying to get pdf bundles for the plenary sessions for ietf 71.
- Legacy-Id: 9502
2015-04-15 12:58:44 +00:00
Henrik Levkowetz 625347cd2f Merged trunk@9354 to facelift copy
- Legacy-Id: 9357
2015-04-02 06:51:34 +00:00
Henrik Levkowetz 2f54511763 Changed all explicitly set HttpResponse content_types to specify charset.
Django sets charset if you don't specify a content_type; if you specify
one you also must add a charset specification (if you want one).  
Fixes issue #1647.
 - Legacy-Id: 9348
2015-03-26 21:35:21 +00:00
Robert Sparks 9421ea9b93 Unbroke week-view, but only by compromising on whether to show things like the terminal room
- Legacy-Id: 9004
2015-02-05 21:16:56 +00:00
Ole Laursen ea33e0e3b7 Summary: Fix a missing hide_menu in agenda edit, also delete some now
unused blocks
 - Legacy-Id: 8995
2015-02-05 15:48:17 +00:00
Ole Laursen 8de3bc1ac3 Summary: Add a couple of hidden-xs/visible-xs classes to the agenda
table to make it work on a smart phone, this seem to cover most of the
intended goal with m_agenda.html, so delete it instead of facelifting it
 - Legacy-Id: 8950
2015-02-02 16:19:27 +00:00
Ole Laursen 756a972113 Move meeting agenda editing over to new facelifted base template, although without actually facelifting the contents
- Legacy-Id: 8946
2015-01-29 17:53:56 +00:00
Ole Laursen e6238aa721 Facelift the relatively trivial meeting pages
- Legacy-Id: 8942
2015-01-28 14:28:46 +00:00
Robert Sparks 47901e8555 Checkpoint: by-room view and basic leadership meetings support
- Legacy-Id: 8930
2015-01-27 19:15:25 +00:00
Robert Sparks b4448a8faa Added functionality for management of group materials,
focusing on groups of type 'team'.

* Simplifies managing the Abstract for uploaded group materials. 
  Displays the abstract on the groups materials page
* Provides SessionPresentation: a binding between 
  Document and Session objects, that tracks doc version.
* Adds helpers for finding upcoming sessions, and the 
  most recent SessionPresentations whose sessions have passed
* Generalizes the snippet concept (as a templatetage) used 
  in the history tab for use on other pages
* Adds a variant of the snippet that can be styled as an edit link
* Provides several ways to address sessions, using sequence, 
  dates, group acronyms, and day of week
* Adds a 'Materials Manager' Role

Commit ready for merge.
 - Legacy-Id: 8711
2014-11-25 00:09:05 +00:00
Henrik Levkowetz 334d11837a Merged in [8614] from harald@alvestrand.no:
Second try on #1425. Returns to agenda and uses message.
    Builds on [8604]. Fixes issue #1425, agenda view save-as.
 - Legacy-Id: 8621
Note: SVN reference [8604] has been migrated to Git commit c0c608ae1c

Note: SVN reference [8614] has been migrated to Git commit 502dede548
2014-11-09 02:15:18 +00:00
Harald T. Alvestrand 502dede548 Second try on #1425. Returns to agenda and uses message. Commit ready for merge.
- Legacy-Id: 8614
2014-11-09 01:21:16 +00:00
Harald T. Alvestrand c0c608ae1c Fixed agenda view save-as. Fixes #1425. Commit ready for merge.
- Legacy-Id: 8604
2014-11-08 23:11:03 +00:00
Robert Sparks 2f6799ece6 Have working selectors for sessions related to a meeting and sessions related to a document, views for listing such sections that can be edited, and an edit form for changing the presented version. Checkpointing before big refactor to move the URI components around
- Legacy-Id: 8453
2014-10-21 21:16:27 +00:00
Henrik Levkowetz 8b8a282730 Merged in [8229] from rjsparks@nostrum.com, with minor tweaks:
From mcr@sandelman.ca:
    Refactor to remove dajaxice.
    Modified the URLs that address schedules:
      - urls now always start with /agenda, removing the mix of /agenda and /schedule prefixes
      - urls to a given schedule include the schedule owner (by email address)
    Corrected issue that prevented deleting sessions.
    Changed comment mechanism in timeslot_edit.js
    Migration to change the email address for (System)
  Fixes bug #1426
 - Legacy-Id: 8319
Note: SVN reference [8229] has been migrated to Git commit fc512680d8
2014-09-18 20:27:28 +00:00
Henrik Levkowetz cbb5b84652 Merged in [8209] from rjsparks@nostrum.com:\n Fixed several places where files were not being closed.
- Legacy-Id: 8315
Note: SVN reference [8209] has been migrated to Git commit 4aae3ff6785ca2649e54a212bd669369950f4b86
2014-09-16 19:48:30 +00:00
Robert Sparks fc512680d8 From mcr@sandelman.ca:
Refactor to remove dajaxice.
  Modified the URLs that address schedules:
    - urls now always start with /agenda, removing the mix of /agenda and /schedule prefixes
    - urls to a given schedule include the schedule owner (by email address)
  Corrected issue that prevented deleting sessions.
  Changed comment mechanism in timeslot_edit.js
  Migration to change the email address for (System)

  Fixes bug #1426

Commit ready to merge
 - Legacy-Id: 8229
2014-07-31 22:13:01 +00:00
Henrik Levkowetz f86c59209f Changed the logic for what is the 'current' ietf meeting to disregard whether there's an agenda for the meeting or not. This lets people see the correct session request page for the current meeting. However, it also makes the /meeting/agenda.html page fail because there's no schedule associated with the meeting; so alternative pages saying 'No agenda available' has been added, too.
- Legacy-Id: 7641
2014-04-25 13:14:53 +00:00
Henrik Levkowetz bf1e44864d Merged in [7561] from rjsparks@nostrum.com:
Updates and bugfixes to the agenda editing features
* Removes the pattern of using ScheduledSession m2m objects with one of the relationships left as None
* Improves scheduled session state handling
* Simplifies sending email to scheduled session requestors
* Improved timeslot purpose and room editing
* Improved access controls to editing forms
* Better test coverage for the meeting views
* Improvements to the javascript driven by prototyping automated tests
* Better initialization of a new meeting
On the session request form:
  - Allows specifiying room resources (projectors, meetecho)
  - Allows specifying what people must be present
On the schedule editing page:
  - correctly calculates conflict levels
  - displays conflicts in and out of each session separately
  - italicizes BoFs
  - shows resource and people conflicts
Adds automated placement as a management command
 - Legacy-Id: 7628
Note: SVN reference [7561] has been migrated to Git commit 1221f79af9
2014-04-22 21:34:23 +00:00
Henrik Levkowetz 2c27eb481d Merged in [7519] from olau@iola.dk:
Remove uses of gzip middleware - the decorator thing breaks the ETags for some reason, as noted in issue #518, and it seems consensus is that we should do this in Apache instead for the whole site
 - Legacy-Id: 7602
Note: SVN reference [7519] has been migrated to Git commit 9ddecc1970
2014-04-12 18:50:01 +00:00
Robert Sparks 1221f79af9 Updates and bugfixes to the agenda editing features
* Removes the pattern of using ScheduledSession m2m objects with one of the relationships left as None
* Improves scheduled session state handling
* Simplifies sending email to scheduled session requestors
* Improved timeslot purpose and room editing
* Improved access controls to editing forms
* Better test coverage for the meeting views
* Improvements to the javascript driven by prototyping automated tests
* Better initialization of a new meeting
On the session request form:
  - Allows specifiying room resources (projectors, meetecho)
  - Allows specifying what people must be present
On the schedule editing page:
  - correctly calculates conflict levels
  - displays conflicts in and out of each session separately
  - italicizes BoFs
  - shows resource and people conflicts
Adds automated placement as a management command

Commit ready for merge.
 - Legacy-Id: 7561
2014-04-01 22:17:18 +00:00
Ole Laursen 9ddecc1970 Remove uses of gzip middleware - the decorator thing breaks the ETags for some reason, as noted in issue #518, and it seems consensus is that we should do this in Apache instead for the whole site
- Legacy-Id: 7519
2014-03-19 17:40:21 +00:00
Robert Sparks be81557611 Shifted building the edit time slices from looking at scheduledsessions to looking at timeslots
- Legacy-Id: 7511
2014-03-17 21:49:01 +00:00
Henrik Levkowetz c296cb479f Made ietf/meeting pyflakes-clean. Removed some debug-related dead code.
- Legacy-Id: 7473
2014-03-15 18:57:07 +00:00
Henrik Levkowetz 5bef5d11ae Made doc/ pyflakes-clean.
- Legacy-Id: 7462
2014-03-15 16:09:47 +00:00
Robert Sparks 1ef73b5a76 Reworked the worst of the conflicting permissions policies
- Legacy-Id: 7458
2014-03-13 20:45:06 +00:00
Robert Sparks ad2784962f ported forward from personal/rjs/trunk-7174. Still one existing test failing
- Legacy-Id: 7449
2014-03-08 10:37:24 +00:00
Henrik Levkowetz 6e97c2c8da Merged in the port from Django 1.2 to Django 1.6 from olau@iola.dk: branch/iola/djangoport@7121, and fixed some merge issues.
- Legacy-Id: 7152
2014-01-18 21:02:40 +00:00
Ole Laursen f8b1568c87 Rewrite meeting PUTs to POSTs. For no apparent reason, parts of the
meeting AJAX code is using PUT instead of POST (even if it's not
PUT'ing in the literal sense but POST'ing). Theoretical discussions
aside, Django has poor support for PUTs turned POSTs so rewriting them
removes the need for a couple of hacks, and makes it easier to test.
 - Legacy-Id: 7067
2013-12-24 15:13:33 +00:00
Ole Laursen 7dc534f325 Add a couple of select_related fields to edit_timeslots to reduce
number of DB queries from 400 to 13
 - Legacy-Id: 7051
2013-12-23 13:25:22 +00:00
Ole Laursen 7f277a8fbb Replace user.get_profile() with user.person, the profile stuff is deprecated since Django 1.5
- Legacy-Id: 6968
2013-12-18 10:13:40 +00:00