Merge branch '#82_-_make_create_context_menu_context_sensitive' into Release0.2
This commit is contained in:
commit
1e633e97c7
@ -156,7 +156,7 @@
|
|||||||
var args = [
|
var args = [
|
||||||
{
|
{
|
||||||
key: "groupId",
|
key: "groupId",
|
||||||
value: data
|
value: datacreateContextMenu
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
var url = self.helpers.createRequestUrl("users", args, false, false);
|
var url = self.helpers.createRequestUrl("users", args, false, false);
|
||||||
@ -396,17 +396,18 @@
|
|||||||
self.assignUpdateHandler();
|
self.assignUpdateHandler();
|
||||||
};
|
};
|
||||||
function createlog(data, event) {
|
function createlog(data, event) {
|
||||||
|
var logDateInitVal = moment(self.selectedTimeLogDate()).add((data.Day - 1), 'days').toISOString();
|
||||||
self.manualLog({
|
self.manualLog({
|
||||||
CalendarWeek:-1,
|
CalendarWeek:-1,
|
||||||
Direction:-1,
|
Direction:-1,
|
||||||
EventTime: new Date().toISOString(),
|
EventTime: logDateInitVal,
|
||||||
Id: -1,
|
Id: -1,
|
||||||
IdentifierId: -1,
|
IdentifierId: -1,
|
||||||
UserId: self.chosenTimeLogUserId,
|
UserId: self.chosenTimeLogUserId,
|
||||||
Year: 0
|
Year: 0
|
||||||
});
|
});
|
||||||
$('#manualLogDialog').modal("show");
|
$('#manualLogDialog').modal("show");
|
||||||
self.initialiseManualLogDateTimePicker(self.selectedTimeLogDate());
|
self.initialiseManualLogDateTimePicker(logDateInitVal);
|
||||||
self.assignUpdateHandler();
|
self.assignUpdateHandler();
|
||||||
};
|
};
|
||||||
function deleteLog(data) {
|
function deleteLog(data) {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user