0ct0pu5/fess
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix #2662 add clipboard.copy.icon.enabled

Browse source
This commit is contained in:
Shinsuke Sugaya 2022-06-09 13:29:42 +09:00
parent 55e19fed8b
commit 297ce0a6f0
5 changed files with 30 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/main/java/org/codelibs/fess/app/web/base/FessSearchAction.java
View file

@ -122,6 +122,7 @@ public abstract class FessSearchAction extends FessBaseAction {
systemHelper.setupSearchHtmlData(this, runtime);
runtime.registerData("osddLink", osddHelper.hasOpenSearchFile());
runtime.registerData("clipboardCopyIcon", fessConfig.isClipboardCopyIconEnabled());
final List<Map<String, String>> labelTypeItems = labelTypeHelper.getLabelTypeItemList(SearchRequestType.SEARCH,
request.getLocale() == null ? Locale.ROOT : request.getLocale());

26
src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java
View file

@ -1115,6 +1115,9 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
/** The key of the configuration. e.g. true */
String OSDD_LINK_ENABLED = "osdd.link.enabled";
/** The key of the configuration. e.g. true */
String CLIPBOARD_COPY_ICON_ENABLED = "clipboard.copy.icon.enabled";
/** The key of the configuration. e.g. admin */
String AUTHENTICATION_ADMIN_USERS = "authentication.admin.users";
@ -5156,6 +5159,20 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
*/
boolean isOsddLinkEnabled();
/**
* Get the value for the key 'clipboard.copy.icon.enabled'. <br>
* The value is, e.g. true <br>
* @return The value of found property. (NotNull: if not found, exception but basically no way)
*/
String getClipboardCopyIconEnabled();
/**
* Is the property for the key 'clipboard.copy.icon.enabled' true? <br>
* The value is, e.g. true <br>
* @return The determination, true or false. (if not found, exception but basically no way)
*/
boolean isClipboardCopyIconEnabled();
/**
* Get the value for the key 'authentication.admin.users'. <br>
* The value is, e.g. admin <br>
@ -9021,6 +9038,14 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
return is(FessConfig.OSDD_LINK_ENABLED);
}
public String getClipboardCopyIconEnabled() {
return get(FessConfig.CLIPBOARD_COPY_ICON_ENABLED);
}
public boolean isClipboardCopyIconEnabled() {
return is(FessConfig.CLIPBOARD_COPY_ICON_ENABLED);
}
public String getAuthenticationAdminUsers() {
return get(FessConfig.AUTHENTICATION_ADMIN_USERS);
}
@ -10489,6 +10514,7 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
defaultMap.put(FessConfig.FORM_ADMIN_LABEL_IN_CONFIG_ENABLED, "false");
defaultMap.put(FessConfig.FORM_ADMIN_DEFAULT_TEMPLATE_NAME, "__TEMPLATE__");
defaultMap.put(FessConfig.OSDD_LINK_ENABLED, "true");
defaultMap.put(FessConfig.CLIPBOARD_COPY_ICON_ENABLED, "true");
defaultMap.put(FessConfig.AUTHENTICATION_ADMIN_USERS, "admin");
defaultMap.put(FessConfig.AUTHENTICATION_ADMIN_ROLES, "admin");
defaultMap.put(FessConfig.ROLE_SEARCH_DEFAULT_PERMISSIONS, "");

1
src/main/resources/fess_config.properties
View file

@ -603,6 +603,7 @@ form.admin.max.input.size=4000
form.admin.label.in.config.enabled=false
form.admin.default.template.name=__TEMPLATE__
osdd.link.enabled=true
clipboard.copy.icon.enabled=true
# ----------------------------------------------------------
# Permission

2
src/main/webapp/WEB-INF/orig/view/searchResults.jsp
View file

@ -56,7 +56,7 @@
<div class="description">${doc.content_description}</div>
</div>
<div class="site text-truncate">
<i class="far fa-copy url-copy" data-clipboard-text="${doc.url_link}"></i>
<c:if test="${clipboardCopyIcon}"><i class="far fa-copy url-copy" data-clipboard-text="${doc.url_link}"></i></c:if>
<cite>${f:h(doc.site_path)}</cite>
</div>
<div class="more">

2
src/main/webapp/WEB-INF/view/searchResults.jsp
View file

@ -56,7 +56,7 @@
<div class="description">${doc.content_description}</div>
</div>
<div class="site text-truncate">
<i class="far fa-copy url-copy" data-clipboard-text="${doc.url_link}"></i>
<c:if test="${clipboardCopyIcon}"><i class="far fa-copy url-copy" data-clipboard-text="${doc.url_link}"></i></c:if>
<cite>${f:h(doc.site_path)}</cite>
</div>
<div class="more">