bugfix

Author: phasenraum2010

src/main/java/org/woehlke/beachbox/repository/VinylRepository.java

@@ -4,14 +4,13 @@
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
 import org.woehlke.beachbox.entities.Vinyl;
 
 /**
  * Created by Fert on 27.03.2014.
  */
 public interface VinylRepository extends JpaRepository<Vinyl, Long> {
 
-    @Query("select v from Vinyl v where v.interpret like %?1 or v.song like %?1 or v.name like %?1")
+    @Query("select v from Vinyl v where v.interpret like %?1% or v.song like %?1% or v.name like %?1%")
     Page<Vinyl> findBySearchStrings( String searchInterpret, Pageable pageable);
 }

src/main/java/org/woehlke/beachbox/web/VinylController.java

@@ -39,12 +39,15 @@ public String getAll(@PageableDefaults(pageNumber = 0, value = 30) Pageable page
         SessionBean searchItem;
         if(model.containsAttribute("searchItem")) {
             searchItem = (SessionBean) model.asMap().get("searchItem");
-            searchItem.setPageSize(pageable.getPageSize());
+        } else {
+            searchItem = new SessionBean();
+        }
+        if(!searchItem.isEmpty()) {
             page = vinylService.search(searchItem.getSearchString(),pageable);
         } else {
             page = vinylService.findAll(pageable);
-            searchItem = new SessionBean();
         }
+        searchItem.setPageSize(pageable.getPageSize());
         int current = page.getNumber() + 1;
         int begin = Math.max(1, current - 5);
         int end = Math.min(begin + 10, page.getTotalPages());
@@ -98,6 +101,8 @@ public String search(@Valid SessionBean searchItem, BindingResult result,
     public String editGet(@PathVariable long id, Model model){
         Vinyl vinyl = vinylService.findById(id);
         model.addAttribute("vinyl",vinyl);
+        model.addAttribute("rubrik", Rubrik.values());
+        model.addAttribute("tontraeger", Tontraeger.values());
         return "edit";
     }