Commit graph

230 commits

Author SHA1 Message Date
Ole Laursen c098fb4f07 Regularize meeting_json to take num instead of meeting_num like the
other meeting AJAX views
 - Legacy-Id: 7060
2013-12-23 17:19:49 +00:00
Ole Laursen 77bd8772b5 Fix interesting syntax error in group_session_mapping, += was mistyped
as =+ which is legal (assignment followed by unary +)
 - Legacy-Id: 7059
2013-12-23 16:59:21 +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 e69ba1e8c4 Fix spelling mistakes in comments for Constraint
- Legacy-Id: 7053
2013-12-23 16:08:36 +00:00
Ole Laursen b42a1165d7 Use .first() and prevent an extra .count() query in TimeSlot.session
- Legacy-Id: 7052
2013-12-23 15:40:10 +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 d6d80a4a77 Make a couple of the utility methods in meeting.models use .first(),
fix potential bug in slot_to_the_right, test on location_id instead of
location in build_timeslices to speed up the edit timeslots view
 - Legacy-Id: 7050
2013-12-23 13:24:40 +00:00
Ole Laursen fa489ce37a Upgrade Dajaxice to latest version from github (0.5.5) to make meeting agenda code work with CSRF, with url conf import fix and using json instead of deprecated simplejson from Django - add a simple view to serve dajaxice.core.js which we need because we are not using the staticfiles collection step (apparently Dajaxice hooks into that through a somewhat complicated hack)
- Legacy-Id: 7028
2013-12-20 11:59:09 +00:00
Ole Laursen 88860edba4 Use user_is_person to determine whether user is schedule owner in
agenda AJAX, instead of complicated try except
 - Legacy-Id: 7027
2013-12-20 11:55:25 +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 e348600bcb raw_post_data -> body
- Legacy-Id: 6976
2013-12-18 11:52:21 +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 42ade6273c Turn on CSRF protection - all forms must from now on have a {% csrf_token %}
- Legacy-Id: 6963
2013-12-17 12:50:24 +00:00
Ole Laursen d66ac15fc2 Rewrite a bunch of HttpResponseRedirect + url reverse calls to instead
take advantage of the redirect shortcut (introduced in Django 1.1)
 - Legacy-Id: 6960
2013-12-17 10:23:42 +00:00
Ole Laursen 84a9f49053 mimetype -> content_type (mimetype is deprecated)
- Legacy-Id: 6945
2013-12-16 16:53:47 +00:00
Ole Laursen 5021ed5629 Port feed setup to new feed API where each feed is a class-based view
- Legacy-Id: 6939
2013-12-16 16:29:22 +00:00
Ole Laursen 6a98fec2c3 Use built-in json module in Python instead of simplejson bundled with Django
- Legacy-Id: 6883
2013-12-11 16:59:19 +00:00
Ole Laursen c15063f3c2 Adjust the import path for feeds
- Legacy-Id: 6879
2013-12-11 16:40:49 +00:00
Ole Laursen cfa0d47ca0 Port to new class-based generic redirect and simple template views, remove utils.lazy.reverse_lazy, it's now included in Django
- Legacy-Id: 6878
2013-12-11 16:36:09 +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 1c60f55fff Fix some includes in meeting test
- Legacy-Id: 6842
2013-12-07 19:28:56 +00:00
Ole Laursen 1606890567 Trim some unused imports in the meeting tests
- Legacy-Id: 6840
2013-12-07 16:15:36 +00:00
Ole Laursen 48f14b8eda Remove now unused proceedings/ and meeting/proxy.py
- Legacy-Id: 6819
2013-12-06 17:40:41 +00:00
Ole Laursen 5ef84cd7df Move proceedings feed to meeting/ and remove traces of shim layer from it
- Legacy-Id: 6818
2013-12-06 16:31:02 +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
Ole Laursen 2cf72aa9e5 Remove references to names.xml in perma_fixtures, they are not needed anyway
- Legacy-Id: 6766
2013-11-27 13:19:58 +00:00
Ole Laursen 9457669310 Merge in changes from the old shimfree branch
- Legacy-Id: 6764
2013-11-27 12:55:50 +00:00
Henrik Levkowetz 239b526d57 Fixed a bug in the materials urls in agenda.ics.
- Legacy-Id: 6666
2013-11-06 17:03:30 +00:00
Henrik Levkowetz 58685d93e1 Updated known-good test file to match commit [6655].
- Legacy-Id: 6661
Note: SVN reference [6655] has been migrated to Git commit 89904c9bb3
2013-11-06 16:00:25 +00:00
Henrik Levkowetz 6d8b178074 Include IAOC update sessions in the training section.
- Legacy-Id: 6647
2013-11-04 15:12:21 +00:00
Henrik Levkowetz 7925223ef8 Merged [6622] from rjsparks@nostrum.com:
Refines Bill Fenner's regex based search through documents for references.
Populates RelatedDocument with relations for references for each type draft Document.
Replaces these reference relationships with updated copies on draft submission.

Note to deployer: There is a script to run in patches/fill_in_references.py that does the work of bringing the database up to date. It takes around 10 minutes to complete on a fast development laptop.

fixes bug #1173
 - Legacy-Id: 6633
Note: SVN reference [6622] has been migrated to Git commit a677a70df3
2013-11-02 23:04:28 +00:00
Henrik Levkowetz 0aba8663a5 Updated known-good agenda.csv master to match blankline elimination from template.
- Legacy-Id: 6628
2013-11-02 22:13:51 +00:00
Henrik Levkowetz 43c1b096dd Updated known-good files.
- Legacy-Id: 6617
2013-11-02 20:21:22 +00:00
Henrik Levkowetz 13b6c7a983 Updated template and support functions for iPhone agenda page.
- Legacy-Id: 6582
2013-10-31 17:58:59 +00:00
Robert Sparks 7a84ffe197 Reverted materials.html and the view that drives it to before the 4.70 merge.
Tweaked the view to get (I hope) the right things.
 - Legacy-Id: 6580
2013-10-31 17:16:53 +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 1208ae708b Removed 2 tests which tested dead code.
- Legacy-Id: 6577
2013-10-30 21:33:10 +00:00
Henrik Levkowetz dc6d96797b Removed unused imports. Marked some instances of code which used variables that don't exist. Removed dependency on the logging module, we use syslog by default. Replaced some log.debug() calls with debug.log().
- Legacy-Id: 6576
2013-10-30 21:27:40 +00:00
Henrik Levkowetz 6c8802a3cc Needlessly fixed a naming error in meeting.proxy.
- Legacy-Id: 6575
2013-10-30 21:23:22 +00:00
Henrik Levkowetz adc5b130dc Fixed incorrect except statement syntax.
- Legacy-Id: 6574
2013-10-30 21:21:28 +00:00
Henrik Levkowetz c8e7a4a5d4 Updated test masters to match the changed (and now more predictable) order
of some entries.
 - Legacy-Id: 6538
2013-10-29 22:45:29 +00:00
Henrik Levkowetz 951670e9df New view code and templates for agenda pages, updating all agenda templates
to take schedule-specific information so that they will work with arbitrary
schedules, not just the official schedule for a meeting.
 - Legacy-Id: 6537
2013-10-29 22:44:13 +00:00
Henrik Levkowetz c61d1d1c2f Provided new methods Meeting.vtimezone() which return a vtimezone stanza for
ical files, based on the timezone setting for a meeting, fetched from a pre-
generated file; and Session.ical_status(), which provides a string appropriate
for use in ical STATUS: entries.
 - Legacy-Id: 6536
2013-10-29 22:30:38 +00:00
Henrik Levkowetz 93826ae094 Fixed the case where the urlpattern regexp match gives us an ext which is None.
- Legacy-Id: 6502
2013-10-27 23:04:02 +00:00
Henrik Levkowetz 16ae35ae19 Rewrote html and text agenda templates to take schedule as data.
- Legacy-Id: 6495
2013-10-27 12:16:37 +00:00
Henrik Levkowetz 2dcb9bc39d Removed the ams_filters template tag file from the meeting app -- it was a copy of the ams_filters under secr/, and masked it.
- Legacy-Id: 6481
2013-10-22 19:01:18 +00:00
Henrik Levkowetz e3eeee53fb Renumbered unapplied migration.
- Legacy-Id: 6475
2013-10-21 21:51:21 +00:00
Henrik Levkowetz 11230a8448 Let Timeslot.session() Return the first session, rather than none, for
timeslots with multiple associated sessions for the public schedule.
 - Legacy-Id: 6464
2013-10-18 12:15:46 +00:00