Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-11-03 22:47:32 -05:00
Code Issues Packages Projects Releases Wiki Activity

Working on time tracker

Browse Source
This commit is contained in:
Hillel Coren 2017-09-25 14:06:21 +03:00
parent 580ef69e2e
commit c03d5a95c6
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
resources/views/partials/entity_combobox.blade.php
View File

@ -2,7 +2,6 @@ var {{ $entityType }}Name = '';
${{ $entityType }}Select.combobox({ ${{ $entityType }}Select.combobox({
highlighter: function (item) { highlighter: function (item) {
console.log(item);
if (item.indexOf("{{ trans("texts.create_{$entityType}") }}") == 0) { if (item.indexOf("{{ trans("texts.create_{$entityType}") }}") == 0) {
{{ $entityType }}Name = this.query; {{ $entityType }}Name = this.query;
return "{{ trans("texts.create_{$entityType}") }}: " + this.query; return "{{ trans("texts.create_{$entityType}") }}: " + this.query;

1
resources/views/tasks/time_tracker.blade.php
View File

@ -276,7 +276,6 @@
if (clientId && ! forceClear) { if (clientId && ! forceClear) {
var list = projectsForClientMap.hasOwnProperty(clientId) ? projectsForClientMap[clientId] : []; var list = projectsForClientMap.hasOwnProperty(clientId) ? projectsForClientMap[clientId] : [];
console.log('client list: ' + clientId);
} else { } else {
var list = projects; var list = projects;
} }

10
resources/views/tasks/time_tracker_knockout.blade.php
View File

@ -84,7 +84,7 @@
sweetConfirm(function() { sweetConfirm(function() {
var task = self.selectedTask(); var task = self.selectedTask();
if (task.isNew()) { if (task.isNew()) {
self.selectedTask(false); self.selectTask(false);
self.removeTask(task); self.removeTask(task);
$('.search').focus(); $('.search').focus();
} else { } else {
@ -97,11 +97,11 @@
} }
self.onFilterFocus = function(data) { self.onFilterFocus = function(data) {
self.selectedTask(false); self.selectTask(false);
} }
self.onFilterChanged = function(data) { self.onFilterChanged = function(data) {
self.selectedTask(false); self.selectTask(false);
self.selectedClient(false); self.selectedClient(false);
self.selectedProject(false); self.selectedProject(false);
} }
@ -302,7 +302,9 @@
if (task == self.selectedTask()) { if (task == self.selectedTask()) {
task = false; task = false;
$('.search').focus(); if (! $('#search').is(':focus')) {
$('#search').focus();
}
} }
// if a client is selected the project list will be filtered // if a client is selected the project list will be filtered