Merge branch 'master' of https://github.com/brkcvn/akaunting into new-plans

This commit is contained in:
Burak Civan 2022-10-14 09:36:06 +03:00
commit 5a6820fc9f
4 changed files with 33 additions and 3 deletions

View File

@ -89,7 +89,7 @@ class UpdateUser extends Job implements ShouldUpdate
} }
// Can't unassigned company, The company must be assigned at least one user. // Can't unassigned company, The company must be assigned at least one user.
$companies = $this->request->get('companies'); $companies = (array) $this->request->get('companies', []);
$user_companies = $this->model->companies()->pluck('id')->toArray(); $user_companies = $this->model->companies()->pluck('id')->toArray();
$company_diff = array_diff($user_companies, $companies); $company_diff = array_diff($user_companies, $companies);

View File

@ -0,0 +1,21 @@
<?php
namespace App\View\Components\Show;
use App\Abstracts\View\Component;
class Right extends Component
{
public $disableLoading = false;
/**
* Get the view / contents that represent the component.
*
* @return \Illuminate\Contracts\View\View|string
*/
public function render()
{
return view('components.show.content.right');
}
}

View File

@ -30,6 +30,14 @@ document.querySelectorAll("[data-table-body]").forEach((table) => {
td_item.addEventListener("click", () => { td_item.addEventListener("click", () => {
window.location.href = row_href; window.location.href = row_href;
}); });
// added target blank for click mouse middle button
td_item.addEventListener('mousedown', (event) => {
if (event.button == 1 || event.buttons == 4) {
window.open(row_href, "_blank");
}
});
// added target blank for click mouse middle button
} }
} }
}); });

View File

@ -1,5 +1,6 @@
<div class="relative lg:w-8/12 ltr:lg:pl-8 rtl:lg:pr-8"> <div class="relative lg:w-8/12 ltr:lg:pl-8 rtl:lg:pr-8">
<x-loading.absolute /> @if (! isset($attributes['disable-loading']))
<x-loading.absolute />
@endif
{!! $slot !!} {!! $slot !!}
</div> </div>