Revision: 3989
Author: seba.wagner
Date: Sat Jul 16 06:23:51 2011
Log: Fix order with menu
http://code.google.com/p/openmeetings/source/detail?r=3989
Modified:
/branches/dev/om_openjpa/src/app/org/openmeetings/app/data/basic/Navimanagement.java
/branches/dev/om_openjpa/src/app/org/openmeetings/app/hibernate/beans/basic/Naviglobal.java
/branches/dev/om_openjpa/src/app/org/openmeetings/app/hibernate/beans/basic/Navimain.java
/branches/dev/om_openjpa/src/test/org/openmeetings/test/navi/TestNavi.java
=======================================
---
/branches/dev/om_openjpa/src/app/org/openmeetings/app/data/basic/Navimanagement.java
Fri Jul 8 01:31:52 2011
+++
/branches/dev/om_openjpa/src/app/org/openmeetings/app/data/basic/Navimanagement.java
Sat Jul 16 06:23:51 2011
@@ -43,7 +43,7 @@
Naviglobal navigl = (Naviglobal) it2.next();
navigl.setLabel(Fieldmanagment.getInstance().getFieldByIdAndLanguageByNavi(navigl.getFieldvalues_id(),language_id));
navigl.setTooltip(Fieldmanagment.getInstance().getFieldByIdAndLanguageByNavi(navigl.getTooltip_fieldvalues_id(),language_id));
- Set<Navimain> s = navigl.getMainnavi();
+ List<Navimain> s = navigl.getMainnavi();
for (Iterator<Navimain> it3 = s.iterator();
it3.hasNext();) {
Navimain navim = (Navimain) it3.next();
navim.setLabel(Fieldmanagment.getInstance().getFieldByIdAndLanguageByNavi(navim.getFieldvalues_id(),language_id));
@@ -71,7 +71,7 @@
// CriteriaBuilder crit = session.getCriteriaBuilder();
Query query = session.createQuery("select c from Naviglobal
as c " +
"where c.level_id <= :level_id AND " +
- "c.deleted='false' " +
+ "c.deleted LIKE 'false' " +
"order by c.naviorder");
query.setParameter("level_id", user_level);
List<Naviglobal> navi = query.getResultList();
@@ -80,25 +80,6 @@
log.debug("getMainMenu "+navi.size());
- // load navimain
- if(navi.size()!=0){
- Iterator<Naviglobal> flIterator=navi.iterator();
- while(flIterator.hasNext()){
- Naviglobal ng = flIterator.next();
- tx.begin();
-
- query = session.createQuery("select c from
Navimain as c " +
- "where c.global_id =
:global_id AND " +
- "c.deleted='false' ");
- query.setParameter("global_id",
ng.getGlobal_id());
- List<Navimain> nm =
query.getResultList();
- Set<Navimain> set = new
HashSet<Navimain>(nm);
- ng.setMainnavi(set);
-
- tx.commit();
- }
- }
-
HibernateUtil.closeSession(idf);
return navi;
=======================================
---
/branches/dev/om_openjpa/src/app/org/openmeetings/app/hibernate/beans/basic/Naviglobal.java
Fri Jul 8 01:31:52 2011
+++
/branches/dev/om_openjpa/src/app/org/openmeetings/app/hibernate/beans/basic/Naviglobal.java
Sat Jul 16 06:23:51 2011
@@ -1,7 +1,7 @@
package org.openmeetings.app.hibernate.beans.basic;
import java.io.Serializable;
-import java.util.Set;
+import java.util.List;
import java.util.Date;
import org.openmeetings.app.hibernate.beans.lang.Fieldlanguagesvalues;
@@ -16,6 +16,7 @@
import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.OneToMany;
+import javax.persistence.OrderBy;
import javax.persistence.Table;
import javax.persistence.Transient;
@@ -57,7 +58,8 @@
private Long tooltip_fieldvalues_id;
@OneToMany(fetch = FetchType.EAGER)
@JoinColumn(name="global_id")
- private Set<Navimain> mainnavi;
+ @OrderBy("naviorder")
+ private List<Navimain> mainnavi;
@Transient
private Fieldlanguagesvalues label;
@Transient
@@ -153,10 +155,10 @@
this.level_id = level_id;
}
- public Set<Navimain> getMainnavi() {
+ public List<Navimain> getMainnavi() {
return mainnavi;
}
- public void setMainnavi(Set<Navimain> mainnavi) {
+ public void setMainnavi(List<Navimain> mainnavi) {
this.mainnavi = mainnavi;
}
=======================================
---
/branches/dev/om_openjpa/src/app/org/openmeetings/app/hibernate/beans/basic/Navimain.java
Fri Jul 8 01:31:52 2011
+++
/branches/dev/om_openjpa/src/app/org/openmeetings/app/hibernate/beans/basic/Navimain.java
Sat Jul 16 06:23:51 2011
@@ -1,20 +1,21 @@
package org.openmeetings.app.hibernate.beans.basic;
import java.io.Serializable;
-import java.util.Set;
+import java.util.List;
import java.util.Date;
import org.openmeetings.app.hibernate.beans.lang.Fieldlanguagesvalues;
import javax.persistence.Column;
-import javax.persistence.Entity;
+import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.OneToMany;
+import javax.persistence.OrderBy;
import javax.persistence.Table;
import javax.persistence.Transient;
@@ -58,7 +59,8 @@
private Fieldlanguagesvalues label;
@OneToMany(fetch = FetchType.EAGER)
@JoinColumn(name="main_id")
- private Set<Navisub> subnavi;
+ @OrderBy("naviorder")
+ private List<Navisub> subnavi;
@Transient
private Fieldlanguagesvalues tooltip;
@Column(name="tooltip_fieldvalues_id")
@@ -150,11 +152,11 @@
this.deleted = deleted;
}
- public Set<Navisub> getSubnavi() {
+ public List<Navisub> getSubnavi() {
return subnavi;
}
- public void setSubnavi(Set<Navisub> subnavi) {
+ public void setSubnavi(List<Navisub> subnavi) {
this.subnavi = subnavi;
}
=======================================
---
/branches/dev/om_openjpa/src/test/org/openmeetings/test/navi/TestNavi.java
Fri Aug 13 05:39:44 2010
+++
/branches/dev/om_openjpa/src/test/org/openmeetings/test/navi/TestNavi.java
Sat Jul 16 06:23:51 2011
@@ -38,7 +38,7 @@
for (Iterator it2 = ll.iterator(); it2.hasNext();) {
Naviglobal navigl = (Naviglobal) it2.next();
System.out.println(navigl.getLabel().getValue());
- Set s = navigl.getMainnavi();
+ List s = navigl.getMainnavi();
for (Iterator it3 = s.iterator(); it3.hasNext();) {
Navimain navim = (Navimain) it3.next();
--
You received this message because you are subscribed to the Google Groups
"OpenMeetings developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/openmeetings-dev?hl=en.
