Commit graph

36 commits

Author SHA1 Message Date
Henrik Levkowetz f2b883d2bb Merged in ^/trunk@17617.
- Legacy-Id: 17618
2020-04-14 17:11:51 +00:00
Henrik Levkowetz 726fcbf27d Removed all __future__ imports.
- Legacy-Id: 17391
2020-03-05 23:53:42 +00:00
Henrik Levkowetz 566971a6ae Removed further six usage.
- Legacy-Id: 17386
2020-03-05 15:10:33 +00:00
Sasha Romijn 4decb23022 Add display of new constraints and joint sessions to agenda builder interface.
The new timerange, time_relation and wg_adjacent constraints, along with the
joint_with_groups option, are now reflected in the special requests field.
This allows them to be taken into account while scheduling sessions.
 - Legacy-Id: 17378
2020-03-03 15:16:58 +00:00
Ole Laursen 568670c060 Turn sessions into regular sessions and non-sessions into misc.
sessions in the UI and code to avoid ambiguity.

This doesn't change the data in the DB except for uses of
TimeSlotTypeName where 'session' is now 'regular'.
 - Legacy-Id: 17128
2019-12-06 20:02:26 +00:00
Ole Laursen 0555879777 Rename Meeting.agenda to Meeting.schedule together with a bunch of
related internal things
 - Legacy-Id: 17051
2019-11-18 17:22:19 +00:00
Henrik Levkowetz 8c6eb3a30a Python2/3 compatibility: Changed the use of open() and StringIO to io.open() etc.
- Legacy-Id: 16458
2019-07-15 19:14:04 +00:00
Henrik Levkowetz f33ecaa1a4 Fixed a test that compared an int with a meeting number string. Changed meeting test data to use meeting number 72 instead of 42, because proceedings code gives 404 for meetings before 65. Changed a number of StringIO() to BytesIO().
- Legacy-Id: 16378
2019-07-04 16:01:32 +00:00
Henrik Levkowetz 05f275a3af Changed instances of json.loads(r.content) to r.json(). Changed some instances of assert* to assertContains.
- Legacy-Id: 16338
2019-06-30 20:44:45 +00:00
Henrik Levkowetz d7f5c84182 Initial 2to3 patch with added copyright statement updates.
- Legacy-Id: 16309
2019-06-27 14:40:54 +00:00
Henrik Levkowetz ce1b655fa2 Code reorganization, doing away with multiple urls_* and views_ files in ietf.group. No intentional functionality changes.
- Legacy-Id: 13709
2017-06-22 15:18:08 +00:00
Ryan Cross 8a98ba2516 Initialize Empty-Schedule with special sessions from previous meeting on creation. Fixes #1500. Commit ready for merge.
- Legacy-Id: 13588
2017-06-12 21:39:52 +00:00
Lars Eggert 8a70e9773d Fix various "RemovedInDjango20Warning" warnings. Commit ready for merge.
- Legacy-Id: 13112
2017-03-25 19:16:45 +00:00
Henrik Levkowetz 20c9bc9e62 Reverted one instance of caching, as it seems schedules can change owners.
- Legacy-Id: 12138
2016-10-13 19:51:10 +00:00
Robert Sparks b3883b6ac4 Allow non-official schedules to be viewed in the same ways the official schedule for a meeting can be viewed. Fixes #1959. Commit ready for merge.
- Legacy-Id: 11500
2016-06-29 20:56:08 +00:00
Henrik Levkowetz 92214726fd Renamed some files under ietf/group/ which contained views but didn't have 'views' in the name.
- Legacy-Id: 11190
2016-05-13 15:59:10 +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
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 1e30120710 checkpoint. Model changes done and UI tweaked to match.
- Legacy-Id: 9588
2015-04-30 15:57:48 +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
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 b3c06d1e8c Patch from mcr@sandelman.ca: Correct the post data of a meeting test case.
- Legacy-Id: 7826
2014-06-02 21:40:42 +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 b02b0a96df All tests pass, except for some pyflakes tests which I believe are fixed in trunk.
- Legacy-Id: 7579
2014-04-06 20:04:36 +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
Henrik Levkowetz ff0dbe0d52 Merged in source:personal/henrik/r7446-pyflakes@7463, which adds pyflakes tests to the test suite, and makes the code pyflakes-clean.
- Legacy-Id: 7521
2014-03-19 18:48:33 +00:00
Henrik Levkowetz 02031a01b9 Cleaned out some (arbitrary) submodule name imports into ietf.utils, and made the corresponding import statements import the names directly from the correct submodules.
- Legacy-Id: 7495
2014-03-16 07:09:38 +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
Robert Sparks 62600beefa improved test of scheduledsessions_json, added tests for extending a session
- Legacy-Id: 7459
2014-03-14 03:39:42 +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 f4a72ffe2a cleaned up permissions on dajaxice calls, ported and expanded more tests, refactored sendEmail, made a secr filter more robust
- Legacy-Id: 7457
2014-03-13 18:47:31 +00:00
Robert Sparks 1a3c2ce431 Patched meeting/ajax to close permissions vulnerability. Tweaked tests to check the right functionality given the permissions policy currently in trunk
- Legacy-Id: 7456
2014-03-13 17:39:34 +00:00
Robert Sparks f292af9949 minor comments and one addition to test_save_agenda...
- Legacy-Id: 7453
2014-03-12 17:34:27 +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
Ole Laursen 7dcaed414d Add a simple test of the dajaxice.core.js hack for the time being
- Legacy-Id: 7084
2014-01-08 18:13:10 +00:00
Ole Laursen d5b14f3fb3 Rewrite meeting tests: add fake data generator, rewrite the
SimpleUrlTest tests to work with fake data and expand them a bit (they
are still pretty basic), rewrite the agenda editing tests to work with
the small generated fake data, delete those tests that are trivial or
only testing fixture facts as opposed to actually exercising the code,
combine some of them, expand most to actually check the returned JSON
and generally clean up the copy-paste mess of incorrect comments and
incorrect POST data.

At this point, no tests are using the real data base test machinery,
so one can run the full test suite with just

  python manage.py test --settings=settings_sqlitetest

This takes about 72 seconds one a 2.4 GHz Intel Core 2. The
test-crawler and other real data tests take somewhat longer, though.
 - Legacy-Id: 7069
2013-12-24 16:09:33 +00:00