mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-07-09 03:14:30 -04:00
Working on inline project creation
This commit is contained in:
parent
85b99b71ec
commit
5939987068
@ -53,7 +53,6 @@
|
||||
{!! Button::normal(trans('texts.categories'))->asLinkTo(URL::to('/expense_categories'))->appendIcon(Icon::create('list')) !!}
|
||||
@elseif ($entityType == ENTITY_TASK)
|
||||
{!! Button::normal(trans('texts.projects'))->asLinkTo(URL::to('/projects'))->appendIcon(Icon::create('list')) !!}
|
||||
{!! Button::primary(trans('texts.new_project'))->asLinkTo(URL::to('/projects/create/' . (isset($clientId) ? $clientId : '')))->appendIcon(Icon::create('plus-sign')) !!}
|
||||
@endif
|
||||
|
||||
@if (Auth::user()->can('create', $entityType) && empty($vendorId))
|
||||
|
@ -546,15 +546,18 @@
|
||||
var clientId = $('input[name=client]').val();
|
||||
var projectId = $('input[name=project_id]').val();
|
||||
var project = projectMap[projectId];
|
||||
if (project && ((project.client && project.client.public_id == clientId) || !project.client)) {
|
||||
e.preventDefault();
|
||||
return;
|
||||
if (projectId == '-1') {
|
||||
e.preventDefault();return;
|
||||
} else if (project && ((project.client && project.client.public_id == clientId) || !project.client)) {
|
||||
e.preventDefault();return;
|
||||
}
|
||||
setComboboxValue($('.project-select'), '', '');
|
||||
$projectCombobox = $('select#project_id');
|
||||
$projectCombobox.find('option').remove().end().combobox('refresh');
|
||||
$projectCombobox.append(new Option('', ''));
|
||||
$projectCombobox.append(new Option("{{ trans('texts.create_project')}}: $name", '-1'));
|
||||
@if (Auth::user()->can('create', ENTITY_PROJECT))
|
||||
$projectCombobox.append(new Option("{{ trans('texts.create_project')}}: $name", '-1'));
|
||||
@endif
|
||||
var list = clientId ? (projectsForClientMap.hasOwnProperty(clientId) ? projectsForClientMap[clientId] : []).concat(projectsForAllClients) : projects;
|
||||
for (var i=0; i<list.length; i++) {
|
||||
var project = list[i];
|
||||
|
Loading…
x
Reference in New Issue
Block a user