From 5939987068b5c138784d2568b58d6b28cfb9c304 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Thu, 2 Mar 2017 13:40:20 +0200
Subject: [PATCH] Working on inline project creation

---
 resources/views/list.blade.php       |  1 -
 resources/views/tasks/edit.blade.php | 11 +++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/resources/views/list.blade.php b/resources/views/list.blade.php
index 1d44a568e51e..158480f7084f 100644
--- a/resources/views/list.blade.php
+++ b/resources/views/list.blade.php
@@ -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))
diff --git a/resources/views/tasks/edit.blade.php b/resources/views/tasks/edit.blade.php
index 67dc549ed71d..fc71db8a4995 100644
--- a/resources/views/tasks/edit.blade.php
+++ b/resources/views/tasks/edit.blade.php
@@ -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];