replace togglz by authority

Author: php-coder

src/main/java/ru/mystamps/web/support/spring/security/Authority.java

@@ -30,6 +30,7 @@ public final class Authority {
 	public static final GrantedAuthority CREATE_CATEGORY        = new SimpleGrantedAuthority(StringAuthority.CREATE_CATEGORY);
 	public static final GrantedAuthority CREATE_COUNTRY         = new SimpleGrantedAuthority(StringAuthority.CREATE_COUNTRY);
 	public static final GrantedAuthority CREATE_SERIES          = new SimpleGrantedAuthority(StringAuthority.CREATE_SERIES);
+	public static final GrantedAuthority DOWNLOAD_IMAGE         = new SimpleGrantedAuthority(StringAuthority.DOWNLOAD_IMAGE);
 	public static final GrantedAuthority UPDATE_COLLECTION      = new SimpleGrantedAuthority(StringAuthority.UPDATE_COLLECTION);
 	public static final GrantedAuthority VIEW_SITE_EVENTS       = new SimpleGrantedAuthority(StringAuthority.VIEW_SITE_EVENTS);
 	public static final GrantedAuthority VIEW_SERIES_SALES      = new SimpleGrantedAuthority(StringAuthority.VIEW_SERIES_SALES);

src/main/java/ru/mystamps/web/support/spring/security/CustomUserDetailsService.java

@@ -79,6 +79,7 @@ private static Collection<? extends GrantedAuthority> getAuthorities(UserDetails
 			authorities.add(Authority.VIEW_SITE_EVENTS);
 			authorities.add(Authority.ADD_PARTICIPANT);
 			authorities.add(Authority.ADD_SERIES_SALES);
+			authorities.add(Authority.DOWNLOAD_IMAGE);
 			authorities.add(Authority.VIEW_SERIES_SALES);
 			authorities.add(Authority.MANAGE_TOGGLZ);
 		}

src/main/java/ru/mystamps/web/support/spring/security/StringAuthority.java

@@ -26,6 +26,7 @@ public final class StringAuthority {
 	public static final String CREATE_CATEGORY        = "CREATE_CATEGORY";
 	public static final String CREATE_COUNTRY         = "CREATE_COUNTRY";
 	public static final String CREATE_SERIES          = "CREATE_SERIES";
+	public static final String DOWNLOAD_IMAGE         = "DOWNLOAD_IMAGE";
 	public static final String UPDATE_COLLECTION      = "UPDATE_COLLECTION";
 	public static final String VIEW_SITE_EVENTS       = "VIEW_SITE_EVENTS";
 	public static final String VIEW_SERIES_SALES      = "VIEW_SERIES_SALES";

src/main/java/ru/mystamps/web/support/togglz/Features.java

@@ -82,11 +82,7 @@ public enum Features implements Feature {
 
 	@Label("/series/add: show link with auto-suggestions")
 	@EnabledByDefault
-	SHOW_SUGGESTION_LINK,
-	
-	@Label("/series/add: possibility to download image from external server")
-	@EnabledByDefault
-	DOWNLOAD_IMAGE;
+	SHOW_SUGGESTION_LINK;
 
 	public boolean isActive() {
 		return FeatureContext.getFeatureManager().isActive(this);

src/main/webapp/WEB-INF/views/series/add.html

@@ -263,14 +263,16 @@ <h3 th:text="${#strings.capitalize(add_series)}">
 									Image
 								</span>
 								<!--/*/
-								<span id="image.required" class="required_field" togglz:inactive="DOWNLOAD_IMAGE">*</span>
+								<span id="image.required" class="required_field" th:if="${not #authorization.expression('hasAuthority(''DOWNLOAD_IMAGE'')')}">*</span>
 								/*/-->
 							</label>
 							<div class="col-sm-7">
-								<input type="file" id="image" style="box-shadow: none; border: 0px;" accept="image/png,image/jpeg" th:field="*{image}" togglz:active="DOWNLOAD_IMAGE"/>
-								<!--/*/
-								<input type="file" id="image" style="box-shadow: none; border: 0px;" required="required" accept="image/png,image/jpeg" th:field="*{image}" togglz:inactive="DOWNLOAD_IMAGE"/>
-								/*/-->
+								<input id="image"
+									type="file"
+									style="box-shadow: none; border: 0px;"
+									accept="image/png,image/jpeg"
+									th:field="*{image}"
+									th:attr="required=${not #authorization.expression('hasAuthority(''DOWNLOAD_IMAGE'')') ? 'required' : null}" />
 								<small togglz:active="ADD_ADDITIONAL_IMAGES_TO_SERIES" sec:authorize="hasAuthority('ADD_IMAGES_TO_SERIES')">
 									<span class="hint-block" th:text="#{t_add_more_images_hint}">
 										Later you will be able to add additional images
@@ -282,7 +284,9 @@ <h3 th:text="${#strings.capitalize(add_series)}">
 							</div>
 						</div>
 
-						<div class="form-group form-group-sm" th:classappend="${#fields.hasErrors('imageUrl') or #fields.hasErrors('downloadedImage') ? 'has-error' : ''}" togglz:active="DOWNLOAD_IMAGE">
+						<div class="form-group form-group-sm"
+							th:classappend="${#fields.hasErrors('imageUrl') or #fields.hasErrors('downloadedImage') ? 'has-error' : ''}"
+							sec:authorize="hasAuthority('DOWNLOAD_IMAGE')">
 							<label for="image-url" class="control-label col-sm-3">
 								<span class="field-label" th:text="#{t_image_url}">
 									Image URL