Commit graph

37 commits

Author SHA1 Message Date
Robert Sparks 2bae86397e Show session details for interims as well as ietf meetings. Commit ready for merge.
- Legacy-Id: 10733
2016-01-25 23:06:41 +00:00
Henrik Levkowetz d8413d5d28 Changed a helper function meeting_updated() to a method on Meeting, and provided it as a synthetic attribute on the /api/v1/meeting/meeting/ endpoints of the JSON API.
- Legacy-Id: 10611
2015-12-19 01:52:13 +00:00
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
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
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 0ba095e229 remove some dead code
- Legacy-Id: 9598
2015-05-04 13:25:57 +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 8f0b8a9225 Checkpoint for demonstration/discussion in Dallas. More development expected afterwards.
- Legacy-Id: 9250
2015-03-19 18:41:02 +00:00
Henrik Levkowetz 048319edbc Merged in [9097] from rcross@amsl.com:
Fixes #1605.  Editing session request causes KeyError.
 - Legacy-Id: 9120
Note: SVN reference [9097] has been migrated to Git commit a660c433bb
2015-02-24 18:44:00 +00:00
Henrik Levkowetz ca8d554b78 Undid previous commit -- it contained too much.
- Legacy-Id: 9118
2015-02-24 18:31:53 +00:00
Ryan Cross a660c433bb Fixes #1605. Editing session request causes KeyError. Commit ready for merge.
- Legacy-Id: 9097
2015-02-17 19:55:54 +00:00
Robert Sparks 61a0059d06 checkpoint before trying to fix the static agenda page
- Legacy-Id: 8972
2015-02-04 20:47:40 +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 82bc8f06e1 Restrict the gathering of ads for past meetings to groups that are areas. Commit ready for merge.
- Legacy-Id: 8924
2015-01-26 23:35:32 +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
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
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
Henrik Levkowetz 722a008d25 Fixed overflow error for meetings without timeslots, which gave server errors for meeting/64/agenda.html.
- Legacy-Id: 7276
2014-02-20 11:26:52 +00:00
Ole Laursen b4fa414406 Make agenda_permission use user_is_person, rewrite it to be a little
less verbose
 - Legacy-Id: 7054
2013-12-23 16:43:44 +00:00
Ole Laursen 38c153c03d Remove usage of distinct(field) in meeting/helpers.py, Django
complains that it doesn't work on MySQL and the two uses appear
superfluous anyway since they only return the field being distincted
 - Legacy-Id: 7018
2013-12-19 16:06:37 +00:00
Ole Laursen f88fb5f9ac Port meeting fix from shimfree branch
- Legacy-Id: 6984
2013-12-18 14:56:37 +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
Ole Laursen 371c4bb344 Fix computing meeting updated timestamp when there's either a timeslot
or a session but not both
 - Legacy-Id: 6855
2013-12-09 10:52:31 +00:00
Ole Laursen ad9503f1ed Removing remaining traces of shim layer usage in meeting
- Legacy-Id: 6817
2013-12-06 16:10:10 +00:00
Ole Laursen e63ac36b8f Remove shim layer from ietfauth, delete some dead code and migrate
remaining importers of ietfauth.decorators to ietfauth.utils
 - Legacy-Id: 6797
2013-12-05 16:24:03 +00:00
Henrik Levkowetz 45b9b45f28 Removed a lot of dead code and unused imports.
- Legacy-Id: 6578
2013-10-30 21:51:13 +00:00
Henrik Levkowetz a23d31677f Tweaked the strings displayed when a plenary agenda cannot be shown.
- Legacy-Id: 6460
2013-10-17 11:28:29 +00:00
Henrik Levkowetz e33fe28a2c Reverted to release 4.72 versions of several functions and methods, starting
with agenda_info() and the view functions that use it.  Also changed
meeting/tests/agenda.py to accept matching return values.  Reverted old
supporting models and proxy models to 4.72 versions, too, in meeting/proxy.py
and proceedings/models.py.  Updated the proxy models which rely on TimeSlot
to work properly with the m2m sessions field, and adjusted some other
functions, such as session_agenda() to also understand the m2m sessions
field (and its reverse).  Added an understanding of the "bof-conc" state
to the code which returns 'BOF' or 'WG' for agenda templates.
 - Legacy-Id: 6452
2013-10-15 17:54:42 +00:00
Henrik Levkowetz bb148003b5 Fixed the plenary display code for the text agenda to use the non-proxy plenary information to identify the plenaries, matching other previous changes from the agenda branch.
- Legacy-Id: 6383
2013-10-08 06:42:53 +00:00
Henrik Levkowetz 03a79d4736 Merged [6363] from mcr@sandelman.ca: Don't include timeslots marked
'unavailable' in the agenda.
 - Legacy-Id: 6365
Note: SVN reference [6363] has been migrated to Git commit 8de0d8a0c8814059b153e96929220bed6cb46e2c
2013-10-04 14:07:13 +00:00
Henrik Levkowetz a3c8adfdf6 Merged in the contents of commit [6337] from mcr@sandelman.ca, with some changes to take out dead code that inadvertently came back in.
- Legacy-Id: 6344
Note: SVN reference [6337] has been migrated to Git commit d0d1d949a9328da6c4e30d8f5e0d14ffb204e678
2013-10-02 21:53:28 +00:00
Henrik Levkowetz 92b9da1d4f Moved read_agenda_file() and session_draft_list() back to views.py. The move almost masked a code change in trunk during the merge.
- Legacy-Id: 6294
2013-09-28 05:42:49 +00:00
Henrik Levkowetz 6154b9922d This commit isn't tested. It captures the state after merging in branch/ssw/agenda/v4.70.
- Legacy-Id: 6273
2013-09-26 19:56:17 +00:00