added configurable permission system (#424)

templates/admin/activity.html.twig

@@ -5,7 +5,13 @@
 
 {% block page_title %}{{ 'admin_activity.title'|trans }}{% endblock %}
 {% block page_subtitle %}{{ 'admin_activity.subtitle'|trans }} {{ 'subtitle.amount'|trans({'%count%': entries.count}) }}{% endblock %}
-{% block page_actions %}{{ widgets.page_actions({'filter': '#collapseActivityAdmin', 'visibility': '#modal_activity_admin', 'create': path('admin_activity_create')}) }}{% endblock %}
+{% block page_actions %}
+    {% set actions = {'filter': '#collapseActivityAdmin', 'visibility': '#modal_activity_admin'} %}
+    {% if is_granted('create_activity') %}
+        {% set actions = actions|merge({'create': path('admin_activity_create')}) %}
+    {% endif %}
+    {{ widgets.page_actions(actions) }}
+{% endblock %}
 
 {% block main_before %}
     {{ toolbar.toolbar(toolbarForm, 'collapseActivityAdmin', showFilter) }}

templates/admin/customer.html.twig

@@ -5,7 +5,13 @@
 
 {% block page_title %}{{ 'admin_customer.title'|trans }}{% endblock %}
 {% block page_subtitle %}{{ 'admin_customer.subtitle'|trans }} {{ 'subtitle.amount'|trans({'%count%': entries.count}) }}{% endblock %}
-{% block page_actions %}{{ widgets.page_actions({'filter': '#collapseCustomerAdmin', 'visibility': '#modal_customer_admin', 'create': path('admin_customer_create')}) }}{% endblock %}
+{% block page_actions %}
+    {% set actions = {'filter': '#collapseCustomerAdmin', 'visibility': '#modal_customer_admin'} %}
+    {% if is_granted('create_customer') %}
+        {% set actions = actions|merge({'create': path('admin_customer_create')}) %}
+    {% endif %}
+    {{ widgets.page_actions(actions) }}
+{% endblock %}
 
 {% block main_before %}
     {{ toolbar.toolbar(toolbarForm, 'collapseCustomerAdmin', showFilter) }}

templates/admin/project.html.twig

@@ -5,7 +5,13 @@
 
 {% block page_title %}{{ 'admin_project.title'|trans }}{% endblock %}
 {% block page_subtitle %}{{ 'admin_project.subtitle'|trans }} {{ 'subtitle.amount'|trans({'%count%': entries.count}) }}{% endblock %}
-{% block page_actions %}{{ widgets.page_actions({'filter': '#collapseProjectAdmin', 'visibility': '#modal_project_admin', 'create': path('admin_project_create')}) }}{% endblock %}
+{% block page_actions %}
+    {% set actions = {'filter': '#collapseProjectAdmin', 'visibility': '#modal_project_admin'} %}
+    {% if is_granted('create_project') %}
+        {% set actions = actions|merge({'create': path('admin_project_create')}) %}
+    {% endif %}
+    {{ widgets.page_actions(actions) }}
+{% endblock %}
 
 {% block main_before %}
     {{ toolbar.toolbar(toolbarForm, 'collapseProjectAdmin', showFilter) }}

templates/admin/timesheet.html.twig

@@ -5,7 +5,13 @@
 
 {% block page_title %}{{ 'admin_timesheet.title'|trans }}{% endblock %}
 {% block page_subtitle %}{{ 'admin_timesheet.subtitle'|trans }}{% endblock %}
-{% block page_actions %}{{ widgets.page_actions({'filter': '#collapseTimesheetAdmin', 'visibility': '#modal_timesheet_admin', 'create': path('admin_timesheet_create')}) }}{% endblock %}
+{% block page_actions %}
+    {% set actions = {'filter': '#collapseTimesheetAdmin', 'visibility': '#modal_timesheet_admin'} %}
+    {% if is_granted('create_other_timesheet') %}
+        {% set actions = actions|merge({'create': path('admin_timesheet_create')}) %}
+    {% endif %}
+    {{ widgets.page_actions(actions) }}
+{% endblock %}
 
 {% block main_before %}
     {{ toolbar.toolbar(toolbarForm, 'collapseTimesheetAdmin', showFilter) }}
@@ -50,15 +56,19 @@
                     <td class="{{ tables.data_table_column_class(tableName, columns, 'endtime') }}">{{ entry.end|date("H:i") }}</td>
                 {% endif %}
                 <td class="{{ tables.data_table_column_class(tableName, columns, 'duration') }}">{{ entry.duration|duration }}</td>
-                <td class="{{ tables.data_table_column_class(tableName, columns, 'rate') }}">{{ entry.rate|money(entry.project.customer.currency) }}</td>
             {% else %}
                 {% if not duration_only %}
                     <td class="{{ tables.data_table_column_class(tableName, columns, 'endtime') }}">&dash;</td>
                 {% endif %}
                 <td class="{{ tables.data_table_column_class(tableName, columns, 'duration') }}"><i>{{ entry|duration }}</i></td>
-                <td class="{{ tables.data_table_column_class(tableName, columns, 'rate') }}">&dash;</td>
             {% endif %}
-
+            <td class="{{ tables.data_table_column_class(tableName, columns, 'rate') }}">
+                {% if not entry.end or not is_granted('view_rate', entry) %}
+                    &dash;
+                {% else %}
+                    {{ entry.rate|money(entry.project.customer.currency) }}
+                {% endif %}
+            </td>
             <td class="{{ tables.data_table_column_class(tableName, columns, 'customer') }}">
                 <a href="{{ path('admin_customer_edit', {'id': entry.project.customer.id}) }}">{{ widgets.label_customer(entry.project.customer) }}</a>
             </td>

templates/admin/user.html.twig

@@ -5,7 +5,14 @@
 
 {% block page_title %}{{ 'admin_user.title'|trans }}{% endblock %}
 {% block page_subtitle %}{{ 'admin_user.subtitle'|trans }} {{ 'subtitle.amount'|trans({'%count%': entries.count}) }}{% endblock %}
-{% block page_actions %}{{ widgets.page_actions({'filter': '#collapseUserAdmin', 'visibility': '#modal_user_admin', 'create': path('admin_user_create')}) }}{% endblock %}
+{% block page_actions %}
+    {% set actions = {'filter': '#collapseUserAdmin', 'visibility': '#modal_user_admin'} %}
+    {% if is_granted('create_user') %}
+        {% set actions = actions|merge({'create': path('admin_user_create')}) %}
+    {% endif %}
+    {{ widgets.page_actions(actions) }}
+{% endblock %}
+
 
 {% block main_before %}
     {{ toolbar.toolbar(toolbarForm, 'collapseUserAdmin', showFilter) }}

templates/invoice/index.html.twig

@@ -4,7 +4,17 @@
 
 {% block page_title %}{{ 'invoice.title'|trans }}{% endblock %}
 {% block page_subtitle %}{{ 'invoice.subtitle'|trans }}{% endblock %}
-{% block page_actions %}{{ widgets.page_actions({'filter': '#collapseInvoice', 'create': path('admin_invoice_template_create'), 'list': path('admin_invoice_template')}) }}{% endblock %}
+{% block page_actions %}
+    {% set actions = {'filter': '#collapseInvoice'} %}
+    {% if is_granted('create_invoice_template') %}
+        {% set actions = actions|merge({'create': path('admin_invoice_template_create')}) %}
+    {% endif %}
+    {% if is_granted('view_invoice_template') %}
+        {% set actions = actions|merge({'list': path('admin_invoice_template')}) %}
+    {% endif %}
+    {{ widgets.page_actions(actions) }}
+{% endblock %}
+
 
 {% block page_content_class %}{{ parent() }} invoice{% endblock %}
 
@@ -21,23 +31,24 @@
     {% if model.entries is empty %}
         {{ widgets.callout('warning', 'invoice.select_filter') }}
     {% else %}
-
         {{ include('invoice/preview.html.twig') }}
 
-        <div class="row no-print">
-            <div class="col-xs-12">
-                <button type="button" id="print-invoice-button" class="btn btn-success pull-right">
-                    <i class="{{ 'print'|icon }}"></i> {{ 'button.print'|trans }}
-                </button>
+        {% if is_granted('create_invoice') %}
+            <div class="row no-print">
+                <div class="col-xs-12">
+                    <button type="button" id="print-invoice-button" class="btn btn-success pull-right">
+                        <i class="{{ 'print'|icon }}"></i> {{ 'button.print'|trans }}
+                    </button>
+                </div>
             </div>
-        </div>
-
+        {% endif %}
     {% endif %}
 
 {% endblock %}
 
 {% block javascripts %}
     {{ parent() }}
+    {% if is_granted('create_invoice') %}
     <script type="text/javascript">
         $(document).ready(function () {
             $( "#print-invoice-button" ).click(function() {
@@ -48,4 +59,5 @@
             });
         });
     </script>
+    {% endif %}
 {% endblock %}

templates/invoice/templates.html.twig

@@ -4,7 +4,16 @@
 
 {% block page_title %}{{ 'admin_invoice_template.title'|trans }}{% endblock %}
 {% block page_subtitle %}{{ 'admin_invoice_template.subtitle'|trans }}{% endblock %}
-{% block page_actions %}{{ widgets.page_actions({'create': path('admin_invoice_template_create'), 'invoice': path('invoice')}) }}{% endblock %}
+{% block page_actions %}
+    {% set actions = {} %}
+    {% if is_granted('create_invoice_template') %}
+        {% set actions = actions|merge({'create': path('admin_invoice_template_create')}) %}
+    {% endif %}
+    {% if is_granted('view_invoice') %}
+        {% set actions = actions|merge({'invoice': path('invoice')}) %}
+    {% endif %}
+    {{ widgets.page_actions(actions) }}
+{% endblock %}
 
 {% block main %}
     {% if entries.count == 0 %}
@@ -26,9 +35,16 @@
             <td class="hidden-xs hidden-sm">{{ entry.dueDays }}</td>
             <td class="hidden-xs hidden-sm">{{ entry.vat }}</td>
             <td>
-                {% set actionButtons = {'edit': path('admin_invoice_template_edit', {'id' : entry.id, 'page': page})} %}
-                {% set actionButtons = actionButtons|merge({'copy': path('admin_invoice_template_copy', {'id' : entry.id, 'page': page})}) %}
-                {% set actionButtons = actionButtons|merge({'trash': path('admin_invoice_template_delete', {'id' : entry.id, 'page': page})}) %}
+                {% set actionButtons = {} %}
+                {% if is_granted('edit', entry) %}
+                    {% set actionButtons = {'edit': path('admin_invoice_template_edit', {'id' : entry.id, 'page': page})} %}
+                {% endif %}
+                {% if is_granted('create_invoice_template') %}
+                    {% set actionButtons = actionButtons|merge({'copy': path('admin_invoice_template_copy', {'id' : entry.id, 'page': page})}) %}
+                {% endif %}
+                {% if is_granted('delete', entry) %}
+                    {% set actionButtons = actionButtons|merge({'trash': path('admin_invoice_template_delete', {'id' : entry.id, 'page': page})}) %}
+                {% endif %}
                 {{ widgets.button_group(actionButtons) }}
             </td>
         </tr>

templates/sidebar/settings.html.twig

@@ -1,10 +1,14 @@
 {% import "@AdminLTE/Macros/default.html.twig" as macro %}
 {% import "macros/widgets.html.twig" as widgets %}
 
+{% set linkUserProfile = path('user_profile', {'username' : user.username}) %}
+{% if not is_granted('view_own_profile') %}
+    {% set linkUserProfile = '#' %}
+{% endif %}
 
 <ul class="control-sidebar-menu">
     <li>
-        <a href="{{ path('user_profile', {'username' : user.username}) }}">
+        <a href="{{ linkUserProfile }}">
             <div class="pull-left image">
                 {{  macro.avatar(user.avatar, user.username, 'img-circle') }}
             </div>
@@ -17,6 +21,7 @@
 </ul>
 
 <ul class="control-sidebar-menu">
+    {% if is_granted('edit_own_profile') %}
     <li>
         <a href="{{ path('user_profile_edit', {'username' : user.username}) }}">
             <div class="pull-left image">
@@ -27,8 +32,10 @@
             </div>
         </a>
     </li>
+    {% endif %}
+    {% if is_granted('preferences_own_profile') %}
     <li>
-        <a href="{{ path('user_profile_preferences', {'username' : user.username}) }}">
+        <a href="{{ path('user_profile_preferences', {'username' : user.username})  }}">
             <div class="pull-left image">
                 <i class="{{ 'settings'|icon }} text-gray"></i>
             </div>
@@ -37,6 +44,7 @@
             </div>
         </a>
     </li>
+    {% endif %}
     <li>
         <a href="{{ path('help') }}">
             <div class="pull-left image">

templates/timesheet/index.html.twig

@@ -5,7 +5,18 @@
 
 {% block page_title %}{{ 'timesheet.title'|trans }}{% endblock %}
 {% block page_subtitle %}{{ 'timesheet.subtitle'|trans }}{% endblock %}
-{% block page_actions %}{{ widgets.page_actions({'filter': '#collapseTimesheet', 'download': 'onclick:return exportTimesheet()', 'visibility': '#modal_timesheet', 'calendar': path('calendar'), 'create': path('timesheet_create')}) }}{% endblock %}
+{% block page_actions %}
+    {% set actions = {'filter': '#collapseTimesheet'} %}
+    {% if is_granted('export_own_timesheet') %}
+        {% set actions = actions|merge({'download': 'onclick:return exportTimesheet()'}) %}
+    {% endif %}
+    {% set actions = actions|merge({'visibility': '#modal_timesheet'}) %}
+    {% set actions = actions|merge({'calendar': path('calendar')}) %}
+    {% if is_granted('create_own_timesheet') %}
+        {% set actions = actions|merge({'create': path('timesheet_create')}) %}
+    {% endif %}
+    {{ widgets.page_actions(actions) }}
+{% endblock %}
 
 {% block main_before %}
     {{ toolbar.toolbar(toolbarForm, 'collapseTimesheet', showFilter) }}
@@ -23,9 +34,13 @@
         {% set columns = columns|merge({'starttime': '', 'endtime': 'hidden-xs'}) %}
     {% endif %}
 
+    {% set columns = columns|merge({'duration': ''}) %}
+
+    {% if is_granted('view_rate_own_timesheet') %}
+        {% set columns = columns|merge({'rate': 'hidden-xs'}) %}
+    {% endif %}
+
     {% set columns = columns|merge({
-        'duration': '',
-        'rate': 'hidden-xs',
         'customer': 'hidden-xs hidden-sm',
         'project': 'hidden-xs hidden-sm',
         'activity': 'hidden-xs hidden-sm',
@@ -50,13 +65,17 @@
                     <td class="{{ tables.data_table_column_class(tableName, columns, 'endtime') }}">{{ entry.end|date("H:i") }}</td>
                 {% endif %}
                 <td class="{{ tables.data_table_column_class(tableName, columns, 'duration') }}">{{ entry.duration|duration }}</td>
-                <td class="{{ tables.data_table_column_class(tableName, columns, 'rate') }}">{{ entry.rate|money(entry.project.customer.currency) }}</td>
+                {% if is_granted('view_rate', entry) %}
+                    <td class="{{ tables.data_table_column_class(tableName, columns, 'rate') }}">{{ entry.rate|money(entry.project.customer.currency) }}</td>
+                {% endif %}
             {% else %}
                 {% if not duration_only %}
                     <td class="{{ tables.data_table_column_class(tableName, columns, 'endtime') }}">&dash;</td>
                 {% endif %}
                 <td class="{{ tables.data_table_column_class(tableName, columns, 'duration') }}"><i>{{ entry|duration }}</i></td>
-                <td class="{{ tables.data_table_column_class(tableName, columns, 'rate') }}">&dash;</td>
+                {% if is_granted('view_rate', entry) %}
+                    <td class="{{ tables.data_table_column_class(tableName, columns, 'rate') }}">&dash;</td>
+                {% endif %}
             {% endif %}
 
             <td class="{{ tables.data_table_column_class(tableName, columns, 'customer') }}">{{ widgets.label_customer(entry.project.customer) }}</td>
@@ -64,7 +83,10 @@
             <td class="{{ tables.data_table_column_class(tableName, columns, 'activity') }}">{{ widgets.label_activity(entry.activity) }}</td>
             <td class="{{ tables.data_table_column_class(tableName, columns, 'description') }} timesheet-description">{{ entry.description|desc2html }}</td>
             <td>
-                {% set actionButtons = {'edit': path('timesheet_edit', {'id' : entry.id, 'page': page})} %}
+                {% set actionButtons = {} %}
+                {% if is_granted('edit', entry) %}
+                    {% set actionButtons = actionButtons|merge({'edit': path('timesheet_edit', {'id' : entry.id, 'page': page})}) %}
+                {% endif %}
 
                 {% if entry.end %}
                     {% if is_granted('start', entry) %}
@@ -76,7 +98,9 @@
                     {% endif %}
                 {% endif %}
 
-                {% set actionButtons = actionButtons|merge({'trash': path('timesheet_delete', {'id' : entry.id, 'page': page})}) %}
+                {% if is_granted('delete', entry) %}
+                    {% set actionButtons = actionButtons|merge({'trash': path('timesheet_delete', {'id' : entry.id, 'page': page})}) %}
+                {% endif %}
                 {{ widgets.button_group(actionButtons) }}
             </td>
         </tr>