Ignore:
Timestamp:
02/08/23 12:10:52 (22 months ago)
Author:
milamihajlovska <mila.mihajlovska01@…>
Branches:
master
Children:
86e187f
Parents:
c05cd97 (diff), eb36f39 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of https://github.com/DenicaKj/MovieZone

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/main/java/com/example/moviezone/web/HomeController.java

    rc05cd97 r2a98e34  
    1717
    1818import javax.servlet.http.HttpSession;
     19import javax.transaction.Transactional;
    1920import java.time.LocalDate;
    2021import java.util.LinkedList;
     
    144145//    }
    145146
     147    @GetMapping("/films")
     148    @Transactional
     149    public String getFilmsPage(Model model){
     150        model.addAttribute("cinemas",cinemaService.findAllCinemas());
     151            List<FilmsReturnTable> pom=new LinkedList<>();
     152            model.addAttribute("films",pom);
     153            boolean h=pom.isEmpty();
     154            List<FilmsReturnTable> help=filmService.getFilmsFromCinema(2);
     155        model.addAttribute("bodyContent","films");
     156        return "master-template";
     157    }
     158
     159
    146160//    @GetMapping("/films")
    147161//    public String getFilmsPage1(Model model,@RequestParam(required = false) Integer id_cinema){
Note: See TracChangeset for help on using the changeset viewer.