Author: solomax
Date: Fri Dec 25 04:43:51 2015
New Revision: 1721657
URL: http://svn.apache.org/viewvc?rev=1721657&view=rev
Log:
[OPENMEETINGS-1305] select2 icons should be fixed
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserMultiChoice.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserMultiChoice.java
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserMultiChoice.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserMultiChoice.java?rev=1721657&r1=1721656&r2=1721657&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserMultiChoice.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserMultiChoice.java
Fri Dec 25 04:43:51 2015
@@ -34,8 +34,8 @@ public class UserMultiChoice extends Sel
public UserMultiChoice(String id, IModel<Collection<User>> model) {
super(id, model, new UserChoiceProvider());
- getSettings().setFormatResult("formatOmUser");
- getSettings().setFormatSelection("formatOmUser");
+ getSettings().setTemplateResult("formatOmUser");
+ getSettings().setTemplateSelection("formatOmUser");
getSettings().setEscapeMarkup("escapeOmUserMarkup");
}
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserMultiChoice.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserMultiChoice.java?rev=1721657&r1=1721656&r2=1721657&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserMultiChoice.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserMultiChoice.java
Fri Dec 25 04:43:51 2015
@@ -34,8 +34,8 @@ public class UserMultiChoice extends Sel
public UserMultiChoice(String id, IModel<Collection<User>> model) {
super(id, model, new UserChoiceProvider());
- getSettings().setFormatResult("formatOmUser");
- getSettings().setFormatSelection("formatOmUser");
+ getSettings().setTemplateResult("formatOmUser");
+ getSettings().setTemplateSelection("formatOmUser");
getSettings().setEscapeMarkup("escapeOmUserMarkup");
}