From 7a93695513c8c2a6d5ae6707f759c022dde79640 Mon Sep 17 00:00:00 2001 From: Bibhas Date: Wed, 16 Jan 2019 23:23:47 +0530 Subject: [PATCH] replaced hyphen with underscore in permmissions --- funnel/models/profile.py | 2 +- funnel/models/project.py | 10 +++++----- funnel/templates/index.html.jinja2 | 2 +- funnel/templates/macros.html.jinja2 | 4 ++-- funnel/templates/project.html.jinja2 | 4 ++-- funnel/templates/proposals.html.jinja2 | 6 +++--- funnel/views/event.py | 4 ++-- funnel/views/participant.py | 6 +++--- funnel/views/project.py | 6 +++--- 9 files changed, 22 insertions(+), 22 deletions(-) diff --git a/funnel/models/profile.py b/funnel/models/profile.py index 478b5a6a6..67773824c 100644 --- a/funnel/models/profile.py +++ b/funnel/models/profile.py @@ -40,7 +40,7 @@ def permissions(self, user, inherited=None): perms.add('edit-profile') perms.add('new_project') perms.add('delete-project') - perms.add('edit-project') + perms.add('edit_project') return perms def roles_for(self, actor=None, anchors=()): diff --git a/funnel/models/project.py b/funnel/models/project.py index 05834c0b3..af7ae24ce 100644 --- a/funnel/models/project.py +++ b/funnel/models/project.py @@ -335,7 +335,7 @@ def permissions(self, user, inherited=None): user.owner_of(self.profile)): perms.update([ 'view_contactinfo', - 'edit-project', + 'edit_project', 'delete-project', 'view-section', 'new-section', @@ -352,7 +352,7 @@ def permissions(self, user, inherited=None): 'delete-venue', 'edit-schedule', 'move-proposal', - 'view-rsvps', + 'view_rsvps', 'new-session', 'edit-session', 'new-event', @@ -361,7 +361,7 @@ def permissions(self, user, inherited=None): 'edit-ticket-client', 'edit-event', 'admin', - 'checkin-event', + 'checkin_event', 'view-event', 'view-ticket-type', 'edit-participant', @@ -372,7 +372,7 @@ def permissions(self, user, inherited=None): perms.update([ 'view_contactinfo', 'confirm-proposal', - 'view-voteinfo', + 'view_voteinfo', 'view_status', 'edit-proposal', 'delete-proposal', @@ -387,7 +387,7 @@ def permissions(self, user, inherited=None): ]) if self.checkin_team and user in self.checkin_team.users: perms.update([ - 'checkin-event' + 'checkin_event' ]) return perms diff --git a/funnel/templates/index.html.jinja2 b/funnel/templates/index.html.jinja2 index 8161c8258..ea4c7904d 100644 --- a/funnel/templates/index.html.jinja2 +++ b/funnel/templates/index.html.jinja2 @@ -119,7 +119,7 @@

{% trans %}There are no projects at this time.{% endtrans %} - {% if 'new_project' in g.permissions %}{% trans %}Create one{% endtrans %}.{% endif %} + {% if current_auth.permissions.new_project %}{% trans %}Create one{% endtrans %}.{% endif %}

diff --git a/funnel/templates/macros.html.jinja2 b/funnel/templates/macros.html.jinja2 index 98dde6d9a..0c3e1c974 100644 --- a/funnel/templates/macros.html.jinja2 +++ b/funnel/templates/macros.html.jinja2 @@ -114,7 +114,7 @@ {% endmacro %} -{% macro admin_panel(project, transition_form='') %} +{% macro admin_panel(project, transition_form=none) %}
@@ -169,7 +169,7 @@ save_alt {% trans %}Schedule JSON{% endtrans %}

- {% elif 'checkin-event' in g.permissions %} + {% elif current_auth.permissions.checkin_event %}
  1. diff --git a/funnel/templates/project.html.jinja2 b/funnel/templates/project.html.jinja2 index b4bd5eeab..659966174 100644 --- a/funnel/templates/project.html.jinja2 +++ b/funnel/templates/project.html.jinja2 @@ -42,7 +42,7 @@ {% block contentwrapper %}
    - {%- if project.current_roles.admin or 'checkin-event' in g.permissions %} + {%- if project.current_roles.admin or current_auth.permissions.checkin_event %} {{ admin_panel(project, transition_form) }} {% endif %}
    @@ -164,7 +164,7 @@ {% trans %}Login to RSVP{% endtrans %}

    {%- endif %} - {% if project.current_roles.admin or 'view-rsvps' in g.permissions %} + {% if project.current_roles.admin or current_auth.permissions.view_rsvps %} See RSVP list {% endif %} {%- endif %} diff --git a/funnel/templates/proposals.html.jinja2 b/funnel/templates/proposals.html.jinja2 index 77a968825..38471fa94 100644 --- a/funnel/templates/proposals.html.jinja2 +++ b/funnel/templates/proposals.html.jinja2 @@ -24,7 +24,7 @@ {%- if proposal.user != proposal.speaker %} via {{ proposal.user.pickername }} {%- endif %} - {%- if g.user and 'edit-project' in g.permissions %} + {%- if g.user and current_auth.permissions.edit_project %} {%- if proposal.has_outstation_speaker %} flight {%- endif %} @@ -41,7 +41,7 @@ {% endif %}
  2. {{ proposal.technical_level }}
  3. {{ proposal.voteset.count }} upvotes - {% if 'view-voteinfo' in g.permissions %} + {% if current_auth.permissions.view_voteinfo %} {%- set breakups = dict() %} {%- set groups = proposal.votes_by_group() %} {%- if 'participants' in groups %}{% do breakups.update({'P': groups['participants']}) %}{% endif %} @@ -108,7 +108,7 @@ {% block contentwrapper %}
    - {%- if project.current_roles.admin or 'checkin-event' in g.permissions %} + {%- if project.current_roles.admin or current_auth.permissions.checkin_event %} {{ admin_panel(project) }} {% endif %}
    diff --git a/funnel/views/event.py b/funnel/views/event.py index 1dd4b86af..d4e2ac98e 100644 --- a/funnel/views/event.py +++ b/funnel/views/event.py @@ -20,7 +20,7 @@ class ProjectEventView(ProjectViewMixin, UrlForView, ModelView): @route('') @render_with('event_list.html.jinja2') @lastuser.requires_login - @requires_permission('checkin-event') + @requires_permission('checkin_event') def events(self): return dict(project=self.obj, profile=self.obj.profile, events=self.obj.events) @@ -188,6 +188,6 @@ def event(profile, project, event): (Profile, {'name': 'profile'}, 'g.profile'), ((Project, ProjectRedirect), {'name': 'project', 'profile': 'profile'}, 'project'), (Event, {'name': 'name', 'project': 'project'}, 'event'), - permission='checkin-event') + permission='checkin_event') def scan_badge(profile, project, event): return render_template('scan_badge.html.jinja2', profile=profile, project=project, event=event) diff --git a/funnel/views/participant.py b/funnel/views/participant.py index df0bcdfee..c52c0854e 100644 --- a/funnel/views/participant.py +++ b/funnel/views/participant.py @@ -179,7 +179,7 @@ def participant_badge(profile, project, participant): (Profile, {'name': 'profile'}, 'g.profile'), ((Project, ProjectRedirect), {'name': 'project', 'profile': 'profile'}, 'project'), (Event, {'name': 'name', 'project': 'project'}, 'event'), - permission='checkin-event') + permission='checkin_event') def event_checkin(profile, project, event): form = forms.Form() if form.validate_on_submit(): @@ -202,7 +202,7 @@ def event_checkin(profile, project, event): ((Project, ProjectRedirect), {'name': 'project', 'profile': 'profile'}, 'project'), (Event, {'name': 'name', 'project': 'project'}, 'event'), (Participant, {'puk': 'puk'}, 'participant'), - permission='checkin-event') + permission='checkin_event') def checkin_puk(profile, project, event, participant): checked_in = getbool(request.form.get('checkin')) attendee = Attendee.get(event, participant.id) @@ -220,7 +220,7 @@ def checkin_puk(profile, project, event, participant): (Profile, {'name': 'profile'}, 'g.profile'), ((Project, ProjectRedirect), {'name': 'project', 'profile': 'profile'}, 'project'), (Event, {'name': 'name', 'project': 'project'}, 'event'), - permission='checkin-event') + permission='checkin_event') def event_participants_json(profile, project, event): checkin_count = 0 participants = [] diff --git a/funnel/views/project.py b/funnel/views/project.py index ea55a4351..189044224 100644 --- a/funnel/views/project.py +++ b/funnel/views/project.py @@ -130,7 +130,7 @@ def csv(self): @route('edit', methods=['GET', 'POST']) @lastuser.requires_login - @requires_permission('edit-project') + @requires_permission('edit_project') def edit(self): if self.obj.parent_project: form = SubprojectForm(obj=self.obj, model=Project) @@ -149,7 +149,7 @@ def edit(self): @route('transition', methods=['POST']) @lastuser.requires_login - @requires_permission('edit-project') + @requires_permission('edit_project') def transition(self): transition_form = ProjectTransitionForm(obj=self.obj) if transition_form.validate_on_submit(): # check if the provided transition is valid @@ -183,7 +183,7 @@ def rsvp(self): @route('rsvp_list') @render_with('project_rsvp_list.html.jinja2') @lastuser.requires_login - @requires_permission('edit-project') + @requires_permission('edit_project') def rsvp_list(self): return dict(project=self.obj, statuses=RSVP_STATUS)