Skip to content

Commit 0a38855

Browse files
committed
chore: commit forgotten changes and fix the integration tests.
Correction for 14eb4c7 commit. Address to #1326
1 parent dc1ba11 commit 0a38855

File tree

2 files changed

+12
-1
lines changed

2 files changed

+12
-1
lines changed

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -584,18 +584,28 @@ <h5 th:text="#{t_who_selling_series}">Who was selling/buying this series</h5>
584584
th:remove="${transaction.transactionUrl == null} ? tag"
585585
th:href="${transaction.transactionUrl}"
586586
th:text="${firstPrice + optionalSecondPrice}">100 USD</a>
587+
<!--/*/
588+
<th:block th:if="${transaction.condition != null}" th:switch="${transaction.condition}">
589+
<span th:text="|(${#strings.unCapitalize('__#{t_cancelled}__')})|" th:case=" 'CANCELLED' ">cancelled</span>
590+
/*/-->
591+
<span th:text="|(${transaction.condition})|" th:case="*">(MNH)</span>
592+
<!--/*/
593+
</th:block>
594+
/*/-->
587595
</li>
588596
<li id="series-sale-2-info">
589597
<a href="http://example.com/james-alan-hetfield" id="series-sale-2-seller" rel="nofollow">James Alan Hetfield</a> was selling for <a href="http://example.com/james-alan-hetfield/selling-stamps" id="series-sale-2-transaction" rel="nofollow">100 USD (650 RUB)</a>
590598
</li>
591599
<li id="series-sale-3-info">
592600
02.02.2002 <a href="http://example.com/tommy-lee-jones" id="series-sale-3-seller" rel="nofollow">Tommy Lee Jones</a> was selling for <a href="http://example.com/tommy-lee-jones/selling-stamps" id="series-sale-3-transaction" rel="nofollow">200 USD</a>
601+
(cancelled)
593602
</li>
594603
<li id="series-sale-4-info">
595604
02.02.2002 <a href="http://example.com/tommy-lee-jones" id="series-sale-4-seller" rel="nofollow">Tommy Lee Jones</a> was selling for <a href="http://example.com/tommy-lee-jones/selling-stamps" id="series-sale-4-transaction" rel="nofollow">200 USD (1300 RUB)</a>
596605
</li>
597606
<li id="series-sale-5-info">
598607
03.03.2003 <a href="http://example.com/eicca-toppinen" id="series-sale-5-seller" rel="nofollow">Eicca Toppinen</a> sold to <a href="http://example.com/kurt-cobain" rel="nofollow">Kurt Cobain</a> for <a href="http://example.com/eicca-toppinen/selling-stamps" id="series-sale-5-transaction" rel="nofollow">300 USD</a>
608+
(MVLH)
599609
</li>
600610
<li id="series-sale-6-info">
601611
03.03.2003 <a href="http://example.com/eicca-toppinen" id="series-sale-6-seller" rel="nofollow">Eicca Toppinen</a> sold to Michael Jackson for <a href="http://example.com/eicca-toppinen/selling-stamps" id="series-sale-6-transaction" rel="nofollow">300 USD (1560 RUB)</a>

src/test/java/ru/mystamps/web/service/TestObjects.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,8 @@ public static PurchaseAndSaleDto createPurchaseAndSaleDto() {
218218
Random.price(),
219219
Random.currency(),
220220
Random.price(),
221-
Random.currency()
221+
Random.currency(),
222+
nullOr(Random.seriesCondition())
222223
);
223224
}
224225

0 commit comments

Comments
 (0)