Merge branch 'develop' of github.com:invoiceninja/invoiceninja into develop

This commit is contained in:
Hillel Coren 2018-02-19 16:37:48 +02:00
commit a9faea4054

View File

@ -90,12 +90,18 @@
['label' => trans('texts.new_recurring_expense'), 'url' => url('/recurring_expenses/create')], ['label' => trans('texts.new_recurring_expense'), 'url' => url('/recurring_expenses/create')],
] ]
)->split() !!} )->split() !!}
{!! DropdownButton::normal(trans('texts.categories')) @if (Auth::user()->can('create', ENTITY_EXPENSE_CATEGORY))
->withAttributes(['class'=>'categoriesDropdown']) {!! DropdownButton::normal(trans('texts.categories'))
->withContents([ ->withAttributes(['class'=>'categoriesDropdown'])
['label' => trans('texts.new_expense_category'), 'url' => url('/expense_categories/create')], ->withContents([
] ['label' => trans('texts.new_expense_category'), 'url' => url('/expense_categories/create')],
)->split() !!} ]
)->split() !!}
@else
{!! DropdownButton::normal(trans('texts.categories'))
->withAttributes(['class'=>'categoriesDropdown'])
->split() !!}
@endif
<script type="text/javascript"> <script type="text/javascript">
$(function() { $(function() {
$('.recurringDropdown:not(.dropdown-toggle)').click(function(event) { $('.recurringDropdown:not(.dropdown-toggle)').click(function(event) {