Merge branch 'dev' into beta

This commit is contained in:
shamoon 2023-11-15 00:43:11 -08:00
commit 72c6ac09ac
3 changed files with 13 additions and 2 deletions

View file

@ -1,4 +1,4 @@
<pngx-page-header title="Consumption Templates">
<pngx-page-header title="Consumption Templates" i18n-title>
<button type="button" class="btn btn-sm btn-outline-primary ms-4" (click)="editTemplate()" *pngxIfPermissions="{ action: PermissionAction.Add, type: PermissionType.ConsumptionTemplate }">
<svg class="sidebaricon me-1" fill="currentColor">
<use xlink:href="assets/bootstrap-icons.svg#plus-circle" />

View file

@ -1,4 +1,4 @@
<pngx-page-header title="Custom Fields">
<pngx-page-header title="Custom Fields" i18n-title>
<button type="button" class="btn btn-sm btn-outline-primary ms-4" (click)="editField()" *pngxIfPermissions="{ action: PermissionAction.Add, type: PermissionType.CustomField }">
<svg class="sidebaricon me-1" fill="currentColor">
<use xlink:href="assets/bootstrap-icons.svg#plus-circle" />