Fixed some display bugs and set passages only to convert to wylie when the passage is Tibetan
This commit is contained in:
parent
7af072de84
commit
136340ab79
2 changed files with 5 additions and 2 deletions
|
@ -72,6 +72,7 @@ public class RemoveCommand extends LexCommand implements Command
|
||||||
ThdlUser user = visit.getUser();
|
ThdlUser user = visit.getUser();
|
||||||
LexQuery query = visit.getQuery();
|
LexQuery query = visit.getQuery();
|
||||||
ITerm term = query.getEntry();
|
ITerm term = query.getEntry();
|
||||||
|
LexComponentRepository.update( term );
|
||||||
|
|
||||||
if ( CommandToken.isValid( req ) && validate( user, component ) )
|
if ( CommandToken.isValid( req ) && validate( user, component ) )
|
||||||
{
|
{
|
||||||
|
|
|
@ -33,7 +33,8 @@
|
||||||
'<c:out value="${ passage.pagination }" escapeXml="false" />' <br />
|
'<c:out value="${ passage.pagination }" escapeXml="false" />' <br />
|
||||||
</c:if>
|
</c:if>
|
||||||
|
|
||||||
<!--<span class="label">Passage:</span>-->
|
<!--If it's a Tibetan Passage, convert the wylie.-->
|
||||||
|
<c:if test="${ passage.meta.language == 2 }">
|
||||||
<c:set target="${ sessionScope.visit.helper}" property="wylie" value="${ passage.passage }"/>
|
<c:set target="${ sessionScope.visit.helper}" property="wylie" value="${ passage.passage }"/>
|
||||||
<c:catch var="exception">
|
<c:catch var="exception">
|
||||||
<c:set var="tib" value="${ sessionScope.visit.helper.tibetan } " />
|
<c:set var="tib" value="${ sessionScope.visit.helper.tibetan } " />
|
||||||
|
@ -41,6 +42,7 @@
|
||||||
<div class="tmw-block"><c:out value="${ tib }" escapeXml="false" /></div>
|
<div class="tmw-block"><c:out value="${ tib }" escapeXml="false" /></div>
|
||||||
</c:if>
|
</c:if>
|
||||||
</c:catch>
|
</c:catch>
|
||||||
|
</c:if>
|
||||||
|
|
||||||
<c:if test="${ ! empty exception }">
|
<c:if test="${ ! empty exception }">
|
||||||
<span class="error-info">Wylie conversion error (view source for details)</span>
|
<span class="error-info">Wylie conversion error (view source for details)</span>
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue