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

42 commits

Author SHA1 Message Date
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 3957743b85 Move Session.status, .requested, and .requested_by to a new SchedulingEvent 
- Legacy-Id: 17122
 2019-12-05 12:41:09 +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
Ryan Cross 7211cf399b Add check for deleted session when scheduling. Fixes #2450. Commit ready for merge 
- Legacy-Id: 14842
 2018-03-17 15:10:20 +00:00
Henrik Levkowetz 671ad54cc7 Work around mixed return types for get_meeting_schedule() 
- Legacy-Id: 14643
 2018-02-15 17:20:57 +00:00
Robert Sparks d4acb1cbd9 Workaround an issue with the schedule editor by ensuring no sessions remain scheduled in a room whose purpose has changed to something other than holding sessions (such as becoming unavailable). Commit ready for merge. 
- Legacy-Id: 13586
 2017-06-12 20:01:47 +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 10cac86165 Preparation for dead code removal: Marked probable dead code with affirm() statements which will signal if we ever reach that point in the code. If no signals seen, the marked functions/methods will be removed after one release cycle. 
- Legacy-Id: 12926
 2017-02-27 16:45:21 +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 c68ae7669e Provides a custom json view of meetings optimized for the iphone app. Commit ready for merge. 
- Legacy-Id: 11756
 2016-08-04 19:51:52 +00:00
Henrik Levkowetz 6da7ec17db Merged in personal/henrik/6.7.2.dev0-schemafix [10297] from henrik@levkowetz.com: 
Renamed class ScheduledSession to the more correct (but unfortunately also cumbersome) SchedTimeSessAssignment, and renamed reverse relationships involving this class appropriately.  Accompanying changes in javascript and templates.  Migrations to match.
 - Legacy-Id: 10299
Note: SVN reference [10297] has been migrated to Git commit 71dec7a692
 2015-10-27 15:23:00 +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 61ca4d2b5b Better fix, replacing [10294]. 
- Legacy-Id: 10296
Note: SVN reference [10294] has been migrated to Git commit c760822e04
 2015-10-26 22:42:55 +00:00
Henrik Levkowetz c760822e04 Fix a bug in meeting.ajax.constraint_json(). 
- Legacy-Id: 10294
 2015-10-26 19:53:14 +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 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
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 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 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 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 3408b73872 Use request.POST directly instead of aliasing it to update_dict, add a 
FIXME on permission naming
 - Legacy-Id: 7068
 2013-12-24 15:59:01 +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 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 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 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 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 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 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 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 8561e9c2d8 Removed unwanted Http403 exception. 
- Legacy-Id: 6374
 2013-10-04 20:46:08 +00:00
Henrik Levkowetz 807ea25e3c Removed some debug statements. 
- Legacy-Id: 6350
 2013-10-03 14:20:14 +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 083f60dd93 Renamed model .url() methods to .json_url() or .base_url(), depending on function. Replaced the use of custom django method request.get_host_protocol() with standard request.build_absolute_uri(). Removed an uncaught Http403 exception. Fixed a typo /venus_addr/venue_addr/. Removed relurl() methods; no longer needed. Removed some debug functions. 
- Legacy-Id: 6309
 2013-09-29 21:14:07 +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