Bladeren bron

Merge branch 'master' of https://git.coding.net/aft/AFT

wubb 8 jaren geleden
bovenliggende
commit
411f4cc73f

+ 5 - 5
src/main/java/com/goafanti/portal/controller/PortalBigShotController.java

@@ -70,9 +70,9 @@ public class PortalBigShotController extends BaseController {
 		List<BigShotLectureListBo> lectureList = lectureService
 				.listBigShotLecture(AFTConstants.BIG_SHOT_LECTURE_CACHE_KEY);
 		mv.addObject("lectureList", lectureList);
-		handleBanners(mv, BannersType.DA_KA_SHUO_1);
-		handleBanners(mv, BannersType.DA_KA_SHUO_2);
-		handleBanners(mv, BannersType.DA_KA_SHUO_3);
+		handleBanners(mv, BannersType.DA_KA_SHUO_1, "banners");
+		handleBanners(mv, BannersType.DA_KA_SHUO_2, "starBanners");
+		handleBanners(mv, BannersType.DA_KA_SHUO_3, "actBanners");
 		mv.setViewName("/portal/scienceTechnology/bigShot");
 		return mv;
 	}
@@ -90,10 +90,10 @@ public class PortalBigShotController extends BaseController {
 		return res;
 	}
 
-	private void handleBanners(ModelAndView modelview, BannersType bannersType) {
+	private void handleBanners(ModelAndView modelview, BannersType bannersType, String name) {
 		List<Banners> banners = bannersService.findPortalBanners(bannersType.getKey());
 		if (!banners.isEmpty()) {
-			modelview.addObject("banners", banners);
+			modelview.addObject(name, banners);
 		}
 	}
 

+ 1 - 0
src/main/resources/shiro_base_auth.ini

@@ -9,6 +9,7 @@
 /user/signIn.html=anon
 /admin/login=anon
 /admin/login.html=anon
+/admin/set.html=admin
 /admin/index.html=admin
 /signin=anon
 /managesignin=anon

+ 1 - 1
src/main/webapp/WEB-INF/views/common.html

@@ -244,7 +244,7 @@
 			window.showRoleList = /*[[${shiro.hasRole('999999') || shiro.isPermitted('api/admin/roleList')}]]*/false;
 			window.showAuditStatus = /*[[${shiro.hasRole('999999') || shiro.isPermitted('api/admin/auditStatus')}]]*/false;
 
-			window.showSystem = /*[[${shiro.hasRole('999999')}]]*/false;
+			window.showSystem = /*[[${shiro.hasRole('999999') || shiro.isPermitted('admin/system')}]]*/false;
 	/*]]>*/
 		</script>
 		<script th:inline="javascript" th:if="${userData!=null}">

+ 2 - 1
src/main/webapp/WEB-INF/views/portal/scienceTechnology/bigShot.html

@@ -32,7 +32,8 @@
 		</div>
 		<div class="secondary_navigation"></div>
 	</div>
-	<div class="banner-item active">
+	<div th:replace="common::banners"></div>
+	<div class="banner-item" th:if="${banners==null}">
 		<img th:src="${portalHost + '/img/bigshot_banner.jpg'}" alt="First slide">
 	</div>
 	<div class="container star">

File diff suppressed because it is too large
+ 1 - 0
src/main/webapp/WEB-INF/views/portal/scienceTechnology/lecture.html


+ 2 - 1
src/main/webapp/WEB-INF/views/portal/scienceTechnology/star.html

@@ -36,7 +36,8 @@
 		</div>
 		<div class="secondary_navigation"></div>
 	</div>
-	<div class="banner-item active">
+	<div th:replace="common::banners"></div>
+	<div class="banner-item" th:if="${banners==null}">
 		<img th:src="${portalHost + '/img/star_banner.jpg'}" alt="First slide">
 	</div>