Limit ability for specifying series price only to paid users.

Follow-up to #663

Author: php-coder

NEWS.txt

@@ -21,7 +21,7 @@
 - (functionality)  add support for specifying Solovyov catalog numbers
 - (functionality)  add support for specifying Zagorski catalog numbers
 - (functionality)  user may specify how many stamps from a series in his/her collection
-- (functionality)  user may specify a price that he/she paid for a series
+- (functionality)  paid users may specify a price that he/she paid for a series
 
 0.3
 - (functionality)  implemented possibility to user to add series to his collection

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

@@ -26,6 +26,7 @@ public final class Authority {
 	public static final GrantedAuthority ADD_COMMENTS_TO_SERIES = new SimpleGrantedAuthority(StringAuthority.ADD_COMMENTS_TO_SERIES);
 	public static final GrantedAuthority ADD_IMAGES_TO_SERIES   = new SimpleGrantedAuthority(StringAuthority.ADD_IMAGES_TO_SERIES);
 	public static final GrantedAuthority ADD_PARTICIPANT        = new SimpleGrantedAuthority(StringAuthority.ADD_PARTICIPANT);
+	public static final GrantedAuthority ADD_SERIES_PRICE       = new SimpleGrantedAuthority(StringAuthority.ADD_SERIES_PRICE);
 	public static final GrantedAuthority ADD_SERIES_SALES       = new SimpleGrantedAuthority(StringAuthority.ADD_SERIES_SALES);
 	public static final GrantedAuthority CREATE_CATEGORY        = new SimpleGrantedAuthority(StringAuthority.CREATE_CATEGORY);
 	public static final GrantedAuthority CREATE_COUNTRY         = new SimpleGrantedAuthority(StringAuthority.CREATE_COUNTRY);

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

@@ -79,13 +79,17 @@ private static Collection<? extends GrantedAuthority> getAuthorities(UserDetails
 			authorities.add(Authority.ADD_COMMENTS_TO_SERIES);
 			authorities.add(Authority.ADD_IMAGES_TO_SERIES);
 			authorities.add(Authority.ADD_PARTICIPANT);
+			authorities.add(Authority.ADD_SERIES_PRICE);
 			authorities.add(Authority.ADD_SERIES_SALES);
 			authorities.add(Authority.DOWNLOAD_IMAGE);
 			authorities.add(Authority.IMPORT_SERIES);
 			authorities.add(Authority.MANAGE_TOGGLZ);
 			authorities.add(Authority.VIEW_DAILY_STATS);
 			authorities.add(Authority.VIEW_SERIES_SALES);
 			authorities.add(Authority.VIEW_SITE_EVENTS);
+		
+		} else if (userDetails.isPaidUser()) {
+			authorities.add(Authority.ADD_SERIES_PRICE);
 		}
 
 		return authorities;

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

@@ -22,6 +22,7 @@ public final class StringAuthority {
 	public static final String ADD_COMMENTS_TO_SERIES = "ADD_COMMENTS_TO_SERIES";
 	public static final String ADD_IMAGES_TO_SERIES   = "ADD_IMAGES_TO_SERIES";
 	public static final String ADD_PARTICIPANT        = "ADD_PARTICIPANT";
+	public static final String ADD_SERIES_PRICE       = "ADD_SERIES_PRICE";
 	public static final String ADD_SERIES_SALES       = "ADD_SERIES_SALES";
 	public static final String CREATE_CATEGORY        = "CREATE_CATEGORY";
 	public static final String CREATE_COUNTRY         = "CREATE_COUNTRY";

src/main/resources/ru/mystamps/i18n/Messages.properties

@@ -136,6 +136,7 @@ t_yes = Yes
 t_no = No
 t_series_not_in_collection = Series isn't part of your collection
 t_i_have = I have
+t_only_for_paid_users = Only for paid users
 t_i_bought_for = I bought for
 t_out_of_n_stamps = out of {0} stamps
 t_series_in_collection = Series is part of your collection

src/main/resources/ru/mystamps/i18n/Messages_ru.properties

@@ -135,6 +135,7 @@ t_yes = Да
 t_no = Нет
 t_series_not_in_collection = Этой серии нет в вашей коллекции
 t_i_have = У меня есть
+t_only_for_paid_users = Только для платных пользователей
 t_i_bought_for = Я купил за
 t_out_of_n_stamps = из {0} марок
 t_series_in_collection = Эта серия есть в вашей коллекции

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

@@ -369,16 +369,21 @@
 												th:text="${error}"></span>
 										</p>
 										/*/-->
-										<p th:with="price_msg=#{t_price}">
+										<p th:with="price_msg=#{t_price},paidUser=${#authorization.expression('hasAuthority(''ADD_SERIES_PRICE'')')}"
+											th:attrappend="title=${paidUser ? null : '__#{t_only_for_paid_users}__'}">
+											
 											<span th:text="#{t_i_bought_for}" th:remove="tag">I bought for</span>
 											<input id="paid-price"
 												type="text"
 												size="5"
 												placeholder="price"
 												th:placeholder="${#strings.unCapitalize(price_msg)}"
 												th:field="*{price}"
+												th:disabled="${paidUser ? null : 'disabled'}"
 												/>
-											<select id="paid-currency" th:field="*{currency}">
+											<select id="paid-currency"
+												th:field="*{currency}"
+												th:disabled="${paidUser ? null : 'disabled'}">
 												<option value=""></option>
 												<option value="USD">USD</option>
 												<option value="EUR">EUR</option>