Author: solomax
Date: Wed Oct 17 15:02:06 2012
New Revision: 1399292
URL: http://svn.apache.org/viewvc?rev=1399292&view=rev
Log:
Wicket: Search to the configs page is added
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/ConfigurationDaoImpl.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/PagedEntityListPanel.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigsPanel.java
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/ConfigurationDaoImpl.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/ConfigurationDaoImpl.java?rev=1399292&r1=1399291&r2=1399292&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/ConfigurationDaoImpl.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/ConfigurationDaoImpl.java
Wed Oct 17 15:02:06 2012
@@ -36,6 +36,7 @@ import org.apache.openmeetings.data.bean
import org.apache.openmeetings.data.user.dao.UsersDaoImpl;
import org.apache.openmeetings.persistence.beans.basic.Configuration;
import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
+import org.apache.openmeetings.utils.DaoHelper;
import org.apache.openmeetings.utils.mappings.CastMapToObject;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
@@ -54,11 +55,10 @@ import org.springframework.transaction.a
*/
@Transactional
public class ConfigurationDaoImpl implements OmDAO<Configuration> {
-
private static final Logger log = Red5LoggerFactory.getLogger(
ConfigurationDaoImpl.class,
OpenmeetingsVariables.webAppRootKey);
-
public static final String DEFAULT_APP_NAME = "OpenMeetings";
+ public final static String[] searchFields = {"conf_key", "conf_value"};
@PersistenceContext
private EntityManager em;
@@ -352,8 +352,10 @@ public class ConfigurationDaoImpl implem
}
public List<Configuration> get(String search, int start, int count) {
- // TODO Auto-generated method stub
- return null;
+ TypedQuery<Configuration> q =
em.createQuery(DaoHelper.getSearchQuery("Configuration", "c", search, true,
false, searchFields), Configuration.class);
+ q.setFirstResult(start);
+ q.setMaxResults(count);
+ return q.getResultList();
}
public long count() {
@@ -361,8 +363,8 @@ public class ConfigurationDaoImpl implem
}
public long count(String search) {
- // TODO Auto-generated method stub
- return 0;
+ TypedQuery<Long> q =
em.createQuery(DaoHelper.getSearchQuery("Configuration", "c", search, true,
true, searchFields), Long.class);
+ return q.getSingleResult();
}
public void update(Configuration entity, long userId) {
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/PagedEntityListPanel.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/PagedEntityListPanel.java?rev=1399292&r1=1399291&r2=1399292&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/PagedEntityListPanel.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/PagedEntityListPanel.java
Wed Oct 17 15:02:06 2012
@@ -67,6 +67,7 @@ public abstract class PagedEntityListPan
@Override
protected void onSubmit(AjaxRequestTarget target,
Form<?> form) {
+ target.add(f);
PagedEntityListPanel.this.onEvent(target);
}
});
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigsPanel.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigsPanel.java?rev=1399292&r1=1399291&r2=1399292&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigsPanel.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigsPanel.java
Wed Oct 17 15:02:06 2012
@@ -38,7 +38,6 @@ import org.apache.wicket.markup.repeater
*
*/
public class ConfigsPanel extends AdminPanel {
-
private static final long serialVersionUID = -1L;
private ConfigForm form;
