Skip to content
Snippets Groups Projects
Commit 3a1f53c5 authored by srosse's avatar srosse
Browse files

OO-984: fix an issue with the search not reseted after a full text search, add english translations

parent ecf450cc
No related branches found
No related tags found
No related merge requests found
...@@ -69,6 +69,8 @@ topnav.guesthome=Guest home ...@@ -69,6 +69,8 @@ topnav.guesthome=Guest home
topnav.guesthome.alt=This is your starting point as OLAT guest. topnav.guesthome.alt=This is your starting point as OLAT guest.
topnav.home=Home topnav.home=Home
topnav.home.alt=This is your starting point in OLAT. topnav.home.alt=This is your starting point in OLAT.
topnav.mycourses=Courses
topnav.mycourses.alt=Courses
topnav.printview=Print topnav.printview=Print
topnav.printview.alt=Print this page topnav.printview.alt=Print this page
topnav.testing=Test topnav.testing=Test
......
...@@ -15,6 +15,9 @@ topnav.login=Log in ...@@ -15,6 +15,9 @@ topnav.login=Log in
topnav.login.alt=Log in to OLAT topnav.login.alt=Log in to OLAT
topnav.logout=Log out topnav.logout=Log out
topnav.logout.alt=Log off from OLAT 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=Definite link (permalink)
topnav.permlink.info=Link here via {0} topnav.permlink.info=Link here via {0}
topnav.printview=Print topnav.printview=Print
......
...@@ -94,6 +94,10 @@ public class DefaultRepositoryEntryDataSource implements FlexiTableDataSourceDel ...@@ -94,6 +94,10 @@ public class DefaultRepositoryEntryDataSource implements FlexiTableDataSourceDel
public void setOrderBy(OrderBy orderBy) { public void setOrderBy(OrderBy orderBy) {
searchParams.setOrderBy(orderBy); searchParams.setOrderBy(orderBy);
} }
public void resetCount() {
count = null;
}
@Override @Override
public int getRowCount() { public int getRowCount() {
......
...@@ -34,6 +34,12 @@ class RepositoryEntryDataModel extends DefaultFlexiTableDataSourceModel<Reposito ...@@ -34,6 +34,12 @@ class RepositoryEntryDataModel extends DefaultFlexiTableDataSourceModel<Reposito
super(source, columnModel); super(source, columnModel);
} }
@Override
public void clear() {
super.clear();
getSourceDelegate().resetCount();
}
@Override @Override
public DefaultFlexiTableDataSourceModel<RepositoryEntryRow> createCopyWithEmptyList() { public DefaultFlexiTableDataSourceModel<RepositoryEntryRow> createCopyWithEmptyList() {
return new RepositoryEntryDataModel(getSourceDelegate(), getTableColumnModel()); return new RepositoryEntryDataModel(getSourceDelegate(), getTableColumnModel());
......
...@@ -203,6 +203,7 @@ tab.profile=Profile ...@@ -203,6 +203,7 @@ tab.profile=Profile
tab.pwd=Password tab.pwd=Password
tab.pwdav=WebDAV tab.pwdav=WebDAV
tab.roles=Roles tab.roles=Roles
tab.settings=System settings
table.header.action=Action table.header.action=Action
table.prop.category=Category table.prop.category=Category
table.prop.creatdat=Created table.prop.creatdat=Created
...@@ -227,3 +228,6 @@ ul.upload=Upload ...@@ -227,3 +228,6 @@ ul.upload=Upload
user.deleted=This user has been deleted in OpenOLAT 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.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. 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
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment