Commit @86e311c8bd0d9d0fa8ee9e599e7e541c406da207

doortts 2017-01-23

notification-list: Resolves an read more button issue

Resolves an read more button issue that don't disappear even if it should disappear."

@86e311c8bd0d9d0fa8ee9e599e7e541c406da207

c847149

86e311c

app/views/index/partial_notifications.scala.html

--- app/views/index/partial_notifications.scala.html

+++ app/views/index/partial_notifications.scala.html


         @defining(User.find.byId(noti.senderId)){ user =>
         @if(noti.eventType.equals(EventType.ISSUE_BODY_CHANGED) || noti.eventType.equals(EventType.COMMENT_UPDATED) ){
             <div class="stream-type updated">
-                <i>Edit</i>
+                Edit
             </div>
         } else {
             <div class="stream-type @notifycationIcon(noti.eventType,noti.newValue)">

     </li>
     }
 }
-
-@if(NotificationEvent.getNotificationsCount(UserApp.currentUser()) > size){
+@if( NotificationEvent.findByReceiver(UserApp.currentUser, from, size).size != 0){
 <li><a href="javascript: void(0);" id="notification-more" class="ybtn">More</a></li>
 <script type="text/javascript">
     $(document).ready(function(){

Add a comment

Open 0
Closed 0

List

...	...	@@ -64,7 +64,7 @@
64	64	@defining(User.find.byId(noti.senderId)){ user =>
65	65	@if(noti.eventType.equals(EventType.ISSUE_BODY_CHANGED) \|\| noti.eventType.equals(EventType.COMMENT_UPDATED) ){
66	66	<div class="stream-type updated">
67		- <i>Edit</i>
	67	+ Edit
68	68	</div>
69	69	} else {
70	70	<div class="stream-type @notifycationIcon(noti.eventType,noti.newValue)">
...	...	@@ -103,8 +103,7 @@
103	103	</li>
104	104	}
105	105	}
106		-
107		-@if(NotificationEvent.getNotificationsCount(UserApp.currentUser()) > size){
	106	+@if( NotificationEvent.findByReceiver(UserApp.currentUser, from, size).size != 0){
108	107	<li><a href="javascript: void(0);" id="notification-more" class="ybtn">More</a></li>
109	108	<script type="text/javascript">
110	109	$(document).ready(function(){

Delete comment