oglasIzmena

SkuciSe/src/main/resources/templates/oglas.html

@@ -205,7 +205,7 @@
                     <p class="text-wrap" th:text="${'Opis: ' + oglas.opis}" style="text-align: justify;"></p>
                 </div>
             </div>
-            <div class="row w-100 justify-content-end align-items-center mt-2 mb-3" th:if="${(oglas.korisnikId == loggedUser.getKorisnik().korisnikId) || (loggedUser.getKorisnik().tipId == 2)}">
+            <div class="row w-100 justify-content-end align-items-center mt-2 mb-3" th:if="${(loggedUser != null) && ((oglas.korisnikId == loggedUser.getKorisnik().korisnikId) || (loggedUser.getKorisnik().tipId == 2))}">
                 <form method="POST" class="w-100 justify-content-end align-items-center d-flex" th:action="@{/obrisi-oglas/{oglasId}(oglasId=${oglas.oglasId})}">
                     <button type="submit" class="btn btn-danger w-25">Obrisi oglas</button>
                 </form>
@@ -294,7 +294,7 @@
                  th:object="${korisnici}"
                  th:if="${(loggedUser!=null)&&(loggedUser.korisnik.korisnikId == oglas.korisnikId)}">
                 <h1 th:if="${korisnici.size() > 0}" class="mt-2 mb-5">Spisak zahteva za obilazak</h1>
-                <div class="card mb-3" th:each="korisnik: ${korisnici}" style="background: transparent" th:if="${!zahtevi[korisnikStat.index].vlasnikKom}">
+                <div class="card mb-3" th:each="korisnik: ${korisnici}" style="background: transparent" th:if="${(!zahtevi[korisnikStat.index].vlasnikKom) || (zahtevi[korisnikStat.index].status.toString() == 'ODBIJEN')}">
                     <div class="row flex-sm-wrap w-100">
                         <div class="col-lg-2 col-md-12 col-sm-12 col-xs-12 d-flex justify-content-around align-items-center">
                             <img
@@ -390,12 +390,6 @@
                                 <button type="submit" class="btn btn-danger">Odbij zahtev</button>
                             </form>
                         </div>
-                        <div class="col-lg-2 col-md-12 col-sm-12 col-xs-12 d-flex flex-column justify-content-around align-items-center"
-                             th:if="${zahtevi[korisnikStat.index].status.toString() == 'ODBIJEN'}">
-                            <form method="GET">
-                                <button type="submit" class="btn btn-danger">Obrisi zahtev</button>
-                            </form>
-                        </div>
                     </div>
                 </div>
             </div>