diff --git a/build.gradle b/build.gradle
index 703b519..4cd6c5e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -64,7 +64,6 @@ dependencies {
compile group: 'org.webjars', name: 'bootstrap-select', version: '1.13.8'
compile group: 'org.webjars', name: 'font-awesome', version: '4.7.0'
-
testCompile group: 'org.springframework.boot', name: 'spring-boot-starter-test'
}
diff --git a/src/main/java/ru/ulstu/extractor/model/Branch.java b/src/main/java/ru/ulstu/extractor/model/Branch.java
new file mode 100644
index 0000000..4f751d2
--- /dev/null
+++ b/src/main/java/ru/ulstu/extractor/model/Branch.java
@@ -0,0 +1,14 @@
+package ru.ulstu.extractor.model;
+
+public class Branch {
+ private String name;
+
+ public Branch(String name) {
+ this.name = name;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+}
diff --git a/src/main/java/ru/ulstu/extractor/mvc/GitExtractorController.java b/src/main/java/ru/ulstu/extractor/mvc/GitExtractorController.java
index 54b66d6..e7ac514 100644
--- a/src/main/java/ru/ulstu/extractor/mvc/GitExtractorController.java
+++ b/src/main/java/ru/ulstu/extractor/mvc/GitExtractorController.java
@@ -5,11 +5,16 @@ import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import ru.ulstu.extractor.model.Branch;
import ru.ulstu.extractor.mvc.model.FilterForm;
import ru.ulstu.extractor.mvc.model.RepoForm;
import ru.ulstu.extractor.service.FilteringService;
import ru.ulstu.extractor.service.GitRepositoryService;
+import java.util.List;
+
@Controller
public class GitExtractorController {
private final FilteringService filteringService;
@@ -33,29 +38,47 @@ public class GitExtractorController {
return "filtering";
}
- @PostMapping("/sendRepo")
+ /*@PostMapping("/sendRepo")
public String sendRepo(@ModelAttribute RepoForm repoForm, Model model) {
- if (repoForm.getRepo() == null || repoForm.getRepo().isEmpty()) {
- model.addAttribute("error", "'Git' не должно быть пустым");
+ model.addAttribute("filterForm", new FilterForm(repoForm.getRepo()));
+ if (repoForm.getBranch() == null) {
return "newRepo";
+ } else {
+ return "filtering";
}
- model.addAttribute("filterForm", new FilterForm(repoForm.getRepo()));
+ }*/
+
+ @PostMapping("/sendFilter")
+ public String sendFilter(@ModelAttribute FilterForm filterForm, Model model) {
+ if (filterForm.getFilter() == null || filterForm.getFilter().isEmpty()) {
+ model.addAttribute("error", "'Строка' не должно быть пустым");
+ return "filtering";
+ }
+// model.addAttribute("commits", filteringService.getCommits(filterForm.getFilter(), filterForm.getFilter()));
+ return "resultRepo";
+ }
+
+ @RequestMapping(value = "/newRepo", method = RequestMethod.POST, params = "send")
+ public String getBranch(@ModelAttribute RepoForm repoForm, Model model) {
try {
gitRepositoryService.cloneOrUpdateRepo(repoForm.getRepo());
+ // model.addAttribute("branches", gitRepositoryService.getBranches(repoForm.getRepo()));
+ List Фильтровать данные:
Author | -Date | -Commit | -
---|---|---|
Onions | -2.41 | -yes | -
diff --git a/src/main/resources/templates/newRepo.html b/src/main/resources/templates/newRepo.html index 2239fd0..39d5457 100644 --- a/src/main/resources/templates/newRepo.html +++ b/src/main/resources/templates/newRepo.html @@ -8,15 +8,29 @@