[openmeetings] branch master updated: [OPENMEETINGS-1981] SpringBean injection is fixed

[solomax]

This is an automated email from the ASF dual-hosted git repository.

solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git


The following commit(s) were added to refs/heads/master by this push:
     new c33f913  [OPENMEETINGS-1981] SpringBean injection is fixed
c33f913 is described below

commit c33f9134e6c7b238a2876ed858cada0d93eef9a9
Author: Maxim Solodovnik <solomax...@gmail.com>
AuthorDate: Fri Jan 25 17:36:18 2019 +0700

    [OPENMEETINGS-1981] SpringBean injection is fixed
---
 .../org/apache/openmeetings/web/admin/AdminUserChoiceProvider.java   | 5 +++++
 .../java/org/apache/openmeetings/web/common/GroupChoiceProvider.java | 5 +++++
 2 files changed, 10 insertions(+)

diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminUserChoiceProvider.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminUserChoiceProvider.java
index 5457545..2c02831 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminUserChoiceProvider.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminUserChoiceProvider.java
@@ -24,6 +24,7 @@ import java.util.List;
 
 import org.apache.openmeetings.db.dao.user.UserDao;
 import org.apache.openmeetings.db.entity.user.User;
+import org.apache.wicket.injection.Injector;
 import org.apache.wicket.spring.injection.annot.SpringBean;
 import org.wicketstuff.select2.ChoiceProvider;
 import org.wicketstuff.select2.Response;
@@ -34,6 +35,10 @@ public abstract class AdminUserChoiceProvider extends 
ChoiceProvider<User> {
        @SpringBean
        private UserDao userDao;
 
+       public AdminUserChoiceProvider() {
+               Injector.get().inject(this);
+       }
+
        @Override
        public String getIdValue(User choice) {
                Long id = choice.getId();
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GroupChoiceProvider.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GroupChoiceProvider.java
index bd8bcaa..5a893f9 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GroupChoiceProvider.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GroupChoiceProvider.java
@@ -31,6 +31,7 @@ import org.apache.openmeetings.db.entity.user.Group;
 import org.apache.openmeetings.db.entity.user.GroupUser;
 import org.apache.openmeetings.db.entity.user.User;
 import org.apache.openmeetings.web.app.WebSession;
+import org.apache.wicket.injection.Injector;
 import org.apache.wicket.spring.injection.annot.SpringBean;
 import org.apache.wicket.util.string.Strings;
 import org.wicketstuff.select2.ChoiceProvider;
@@ -43,6 +44,10 @@ public class GroupChoiceProvider extends 
ChoiceProvider<Group> {
        @SpringBean
        private UserDao userDao;
 
+       public GroupChoiceProvider() {
+               Injector.get().inject(this);
+       }
+
        @Override
        public void query(String term, int page, Response<Group> response) {
                if (WebSession.getRights().contains(User.Right.Admin)) {