altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity
4701 commits 1 branch 0 tags 2.6 GiB
Commit graph

37 commits

Author SHA1 Message Date
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
Ryan Cross 2ff7900326 fix various issues with recent changes 
- Legacy-Id: 7559
 2014-04-01 18:09:11 +00:00
Ryan Cross 0fafe56381 allow edit of timeslots, changes to scheduled notifications, support non-official schedules 
- Legacy-Id: 7554
 2014-03-28 23:16:41 +00:00
Robert Sparks 73c4f694ca remove agenda from the meeting creation/edit form - that is managed elsewhere now 
- Legacy-Id: 7528
 2014-03-19 21:00:14 +00:00
Robert Sparks 0d5a940f55 Create no ScheduledSessions with session=None 
- Legacy-Id: 7510
 2014-03-17 18:54:11 +00:00
Robert Sparks 59fe8ee3bf Valid name for initial schedule 
- Legacy-Id: 7507
 2014-03-16 19:07:51 +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 4dd7b6963f Made ietf/secr/meetings pyflakes-clean and fixed a bug in the signature of is_combined() 
- Legacy-Id: 7487
 2014-03-15 23:25:59 +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 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 e1efe561da Merged [7397] from rcross@amsl.com: fix bug where build_nonsession() not creating ScheduledSession objects. 
- Legacy-Id: 7406
Note: SVN reference [7397] has been migrated to Git commit 0f0bcd0da3ccf98b5449e6dd1d98a431726986eb
 2014-03-04 21:21:01 +00:00
Ryan Cross 7e38c4becd fix build_nonsession for new db schema, and path to roles ajax call 
- Legacy-Id: 7174
 2014-01-28 14:11:13 +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 d1782297ab assertEquals -> assertEqual in tests, the former is deprecated 
- Legacy-Id: 6964
 2013-12-17 12:52: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 0006b9ddcc Make sure all model forms have a Meta.fields attribute 
- Legacy-Id: 6927
 2013-12-13 17:20:02 +00:00
Ole Laursen 9b720d2a70 Fix bug in Secretariat MeetingModelForm, exclude was missing a , to be a tuple 
- Legacy-Id: 6896
 2013-12-12 12:12:03 +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 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 9457669310 Merge in changes from the old shimfree branch 
- Legacy-Id: 6764
 2013-11-27 12:55:50 +00:00
Henrik Levkowetz edcc97aded Merged in branch/amsl/1.50@6388 from rcross@amsl.com, with secretariat tool 
announcement fixes, permission fixes, and agenda database schema fixes.
 - Legacy-Id: 6473
 2013-10-21 20:29:15 +00:00
Henrik Levkowetz e4f4467725 Changed tests to use our own subclassed TestCase, and changed almost all fixtures to be perma_fixtures. 
- Legacy-Id: 6320
 2013-09-30 20:36:20 +00:00
Ole Laursen c191a691e0 Remove "names" fixture from all tests, since it's now loaded once just 
after creating the test database through the global test fixture
mechanism - this speeds up multiple tests considerably
 - Legacy-Id: 6305
 2013-09-29 17:35:59 +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
Henrik Levkowetz d8074d39d3 Merged the latest secretariat code from rcross@amsl.com, from branch/amsl/trunkmerge@6149. 
- Legacy-Id: 6168
 2013-09-18 19:33:36 +00:00
Ryan Cross 4f98ac157c Revert to pre-agenda tool db schema. Change sec static files subdirectory to 'secretariat'. Branch ready for merge. 
- Legacy-Id: 6148
 2013-09-12 16:58:44 +00:00
Ryan Cross 3655dbb36e fixed 2 bugs where combined sessions aren't being handled properly in edit() and remove() 
- Legacy-Id: 5807
 2013-07-08 18:51:13 +00:00
Ryan Cross 613746fceb changes, timeslot should always have scheduled session 
- Legacy-Id: 5766
 2013-05-30 20:11:47 +00:00
Ryan Cross c9e2955d75 modifications to support agenda tool db changes 
- Legacy-Id: 5762
 2013-05-28 17:48:07 +00:00
Henrik Levkowetz 7e67b40a87 Merged in branch/amsl/trunkmerge@5449 from rcross@amsl.com, with some tweaks. This provides the secretariat apps. 
- Legacy-Id: 5482
 2013-03-05 22:43:31 +00:00
Ryan Cross 275f82d224 normalize secr settings variable names 
- Legacy-Id: 5449
 2013-02-21 23:30:22 +00:00
Ryan Cross c32aee9874 add basic tests 
- Legacy-Id: 5437
 2013-02-21 00:41:04 +00:00
Ryan Cross 1f3ca71362 add apps 
- Legacy-Id: 5430
 2013-02-15 18:10:38 +00:00