fedocal-devel November 2012

fedocal-devel@lists.fedorahosted.org

5 participants
251 discussions

[fedocal] master: Add recursion_frequency as a criteria to select the recursive meetings (b72ce84)
by Pierre-YvesChibon 27 Nov '12

27 Nov '12

Repository : http://git.fedorahosted.org/cgit/fedocal.git On branch : master >--------------------------------------------------------------- commit b72ce84c0b0b22c9a9c7010f6f06dcb949abc542 Author: Pierre-Yves Chibon <pingou(a)pingoured.fr> Date: Tue Nov 27 22:24:01 2012 +0100 Add recursion_frequency as a criteria to select the recursive meetings >--------------------------------------------------------------- fedocal/fedocallib/model.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/fedocal/fedocallib/model.py b/fedocal/fedocallib/model.py index 8f6b74a..82a00c3 100644 --- a/fedocal/fedocallib/model.py +++ b/fedocal/fedocallib/model.py @@ -383,6 +383,7 @@ class Meeting(BASE): recursive_meetings = session.query(cls).filter(and_ (Meeting.meeting_time_start >= start_time), (Meeting.meeting_time_start < stop_time), + (Meeting.recursion_frequency != None), (Meeting.recursion_ends >= start_date), (Meeting.reminder_id.in_(reminders))).all() for meeting in recursive_meetings:

1 0

[fedocal] #15: Add possibility to edit a calendar
by fedocal 27 Nov '12

27 Nov '12

#15: Add possibility to edit a calendar ---------------------+------------------------- Reporter: pingou | Owner: Type: defect | Status: new Priority: major | Milestone: 0.1.0 Component: fedocal | Version: development Keywords: | ---------------------+------------------------- At the moment we can only edit a calendar, we should be able to edit it as well -- Ticket URL: <https://fedorahosted.org/fedocal/ticket/15> fedocal <https://fedorahosted.org/fedocal> A web-based calendar application for Fedora

1 2

[fedocal] master: Small layout changes to the development.rst (821ebb2)
by Pierre-YvesChibon 27 Nov '12

27 Nov '12

Repository : http://git.fedorahosted.org/cgit/fedocal.git On branch : master >--------------------------------------------------------------- commit 821ebb260879a1ae7fc184b4dcfb9c77d05f4dd6 Author: Pierre-Yves Chibon <pingou(a)pingoured.fr> Date: Tue Nov 27 15:44:26 2012 +0100 Small layout changes to the development.rst >--------------------------------------------------------------- doc/development.rst | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/doc/development.rst b/doc/development.rst index 836d5c9..97d1e47 100644 --- a/doc/development.rst +++ b/doc/development.rst @@ -94,6 +94,7 @@ trac. .. note:: You can send your patch by email to the `fedocal mailing-list <https://lists.fedorahosted.org/mailman/listinfo/fedocal>`_ + Unit-tests ----------

1 0

[fedocal] master: Update usage documentation (bc34838)
by Pierre-YvesChibon 27 Nov '12

27 Nov '12

Repository : http://git.fedorahosted.org/cgit/fedocal.git On branch : master >--------------------------------------------------------------- commit bc34838fa1c160e021be22e5421910dc2727c919 Author: Pierre-Yves Chibon <pingou(a)pingoured.fr> Date: Tue Nov 27 15:48:06 2012 +0100 Update usage documentation Add a paragraph on how to edit a calendar and add some links within the text to previous sections. >--------------------------------------------------------------- doc/usage.rst | 25 ++++++++++++++++++++++--- 1 files changed, 22 insertions(+), 3 deletions(-) diff --git a/doc/usage.rst b/doc/usage.rst index 75d397f..bf289e6 100644 --- a/doc/usage.rst +++ b/doc/usage.rst @@ -30,6 +30,8 @@ every contributor should sign to contribute to Fedora. +.. _create_calendar: + Create calendar --------------- @@ -76,6 +78,21 @@ The form to will ask for: +Edit a calendar +--------------- + +One can edit a calendar if she/he is an administrator as defined +above. + +To edit a calendar, select the calendar to edit in the main menu by +clicking on its name. Then go to the ``Admin`` entry of the main menu and +select ``Edit calendar``. + +When editing a calendar you will have the same field as when creating one +(see :ref:`create_calendar`). + + + Delete a calendar ----------------- @@ -95,6 +112,8 @@ to confirm the deletion of the Calendar. +.. _create_meeting: + Create meeting -------------- @@ -175,9 +194,9 @@ menu and select ``Manage your meetings``. This page will present a list of the meetings for which you are a manager and that you can edit. -When editing a meeting you will have the same field as when creating one, -plus when the meeting is recursive an option to update all the future meetings -or just this one (default). +When editing a meeting you will have the same field as when creating one +(see :ref:`create_meeting`),plus when the meeting is recursive an option +to update all the future meetings or just this one (default).

1 0

[fedocal] master: When we face a SQLAlchemyError, we should rollback the transaction (a5f7dfc)
by Pierre-YvesChibon 27 Nov '12

27 Nov '12

Repository : http://git.fedorahosted.org/cgit/fedocal.git On branch : master >--------------------------------------------------------------- commit a5f7dfc017484e4b7f2e81a1451a50660ce1efac Author: Pierre-Yves Chibon <pingou(a)pingoured.fr> Date: Tue Nov 27 15:38:58 2012 +0100 When we face a SQLAlchemyError, we should rollback the transaction This will prevent the connection to the database to be locked if something happens (something such as someone trying to create two agendas with the same name...) >--------------------------------------------------------------- fedocal/__init__.py | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/fedocal/__init__.py b/fedocal/__init__.py index f0f151a..4b8c94f 100644 --- a/fedocal/__init__.py +++ b/fedocal/__init__.py @@ -269,9 +269,9 @@ def add_calendar(): try: calendarobj.save(SESSION) SESSION.commit() - # pylint: disable=W0703 - except Exception, err: - print err + except SQLAlchemyError, err: + SESSION.rollback() + print 'add_calendar:', err flask.flash('Could not add this calendar to the database') return flask.render_template('add_calendar.html', form=form) @@ -321,6 +321,7 @@ def add_meeting(calendar_name): calendar=calendarobj, form=form, tzone=tzone) except SQLAlchemyError, err: + SESSION.rollback() print 'add_meeting:', err flask.flash('Could not add this meeting to this calendar') return flask.render_template('add_meeting.html', @@ -384,6 +385,7 @@ def edit_meeting(meeting_id): meeting=meeting, calendar=calendarobj, form=form, tzone=tzone) except SQLAlchemyError, err: + SESSION.rollback() print 'edit_meeting:', err flask.flash('Could not update this meeting.') return flask.render_template('edit_meeting.html', @@ -447,8 +449,8 @@ def delete_meeting(meeting_id): meeting.delete(SESSION) try: SESSION.commit() - # pylint: disable=W0703 - except Exception, err: + except SQLAlchemyError, err: + SESSION.rollback() print 'edit_meeting:', err flask.flash('Could not update this meeting.') flask.flash('Meeting deleted') @@ -478,8 +480,8 @@ def delete_calendar(calendar_name): calendarobj.delete(SESSION) try: SESSION.commit() - # pylint: disable=W0703 - except Exception, err: + except SQLAlchemyError, err: + SESSION.rollback() print 'delete_calendar:', err flask.flash('Could not delete this calendar.') flask.flash('Calendar deleted') @@ -516,6 +518,7 @@ def edit_calendar(calendar_name): calendarobj.save(SESSION) SESSION.commit() except SQLAlchemyError, err: + SESSION.rollback() print 'edit_calendar:', err flask.flash('Could not update this calendar.') return flask.render_template('edit_calendar.html', form=form,

1 0

[fedocal] master: Add support to edit calendar information (0eac762)
by Pierre-YvesChibon 27 Nov '12

27 Nov '12

Repository : http://git.fedorahosted.org/cgit/fedocal.git On branch : master >--------------------------------------------------------------- commit 0eac762606a6a4ab53efd9ff2c769bbf4b88b062 Author: Pierre-Yves Chibon <pingou(a)pingoured.fr> Date: Tue Nov 27 15:32:55 2012 +0100 Add support to edit calendar information There is now an entry in the admin menu which allows to edit a calendar and thus change its specifications. Fixes #15 >--------------------------------------------------------------- fedocal/__init__.py | 45 +++++++++++++++++++- fedocal/forms.py | 19 ++++++++ .../{add_calendar.html => edit_calendar.html} | 6 +- fedocal/templates/master.html | 4 ++ 4 files changed, 69 insertions(+), 5 deletions(-) diff --git a/fedocal/__init__.py b/fedocal/__init__.py index c3406f6..f0f151a 100644 --- a/fedocal/__init__.py +++ b/fedocal/__init__.py @@ -464,9 +464,9 @@ def delete_meeting(meeting_id): @APP.route('/calendar/delete/<calendar_name>/', methods=('GET', 'POST')) @cla_plus_one_required def delete_calendar(calendar_name): - """ Delete a specific meeting given its identifier. + """ Delete a specific calendar given its identifier. - :arg meeting_id: the identifier of the meeting to delete. + :arg calendar_name: the identifier of the calendar to delete. """ if not flask.g.fas_user or not is_admin(): return flask.redirect(flask.url_for('index')) @@ -488,6 +488,47 @@ def delete_calendar(calendar_name): form=deleteform, calendarobj=calendarobj) +# pylint: disable=R0915,R0912,R0911 +# CLA + 1 +(a)APP.route('/calendar/edit/<calendar_name>/', methods=('GET', 'POST')) +@cla_plus_one_required +def edit_calendar(calendar_name): + """ Edit a specific calendar based on the calendar identifier. + + :arg calendar_name: the identifier of the calendar to edit. + """ + if not flask.g.fas_user or not is_admin(): + return flask.redirect(flask.url_for('index')) + calendarobj = Calendar.by_id(SESSION, calendar_name) + form = forms.AddCalendarForm() + # pylint: disable=E1101 + if form.validate_on_submit(): + try: + calendarobj.calendar_name = form.calendar_name.data + calendarobj.calendar_contact = form.calendar_contact.data + calendarobj.calendar_description = form.calendar_description.data + calendarobj.calendar_manager_group = \ + form.calendar_manager_groups.data + calendarobj.calendar_multiple_meetings = bool( + form.calendar_multiple_meetings.data) + calendarobj.calendar_regional_meetings = bool( + form.calendar_regional_meetings.data) + calendarobj.save(SESSION) + SESSION.commit() + except SQLAlchemyError, err: + print 'edit_calendar:', err + flask.flash('Could not update this calendar.') + return flask.render_template('edit_calendar.html', form=form, + calendar=calendarobj) + + flask.flash('Calendar updated') + return flask.redirect(flask.url_for('calendar', + calendar_name=calendarobj.calendar_name)) + else: + form = forms.AddCalendarForm(calendar=calendarobj) + return flask.render_template('edit_calendar.html', form=form, + calendar=calendarobj) + if __name__ == '__main__': # pragma: no cover APP.debug = True APP.run() diff --git a/fedocal/forms.py b/fedocal/forms.py index a17602f..913c6cd 100644 --- a/fedocal/forms.py +++ b/fedocal/forms.py @@ -58,6 +58,25 @@ class AddCalendarForm(wtf.Form): calendar_regional_meetings = wtf.BooleanField( 'Meetings can regional?') + def __init__(self, *args, **kwargs): + """ Calls the default constructor with the normal argument but + if a calendar is set using the calendar keyword, then fill the + value of the form with the value from the Calendar object. + """ + super(AddCalendarForm, self).__init__(*args, **kwargs) + if 'calendar' in kwargs: + calendar = kwargs['calendar'] + + self.calendar_name.data = calendar.calendar_name + self.calendar_contact.data = calendar.calendar_contact + self.calendar_description.data = calendar.calendar_description + self.calendar_manager_groups.data = \ + calendar.calendar_manager_group + self.calendar_multiple_meetings.data = bool( + calendar.calendar_multiple_meetings) + self.calendar_regional_meetings.data = bool( + calendar.calendar_regional_meetings) + class AddMeetingForm(wtf.Form): """ Form used to create a new meeting. """ diff --git a/fedocal/templates/add_calendar.html b/fedocal/templates/edit_calendar.html similarity index 88% copy from fedocal/templates/add_calendar.html copy to fedocal/templates/edit_calendar.html index 772518d..cc9f0d9 100644 --- a/fedocal/templates/add_calendar.html +++ b/fedocal/templates/edit_calendar.html @@ -8,8 +8,8 @@ {% block content %} <section> <header> - <h2>New calendar</h2> - <p>Please enter your calendar details in the form below.</p> + <h2>Edit calendar</h2> + <p>Edit the calendar details in the form below.</p> </header> <form action="" method="post"> @@ -20,7 +20,7 @@ {{ render_field(form.calendar_multiple_meetings) }} {{ render_field(form.calendar_regional_meetings) }} <p class="buttons indent"> - <input type="submit" class="submit positive button" value="Create"> + <input type="submit" class="submit positive button" value="Edit"> <input type="button" value="Cancel" class="button" onclick="history.back();"> {{ form.csrf_token }} </p> diff --git a/fedocal/templates/master.html b/fedocal/templates/master.html index fb21e36..21aca49 100644 --- a/fedocal/templates/master.html +++ b/fedocal/templates/master.html @@ -102,6 +102,10 @@ </li> {% if calendar %} <li> + <a href="{{ url_for('edit_calendar', + calendar_name=calendar.calendar_name) }}"> Edit calendar </a> + </li> + <li> <a href="{{ url_for('delete_calendar', calendar_name=calendar.calendar_name) }}"> Delete calendar </a> </li>

1 0

[fedocal] master: The form is below not above in the add_calendar template (a24c0f2)
by Pierre-YvesChibon 27 Nov '12

27 Nov '12

Repository : http://git.fedorahosted.org/cgit/fedocal.git On branch : master >--------------------------------------------------------------- commit a24c0f2cc4d7ac334b49725ac4690bd8ec66c82c Author: Pierre-Yves Chibon <pingou(a)pingoured.fr> Date: Tue Nov 27 15:32:18 2012 +0100 The form is below not above in the add_calendar template >--------------------------------------------------------------- fedocal/templates/add_calendar.html | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/fedocal/templates/add_calendar.html b/fedocal/templates/add_calendar.html index d449752..772518d 100644 --- a/fedocal/templates/add_calendar.html +++ b/fedocal/templates/add_calendar.html @@ -9,7 +9,7 @@ <section> <header> <h2>New calendar</h2> - <p>Please enter your calendar details in the above form.</p> + <p>Please enter your calendar details in the form below.</p> </header> <form action="" method="post">

1 0

[fedocal] master: Add import for ValidationError, needed if we want to raise that exception later (666168f)
by Pierre-YvesChibon 27 Nov '12

27 Nov '12

Repository : http://git.fedorahosted.org/cgit/fedocal.git On branch : master >--------------------------------------------------------------- commit 666168f3e577f24243e8069fdd414641f41658b5 Author: Pierre-Yves Chibon <pingou(a)pingoured.fr> Date: Tue Nov 27 08:20:27 2012 +0100 Add import for ValidationError, needed if we want to raise that exception later >--------------------------------------------------------------- fedocal/forms.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/fedocal/forms.py b/fedocal/forms.py index e79cc65..a17602f 100644 --- a/fedocal/forms.py +++ b/fedocal/forms.py @@ -28,6 +28,8 @@ from flask.ext import wtf from datetime import time from datetime import datetime +from wtforms import ValidationError + import fedocallib

1 0

[fedocal] master: Update configuration documentation CRON_FREQUENCY is an int (6418a52)
by Pierre-YvesChibon 26 Nov '12

26 Nov '12

Repository : http://git.fedorahosted.org/cgit/fedocal.git On branch : master >--------------------------------------------------------------- commit 6418a52b9c0651f56cc080a177f5bfdb1d71e1a7 Author: Pierre-Yves Chibon <pingou(a)pingoured.fr> Date: Mon Nov 26 22:05:57 2012 +0100 Update configuration documentation CRON_FREQUENCY is an int >--------------------------------------------------------------- doc/configuration.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/doc/configuration.rst b/doc/configuration.rst index 63678bb..83e45d0 100644 --- a/doc/configuration.rst +++ b/doc/configuration.rst @@ -71,4 +71,4 @@ information is essentiel to accurately retrieve the meetings to remind and avoid sending multiple reminder for one meeting. -This field defaults to ``CRON_FREQUENCY='30'``. +This field defaults to ``CRON_FREQUENCY=30``.

1 0

[fedocal] master: pep8 run on default_config (25e7a92)
by Pierre-YvesChibon 26 Nov '12

26 Nov '12

Repository : http://git.fedorahosted.org/cgit/fedocal.git On branch : master >--------------------------------------------------------------- commit 25e7a9212ac54a8fa49e1bdaef0b50aafdc37c7b Author: Pierre-Yves Chibon <pingou(a)pingoured.fr> Date: Mon Nov 26 21:59:05 2012 +0100 pep8 run on default_config >--------------------------------------------------------------- fedocal/default_config.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/fedocal/default_config.py b/fedocal/default_config.py index 55f306a..b05fc92 100644 --- a/fedocal/default_config.py +++ b/fedocal/default_config.py @@ -38,4 +38,4 @@ SMTP_SERVER = 'localhost' # The cron job can be set with any frequency but fedocal_cron -CRON_FREQUENCY=30 +CRON_FREQUENCY = 30

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

fedocal-devel November 2012