jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

beta 3 (#3780)

Browse Source 
* merge master - allow to upload twig invoice templates via UI
* support adding existing teams with same name
* permissions cannot be set right after role was created - fixes #3777
* allow to deactivate unique customer number validation - fixes #3762 
* invalid message when trying to edit locked or exported timesheets in calendar - fixes #3766
* updated icons and manifest - fixes #3761
This commit is contained in:
Kevin Papst
2023-01-21 14:49:55 +01:00
committed by GitHub
parent b62253e1f3
commit a230be77dd
79 changed files with 428 additions and 358 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
templates/calendar/user.html.twig
View File

@@ -69,6 +69,7 @@
{% set editRoute = 'timesheet_edit' %}
{% set canCreate = is_granted('create_own_timesheet') %}
{% set canEdit = is_granted('edit_own_timesheet') %}
{% set canEditExported = is_granted('edit_exported_timesheet') %}
{% set isForeignEdit = false %}
{% if user != app.user %}
{% set isForeignEdit = true %}
@@ -104,6 +105,7 @@
},
permissions: {
edit: {% if canEdit %}true{% else %}false{% endif %},
edit_exported: {% if canEditExported %}true{% else %}false{% endif %},
create: {% if canCreate %}true{% else %}false{% endif %},
edit_begin: {% if can_edit_begin %}true{% else %}false{% endif %},
edit_end: {% if can_edit_end %}true{% else %}false{% endif %},

8
templates/invoice/document_upload.html.twig
View File

@@ -8,13 +8,17 @@
{% block box_title %}
{{ 'upload'|trans }}
{% endblock %}
{% block box_body %}
{% block box_before %}
{{ form_start(form) }}
{% endblock %}
{% block box_after %}
{{ form_end(form) }}
{% endblock %}
{% block box_body %}
{{ form_row(form.document) }}
<p>
<a href="https://github.com/kimai/invoice-templates" target="_blank">{{ 'download_invoice_renderer'|trans({}, 'invoice-renderer') }}</a>
</p>
{{ form_end(form) }}
{% endblock %}
{% block box_footer %}
<button type="submit" class="btn btn-primary">{{ 'action.save'|trans }}</button>

6
templates/partials/head.html.twig
View File

@@ -1,10 +1,14 @@
<link rel="shortcut icon" type="image/x-icon" href="{{ asset('favicon.ico') }}">
<link rel="icon" type="image/x-icon" href="{{ asset('favicon.ico') }}">
<link rel="icon" type="image/png" href="{{ asset('favicon-16x16.png') }}" sizes="16x16">
<link rel="icon" type="image/png" href="{{ asset('favicon-32x32.png') }}" sizes="32x32">
<link rel="apple-touch-icon" href="{{ asset('apple-touch-icon.png') }}">
<link rel="apple-touch-icon-precomposed" href="{{ asset('apple-touch-icon-precomposed.png') }}">
<link rel="apple-touch-icon" sizes="152x152" href="{{ asset('apple-touch-icon.png') }}">
<link rel="apple-touch-icon" sizes="180x180" href="{{ asset('touch-icon-180x180.png') }}">
<link rel="manifest" href="{{ asset('manifest.json') }}">
<meta name="apple-mobile-web-app-title" content="{{ constant('App\\Constants::SOFTWARE') }}">
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="mobile-web-app-capable" content="yes">
<meta name="application-name" content="{{ constant('App\\Constants::SOFTWARE') }}">
<meta name="msapplication-config" content="{{ asset('browserconfig.xml') }}">
<meta name="theme-color" content="#1d273b">

2
templates/permission/permissions.html.twig
View File

@@ -120,7 +120,7 @@
});
}
KimaiReloadPageWidget.create('kimai.userRoleUpdate');
KimaiReloadPageWidget.create('kimai.userRoleUpdate', true);
});
function toggleLabel(element, showTrue) {