mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2024-09-20 08:21:34 +02:00
Working on time tracker
This commit is contained in:
parent
580ef69e2e
commit
c03d5a95c6
@ -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;
|
||||||
|
@ -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;
|
||||||
}
|
}
|
||||||
|
@ -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
|
||||||
|
Loading…
Reference in New Issue
Block a user