aboutsummaryrefslogtreecommitdiff
path: root/juick-www
diff options
context:
space:
mode:
authorGravatar Vitaly Takmazov2017-09-11 21:00:02 +0300
committerGravatar Vitaly Takmazov2017-09-11 21:01:55 +0300
commit49c4b7f3ccbd4e22f500ea2f46e520786d8a8ab1 (patch)
tree2443c30e860c8df691db8358547462377da94b2f /juick-www
parente49843282fec85ac29a4b83ab384ab7bc1c6ae1f (diff)
no more recommended tab
Diffstat (limited to 'juick-www')
-rw-r--r--juick-www/src/main/java/com/juick/www/controllers/Home.java2
-rw-r--r--juick-www/src/main/webapp/WEB-INF/views/partial/navigation.html1
-rw-r--r--juick-www/src/test/java/com/juick/www/WebAppTests.java6
3 files changed, 4 insertions, 5 deletions
diff --git a/juick-www/src/main/java/com/juick/www/controllers/Home.java b/juick-www/src/main/java/com/juick/www/controllers/Home.java
index f46187ed..763d829e 100644
--- a/juick-www/src/main/java/com/juick/www/controllers/Home.java
+++ b/juick-www/src/main/java/com/juick/www/controllers/Home.java
@@ -126,7 +126,7 @@ public class Home {
return "redirect:/";
} else if (paramShow.equals("my") && visitor != null) {
title = "Моя лента";
- mids = messagesService.getMyFeed(visitor.getUid(), paramBefore);
+ mids = messagesService.getMyFeed(visitor.getUid(), paramBefore, true);
} else if (paramShow.equals("private") && visitor != null) {
title = "Приватные";
mids = messagesService.getPrivate(visitor.getUid(), paramBefore);
diff --git a/juick-www/src/main/webapp/WEB-INF/views/partial/navigation.html b/juick-www/src/main/webapp/WEB-INF/views/partial/navigation.html
index 6930e9a9..552532b1 100644
--- a/juick-www/src/main/webapp/WEB-INF/views/partial/navigation.html
+++ b/juick-www/src/main/webapp/WEB-INF/views/partial/navigation.html
@@ -20,7 +20,6 @@
<li><a href="/?show=my">{{ i18n("messages","link.my") }}</a></li>
<li><a href="/pm/inbox">{{ i18n("messages","link.privateMessages") }}</a></li>
<li><a href="/?show=discuss">{{ i18n("messages","link.discuss") }}</a></li>
- <li><a href="/?show=recommended">{{ i18n("messages","link.recommended") }}</a></li>
</ul>
</nav>
<nav id="actions">
diff --git a/juick-www/src/test/java/com/juick/www/WebAppTests.java b/juick-www/src/test/java/com/juick/www/WebAppTests.java
index 0aba7e37..c2f6b0d9 100644
--- a/juick-www/src/test/java/com/juick/www/WebAppTests.java
+++ b/juick-www/src/test/java/com/juick/www/WebAppTests.java
@@ -127,7 +127,7 @@ public class WebAppTests {
.thenReturn(Optional.of(user));
when(userService.getFullyUserByName(ugnichName))
.thenReturn(user);
- when(messagesService.getMyFeed(1, 0))
+ when(messagesService.getMyFeed(1, 0, false))
.thenReturn(Collections.singletonList(1));
when(messagesService.getMessages(Collections.singletonList(1)))
.thenReturn(Collections.singletonList(msg));
@@ -158,7 +158,7 @@ public class WebAppTests {
.thenReturn(Optional.of(user));
when(userService.getFullyUserByName(userName))
.thenReturn(user);
- when(messagesService.getMyFeed(2, 0))
+ when(messagesService.getMyFeed(2, 0, false))
.thenReturn(Collections.singletonList(2));
when(messagesService.getMessages(Collections.singletonList(2)))
.thenReturn(Collections.singletonList(msg));
@@ -234,7 +234,7 @@ public class WebAppTests {
.thenReturn(Optional.of(user));
when(userService.getFullyUserByName(ugnichName))
.thenReturn(user);
- when(messagesService.getMyFeed(1, 0))
+ when(messagesService.getMyFeed(1, 0, false))
.thenReturn(Collections.singletonList(1));
when(messagesService.getMessages(Collections.singletonList(1)))
.thenReturn(Collections.singletonList(msg));