From 3a1f53c5ff8fc5181cf7aeafa4074acba0d9e23e Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Thu, 24 Jul 2014 09:47:08 +0200
Subject: [PATCH] OO-984: fix an issue with the search not reseted after a full
text search, add english translations
---
.../chiefcontrollers/_i18n/LocalStrings_en.properties | 2 ++
.../org/olat/gui/control/_i18n/LocalStrings_en.properties | 3 +++
.../ui/list/DefaultRepositoryEntryDataSource.java | 4 ++++
.../olat/repository/ui/list/RepositoryEntryDataModel.java | 6 ++++++
.../java/org/olat/user/_i18n/LocalStrings_en.properties | 4 ++++
5 files changed, 19 insertions(+)
diff --git a/src/main/java/org/olat/core/commons/chiefcontrollers/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/core/commons/chiefcontrollers/_i18n/LocalStrings_en.properties
index 913a204338e..b2938400303 100644
--- a/src/main/java/org/olat/core/commons/chiefcontrollers/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/core/commons/chiefcontrollers/_i18n/LocalStrings_en.properties
@@ -69,6 +69,8 @@ topnav.guesthome=Guest home
topnav.guesthome.alt=This is your starting point as OLAT guest.
topnav.home=Home
topnav.home.alt=This is your starting point in OLAT.
+topnav.mycourses=Courses
+topnav.mycourses.alt=Courses
topnav.printview=Print
topnav.printview.alt=Print this page
topnav.testing=Test
diff --git a/src/main/java/org/olat/gui/control/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/gui/control/_i18n/LocalStrings_en.properties
index 2bdd5416588..f464482e89a 100644
--- a/src/main/java/org/olat/gui/control/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/gui/control/_i18n/LocalStrings_en.properties
@@ -15,6 +15,9 @@ topnav.login=Log in
topnav.login.alt=Log in to OLAT
topnav.logout=Log out
topnav.logout.alt=Log off from OLAT
+topnav.my.menu.label={0}
+topnav.my.menu.tools=Personal tools
+topnav.my.menu.configurations=Configuration
topnav.permlink=Definite link (permalink)
topnav.permlink.info=Link here via {0}
topnav.printview=Print
diff --git a/src/main/java/org/olat/repository/ui/list/DefaultRepositoryEntryDataSource.java b/src/main/java/org/olat/repository/ui/list/DefaultRepositoryEntryDataSource.java
index 008b155b292..6b196c17676 100644
--- a/src/main/java/org/olat/repository/ui/list/DefaultRepositoryEntryDataSource.java
+++ b/src/main/java/org/olat/repository/ui/list/DefaultRepositoryEntryDataSource.java
@@ -94,6 +94,10 @@ public class DefaultRepositoryEntryDataSource implements FlexiTableDataSourceDel
public void setOrderBy(OrderBy orderBy) {
searchParams.setOrderBy(orderBy);
}
+
+ public void resetCount() {
+ count = null;
+ }
@Override
public int getRowCount() {
diff --git a/src/main/java/org/olat/repository/ui/list/RepositoryEntryDataModel.java b/src/main/java/org/olat/repository/ui/list/RepositoryEntryDataModel.java
index f448aa2e5f5..5a94d2971b9 100644
--- a/src/main/java/org/olat/repository/ui/list/RepositoryEntryDataModel.java
+++ b/src/main/java/org/olat/repository/ui/list/RepositoryEntryDataModel.java
@@ -34,6 +34,12 @@ class RepositoryEntryDataModel extends DefaultFlexiTableDataSourceModel<Reposito
super(source, columnModel);
}
+ @Override
+ public void clear() {
+ super.clear();
+ getSourceDelegate().resetCount();
+ }
+
@Override
public DefaultFlexiTableDataSourceModel<RepositoryEntryRow> createCopyWithEmptyList() {
return new RepositoryEntryDataModel(getSourceDelegate(), getTableColumnModel());
diff --git a/src/main/java/org/olat/user/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/user/_i18n/LocalStrings_en.properties
index 0a91ccb82d9..1f5c8461433 100644
--- a/src/main/java/org/olat/user/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/user/_i18n/LocalStrings_en.properties
@@ -203,6 +203,7 @@ tab.profile=Profile
tab.pwd=Password
tab.pwdav=WebDAV
tab.roles=Roles
+tab.settings=System settings
table.header.action=Action
table.prop.category=Category
table.prop.creatdat=Created
@@ -227,3 +228,6 @@ ul.upload=Upload
user.deleted=This user has been deleted in OpenOLAT
user.preferences.successful=The system settings of user ({0}) have been saved. All changes regarding language settings and AJAX mode will be active when logging in next time.
user.preferences.unsuccessful=The system settings of user ({0}) could not be saved. Please try again.
+usertools.title=User tools
+usertools.descr=Select the tools you wish to access from the main navigation bar.
+usertools.set=Tool
\ No newline at end of file
--
GitLab