replaced hyphen with underscore in permmissions

hasgeek · Jan 16, 2019 · 7a93695 · 7a93695
1 parent dbd5d80
commit 7a93695
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 22 deletions.
diff --git 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
@@ -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
@@ -119,7 +119,7 @@
     <div class="grid">
       <div class="grid__col-sm-12">
         <p class="mui--text-headline">{% trans %}There are no projects at this time.{% endtrans %}
-          {% if 'new_project' in g.permissions %}<a href="{{g.profile.url_for('new-project')}}" title="Create one">{% trans %}Create one{% endtrans %}</a>.{% endif %}
+          {% if current_auth.permissions.new_project %}<a href="{{g.profile.url_for('new-project')}}" title="Create one">{% trans %}Create one{% endtrans %}</a>.{% endif %}
         </p>
       </div>
     </div>

diff --git a/funnel/templates/macros.html.jinja2 b/funnel/templates/macros.html.jinja2
@@ -114,7 +114,7 @@
   </nav>
 {% endmacro %}
 
-{% macro admin_panel(project, transition_form='') %}
+{% macro admin_panel(project, transition_form=none) %}
   <div class="sticky-admin-panel">
     <div class="card">
       <div class="card__header">
@@ -169,7 +169,7 @@
               <a href="{{ project.url_for('schedule_json') }}" class="mui-btn mui-btn--small mui-btn--raised mui-btn--dark" target="_blank"><i class="material-icons mui--text-subhead mui--align-top">save_alt</i> {% trans %}Schedule JSON{% endtrans %}</a>
             </p>
           </div>
-        {% elif 'checkin-event' in g.permissions %}
+        {% elif current_auth.permissions.checkin_event %}
           <div>
             <ol>
               <li>

diff --git a/funnel/templates/project.html.jinja2 b/funnel/templates/project.html.jinja2
@@ -42,7 +42,7 @@
 {% block contentwrapper %}
   <div class="grid details-section">
     <div class="grid__col-xs-12 grid__col-md-5 grid__col-lg-4">
-      {%- 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 %}
     </div>
@@ -164,7 +164,7 @@
             <a href="{{ url_for('login') }}" class='mui-btn mui-btn--raised mui-btn--primary'>{% trans %}Login to RSVP{% endtrans %}</a>
           </p>
         {%- endif %}
-        {% if project.current_roles.admin or 'view-rsvps' in g.permissions %}
+        {% if project.current_roles.admin or current_auth.permissions.view_rsvps %}
           <a href="{{ project.url_for('rsvp_list') }}">See RSVP list</a>
         {% endif %}
       {%- endif %}

diff --git a/funnel/templates/proposals.html.jinja2 b/funnel/templates/proposals.html.jinja2
@@ -24,7 +24,7 @@
                 {%- if proposal.user != proposal.speaker %}
                   <small class="mui--text-caption mui--text-accent">via {{ proposal.user.pickername }}</small>
                 {%- endif %}
-                {%- if g.user and 'edit-project' in g.permissions %}
+                {%- if g.user and current_auth.permissions.edit_project %}
                   {%- if proposal.has_outstation_speaker %}
                     <i class="material-icons mui--text-subhead mui--align-middle" aria-label="Outstation Speaker">flight</i>
                   {%- endif %}
@@ -41,7 +41,7 @@
               {% endif %}
               <li>{{ proposal.technical_level }}</li>
               <li>{{ 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 %}
   <div class="grid details-section">
     <div class="grid__col-xs-12 grid__col-md-5 grid__col-lg-4">
-      {%- 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 %}
     </div>

diff --git 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
@@ -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
@@ -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)