Merge branch 'master' of https://github.com/brkcvn/akaunting into new-plans
This commit is contained in:
commit
5a6820fc9f
@ -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);
|
||||||
|
21
app/View/Components/Show/Right.php
Normal file
21
app/View/Components/Show/Right.php
Normal 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');
|
||||||
|
}
|
||||||
|
}
|
8
public/akaunting-js/generalAction.js
vendored
8
public/akaunting-js/generalAction.js
vendored
@ -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
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
@ -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>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user