anonfunc/JellyPy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

A new first run setup wizard (WIP)

Browse Source 
Move all user related links to use user_id instead of username.
Remove excess debug loggin.
Catch more exceptions on PW importer.
This commit is contained in:
Tim
2015-07-17 00:31:46 +02:00
parent 96f48291e5
commit 4f00ecc070
20 changed files with 7975 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
data/interfaces/default/js/bootstrap-wizard.min.js vendored Executable file
View File

File diff suppressed because one or more lines are too long

7
data/interfaces/default/js/bootstrap3/bootstrap.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

6
data/interfaces/default/js/tables/history_table.js
View File

@@ -56,7 +56,11 @@ history_table_options = {
"data":"friendly_name",
"createdCell": function (td, cellData, rowData, row, col) {
if (cellData !== '') {
$(td).html('<a href="user?user=' + rowData['user'] + '">' + cellData + '</a>');
if (rowData['user_id'] !== '') {
$(td).html('<a href="user?user_id=' + rowData['user_id'] + '">' + cellData + '</a>');
} else {
$(td).html('<a href="user?user=' + rowData['user'] + '">' + cellData + '</a>');
}
} else {
$(td).html(cellData);
}

6
data/interfaces/default/js/tables/users.js
View File

@@ -38,7 +38,11 @@ users_list_table_options = {
"data": "friendly_name",
"createdCell": function (td, cellData, rowData, row, col) {
if (cellData !== '') {
$(td).html('<a href="user?user=' + rowData['user'] + '">' + cellData + '</a>');
if (rowData['user_id'] > 0) {
$(td).html('<a href="user?user_id=' + rowData['user_id'] + '">' + cellData + '</a>');
} else {
$(td).html('<a href="user?user=' + rowData['user'] + '">' + cellData + '</a>');
}
} else {
$(td).html(cellData);
}