Skip to content

Commit 2932f4f

Browse files
committed
Change url and small corrections
1 parent 84e2085 commit 2932f4f

4 files changed

Lines changed: 9 additions & 8 deletions

File tree

conf/messages/app.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
app.title=Calories management
2-
app.footer=Webinar <a href="http://javawebinar.ru/topjava/" target=_blank>Maven/ Spring/ Security/ JPA(Hibernate)/ Jackson/jQuery</a> application
2+
app.footer=Java Online Project <a href="https://github.com/JavaOPs/topjava" target=_blank>Maven/ Spring/ Security/ JPA(Hibernate)/ Jackson/jQuery</a>
33
users.title=User list
44
meals.title=Meals list
55
app.registered=You are registered. Please Sign in.

conf/messages/app_ru.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
app.title=Подсчет калорий
2-
app.footer=Приложение по вебинару <a href="http://javawebinar.ru/topjava/" target=_blank>Maven/ Spring/ Security/ JPA(Hibernate)/ Jackson/jQuery</a>
2+
app.footer=Онлайн Java проект <a href="https://github.com/JavaOPs/topjava" target=_blank>Maven/ Spring/ Security/ JPA(Hibernate)/ Jackson/jQuery</a>
33
users.title=Список Пользователей
44
meals.title=Список еды
55
app.registered=Вы загеристрированы. Введите ваш логин/пароль.

src/main/resources/db/populateDB.sql

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ VALUES ('Admin', 'admin@gmail.com', '$2a$10$WejOLxVuXRpOgr4IlzQJ.eT4UcukNqHlAiOV
1212
INSERT INTO user_roles (role, user_id) VALUES ('ROLE_USER', 100000);
1313
INSERT INTO user_roles (role, user_id) VALUES ('ROLE_ADMIN', 100001);
1414

15-
INSERT INTO meals (datetime, description, calories, user_id) VALUES ('2015-01-06 09:00:00', 'завтрак', 500, 100000);
16-
INSERT INTO meals (datetime, description, calories, user_id) VALUES ('2015-01-06 13:00:00', 'обед', 1000, 100000);
17-
INSERT INTO meals (datetime, description, calories, user_id) VALUES ('2015-01-07 00:00:00', 'ужин', 600, 100000);
18-
INSERT INTO meals (datetime, description, calories, user_id) VALUES ('2015-01-07 13:00:00', 'еще обед', 1300, 100000);
19-
INSERT INTO meals (datetime, description, calories, user_id) VALUES ('2015-01-06 14:00:00', 'еда админа', 2000, 100001);
15+
INSERT INTO meals (datetime, description, calories, user_id) VALUES ('2015-01-06 09:00:00', 'breakfast', 500, 100000);
16+
INSERT INTO meals (datetime, description, calories, user_id) VALUES ('2015-01-06 13:00:00', 'dinner', 1000, 100000);
17+
INSERT INTO meals (datetime, description, calories, user_id) VALUES ('2015-01-07 00:00:00', 'supper', 600, 100000);
18+
INSERT INTO meals (datetime, description, calories, user_id) VALUES ('2015-01-07 13:00:00', 'dinner', 1300, 100000);
19+
INSERT INTO meals (datetime, description, calories, user_id) VALUES ('2015-01-06 14:00:00', 'admin_meal', 2000, 100001);

src/main/webapp/resources/js/customDatatable.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
var form;
22

3-
function makeEditable(ajaxUrl) {
3+
function makeEditable() {
44
form = $('#detailsForm');
55

66
$('#add').click(function () {
@@ -33,6 +33,7 @@ function makeEditable(ajaxUrl) {
3333
$(document).ajaxSend(function(e, xhr, options) {
3434
xhr.setRequestHeader(header, token);
3535
});
36+
3637
init();
3738
}
3839

0 commit comments

Comments
 (0)