diff --git a/.idea/artifacts/Gradle___ua_pp_fairwind_favorit_DocumentsDB___DocumentsDB_1_0_SNAPSHOT_war.xml b/.idea/artifacts/Gradle___ua_pp_fairwind_favorit_DocumentsDB___DocumentsDB_1_0_SNAPSHOT_war.xml
index 4fac5cc..0025fe9 100644
--- a/.idea/artifacts/Gradle___ua_pp_fairwind_favorit_DocumentsDB___DocumentsDB_1_0_SNAPSHOT_war.xml
+++ b/.idea/artifacts/Gradle___ua_pp_fairwind_favorit_DocumentsDB___DocumentsDB_1_0_SNAPSHOT_war.xml
@@ -71,6 +71,8 @@
+
+
diff --git a/.idea/artifacts/Gradle___ua_pp_fairwind_favorit_DocumentsDB___DocumentsDB_1_0_SNAPSHOT_war__exploded_.xml b/.idea/artifacts/Gradle___ua_pp_fairwind_favorit_DocumentsDB___DocumentsDB_1_0_SNAPSHOT_war__exploded_.xml
index 0b8672a..00bced0 100644
--- a/.idea/artifacts/Gradle___ua_pp_fairwind_favorit_DocumentsDB___DocumentsDB_1_0_SNAPSHOT_war__exploded_.xml
+++ b/.idea/artifacts/Gradle___ua_pp_fairwind_favorit_DocumentsDB___DocumentsDB_1_0_SNAPSHOT_war__exploded_.xml
@@ -71,6 +71,8 @@
+
+
diff --git a/.idea/libraries/Gradle__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Gradle__javax_servlet_javax_servlet_api_3_0_1.xml
new file mode 100644
index 0000000..c2b82bb
--- /dev/null
+++ b/.idea/libraries/Gradle__javax_servlet_javax_servlet_api_3_0_1.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__javax_servlet_jstl_1_2.xml b/.idea/libraries/Gradle__javax_servlet_jstl_1_2.xml
new file mode 100644
index 0000000..c3ead10
--- /dev/null
+++ b/.idea/libraries/Gradle__javax_servlet_jstl_1_2.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/DocumentsDB.iml b/DocumentsDB.iml
index ce6526d..3acd209 100644
--- a/DocumentsDB.iml
+++ b/DocumentsDB.iml
@@ -107,5 +107,7 @@
+
+
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 33ba421..cc3f305 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,6 +16,8 @@ repositories {
dependencies {
testCompile group: 'junit', name: 'junit', version: '4.11'
+ compile 'javax.servlet:javax.servlet-api'
+ compile 'javax.servlet:jstl'
//SPIRNG основная + дополнения для ВЕБ
compile 'org.springframework:spring-core'
compile 'org.springframework:spring-webmvc'
diff --git a/src/main/java/ua/pp/fairwind/favorid/internalDB/controllers/ContactTypeController.java b/src/main/java/ua/pp/fairwind/favorid/internalDB/controllers/ContactTypeController.java
index 1501206..8f3c5a3 100644
--- a/src/main/java/ua/pp/fairwind/favorid/internalDB/controllers/ContactTypeController.java
+++ b/src/main/java/ua/pp/fairwind/favorid/internalDB/controllers/ContactTypeController.java
@@ -1,7 +1,6 @@
package ua.pp.fairwind.favorid.internalDB.controllers;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpRequest;
import org.springframework.security.access.annotation.Secured;
import org.springframework.stereotype.Controller;
import org.springframework.transaction.annotation.Transactional;
@@ -13,6 +12,8 @@
import ua.pp.fairwind.favorid.internalDB.model.directories.ContactType;
import ua.pp.fairwind.favorid.internalDB.repository.ContactTypeRepository;
+import javax.servlet.http.HttpServletRequest;
+
/**
* Created by ������ on 07.10.2015.
@@ -32,7 +33,7 @@ public String list(Model model) {
@Transactional(readOnly = true)
@RequestMapping(value = "/listing", method = RequestMethod.POST)
@ResponseBody
- public JGridRowsResponse getTable(HttpRequest request){
+ public JGridRowsResponse getTable(HttpServletRequest request){
return new JGridRowsResponse(repositoryContactType.findAll());
}
diff --git a/src/main/webapp/jsp/contact_type_list.jsp b/src/main/webapp/jsp/contact_type_list.jsp
index cd00321..acf5cc9 100644
--- a/src/main/webapp/jsp/contact_type_list.jsp
+++ b/src/main/webapp/jsp/contact_type_list.jsp
@@ -19,7 +19,7 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+