povezanalista oglasa sa neprimjerenim sadrzajem

SoftverInzenjeringETFSA · May 28, 2017 · 9ff3754 · 9ff3754
1 parent 861a7fd
commit 9ff3754
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 6 deletions.
diff --git a/Oglasi.Client/app/app.js b/Oglasi.Client/app/app.js
@@ -49,7 +49,7 @@ app.config(function ($routeProvider) {
   });
 
   $routeProvider.when("/advert/with_report", {
-      controller: "advertReportController",
+      controller: "advertReportAllController",
       templateUrl: "views/advert/advert_with_reports.html"
   });
 

diff --git a/Oglasi.Client/app/controllers/advert/advertReportAllController.js b/Oglasi.Client/app/controllers/advert/advertReportAllController.js
@@ -0,0 +1,17 @@
+(function () {
+    'use strict';
+    app.controller('advertReportAllController', ['$scope', 'advertService', 'userAccountService', function ($scope, advertService, userAccountService) {
+
+
+        $scope.adverts = [];
+
+        advertService.getAdvertsWithReport()
+              .then(function(response){
+                $scope.adverts = response.data;
+              });
+
+
+
+    }]);
+
+}());
diff --git a/Oglasi.Client/app/controllers/advert/advertReportController.js b/Oglasi.Client/app/controllers/advert/advertReportController.js
@@ -1,6 +1,6 @@
 (function () {
     'use strict';
-    app.controller('advertReportController', ['$scope', 'advertService', function ($scope, advertService) {
+    app.controller('advertReportController', ['$scope', 'advertService', 'userAccountService', function ($scope, advertService, userAccountService) {
 
             //            $scope.getTitleOwner = function() {
           //                advertService.getTitleOwner()

diff --git a/Oglasi.Client/app/controllers/userAccount/userDetailsController.js b/Oglasi.Client/app/controllers/userAccount/userDetailsController.js
@@ -7,6 +7,7 @@
             $location.path('/login');
         }
 
+
         $scope.getDetails = function() {
             userAccountService.details()
                             .then(function(response) {

diff --git a/Oglasi.Client/index.html b/Oglasi.Client/index.html
@@ -28,6 +28,7 @@
 
   <script src="/app/controllers/advert/advertSubscriptionController.js"></script>
   <script src="/app/controllers/advert/advertReportController.js"></script>
+  <script src="/app/controllers/advert/advertReportAllController.js"></script>
   <script src="/app/controllers/advert/advertReportDetailsController.js"></script>
   <script src="/app/controllers/advert/advertReportOneController.js"></script>
 

diff --git a/Oglasi.Client/views/userAccount/details.html b/Oglasi.Client/views/userAccount/details.html
@@ -83,6 +83,7 @@ <h4 class="list-group-item-heading"><b>{{advert.title}}</b></h4>
     <li><a href="/#!/advert/details/{{advert.id}}/update">Update</a></li>
     <li><a ng-click="deleteAdvert(advert.id)">Delete</a></li>
     <li><a href="/#!/advert/{{advert.id}}/subscriptions">Prijave</a></li>
+    <li><a href="/#!/advert/with_report">Oglasi sa neprimjerenim sadržajem</a></li>
   </ul>
 </div>
                 <!-- <button ng-click="location.href=/#!/advert/details/{{advert.advertID}}" > klikni me</button> -->

diff --git a/Oglasi.REST.API/src/main/java/si/tim1/oglasi/OglasiApplication.java b/Oglasi.REST.API/src/main/java/si/tim1/oglasi/OglasiApplication.java
@@ -18,7 +18,7 @@ public class OglasiApplication {
 	public static void main(String[] args) {
 		SpringApplication.run(OglasiApplication.class, args);
 	}
-/*
+
 	@Bean
 	public WebMvcConfigurer corsConfigurer() {
 		return new WebMvcConfigurerAdapter() {
@@ -29,5 +29,5 @@ public void addCorsMappings(CorsRegistry registry) {
 		};
 
 	}
-*/
+
 }
diff --git a/Oglasi.REST.API/src/main/java/si/tim1/oglasi/WebSecurityConfig.java b/Oglasi.REST.API/src/main/java/si/tim1/oglasi/WebSecurityConfig.java
@@ -16,7 +16,7 @@
 import si.tim1.oglasi.filters.JWTAuthenticationFilter;
 import si.tim1.oglasi.filters.JWTLoginFilter;
 import si.tim1.oglasi.services.CustomUserDetailsService;
-/*
+
 @Configuration
 @EnableWebSecurity
 @EnableGlobalMethodSecurity(prePostEnabled=true)
@@ -72,4 +72,3 @@ protected void configure(AuthenticationManagerBuilder auth) throws Exception {
     }
 
 }
-*/