Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed TheCoder4eu/BootsFaces-OSP#628 #629

Merged
merged 1 commit into from
Jan 27, 2017
Merged

Fixed TheCoder4eu/BootsFaces-OSP#628 #629

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions src/main/java/net/bootsfaces/component/dataTable/DataTableRenderer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
import javax.faces.render.FacesRenderer;
import net.bootsfaces.C;

import net.bootsfaces.component.ajax.AJAXRenderer;
import net.bootsfaces.component.dataTableColumn.DataTableColumn;
Expand Down Expand Up @@ -559,7 +560,7 @@ public void encodeEnd(FacesContext context, UIComponent component) throws IOExce
// https://datatables.net/examples/api/multi_filter.html
// # Convert footer column text to input textfields
rw.writeText(widgetVar + ".find('.bf-multisearch').each(function(){" + "var title=$(this).text();"
+ "$(this).html('<input class=\"input-sm\" type=\"text\" placeholder=\"Search ' + title + '\" />');"
+ "$(this).html('<input class=\"form-control input-sm\" type=\"text\" placeholder=\"Search ' + title + '\" />');"
+ "});", null);
// # Add event listeners for each multisearch input
rw.writeText("var inputs=$("+ widgetVar + ".find('.bf-multisearch input'));", null);
Expand Down Expand Up @@ -682,6 +683,11 @@ private String determineLanguage(FacesContext fc, DataTable dataTable) {
String lang = dataTable.getLang();
if (availableLanguages.contains(lang))
return determineLanguageUrl(fc, lang);
} else {
String lang = fc.getViewRoot().getLocale().getLanguage();
if (availableLanguages.contains(lang)) {
return determineLanguageUrl(fc, lang);
}
}
return null;
}
Expand All @@ -699,7 +705,7 @@ private String determineLanguage(FacesContext fc, DataTable dataTable) {
private String determineLanguageUrl(FacesContext fc, String lang) {
// Build resource url
return fc.getApplication().getResourceHandler()
.createResource("jq/ui/i18n/dt/datatable-" + lang + ".json", "bsf").getRequestPath();
.createResource("jq/ui/i18n/dt/datatable-" + lang + ".json", C.BSF_LIBRARY).getRequestPath();
}

@Override
Expand Down