Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Working on inline project creation

Browse Source
This commit is contained in:
Hillel Coren 2017-03-02 13:40:20 +02:00
parent 85b99b71ec
commit 5939987068
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
resources/views/list.blade.php
View File

@ -53,7 +53,6 @@
{!! Button::normal(trans('texts.categories'))->asLinkTo(URL::to('/expense_categories'))->appendIcon(Icon::create('list')) !!} {!! Button::normal(trans('texts.categories'))->asLinkTo(URL::to('/expense_categories'))->appendIcon(Icon::create('list')) !!}
@elseif ($entityType == ENTITY_TASK) @elseif ($entityType == ENTITY_TASK)
{!! Button::normal(trans('texts.projects'))->asLinkTo(URL::to('/projects'))->appendIcon(Icon::create('list')) !!} {!! 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 @endif
@if (Auth::user()->can('create', $entityType) && empty($vendorId)) @if (Auth::user()->can('create', $entityType) && empty($vendorId))

11
resources/views/tasks/edit.blade.php
View File

@ -546,15 +546,18 @@
var clientId = $('input[name=client]').val(); var clientId = $('input[name=client]').val();
var projectId = $('input[name=project_id]').val(); var projectId = $('input[name=project_id]').val();
var project = projectMap[projectId]; var project = projectMap[projectId];
if (project && ((project.client && project.client.public_id == clientId) || !project.client)) { if (projectId == '-1') {
e.preventDefault(); e.preventDefault();return;
return; } else if (project && ((project.client && project.client.public_id == clientId) || !project.client)) {
e.preventDefault();return;
} }
setComboboxValue($('.project-select'), '', ''); setComboboxValue($('.project-select'), '', '');
$projectCombobox = $('select#project_id'); $projectCombobox = $('select#project_id');
$projectCombobox.find('option').remove().end().combobox('refresh'); $projectCombobox.find('option').remove().end().combobox('refresh');
$projectCombobox.append(new Option('', '')); $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; var list = clientId ? (projectsForClientMap.hasOwnProperty(clientId) ? projectsForClientMap[clientId] : []).concat(projectsForAllClients) : projects;
for (var i=0; i<list.length; i++) { for (var i=0; i<list.length; i++) {
var project = list[i]; var project = list[i];