Author: solomax Date: Mon Apr 20 10:48:50 2015 New Revision: 1674794 URL: http://svn.apache.org/r1674794 Log: [OPENMEETINGS-1200] menu order seems to be fixed
Modified: openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/basic/Naviglobal.java openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Naviglobal.java Modified: openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/basic/Naviglobal.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/basic/Naviglobal.java?rev=1674794&r1=1674793&r2=1674794&view=diff ============================================================================== --- openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/basic/Naviglobal.java (original) +++ openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/basic/Naviglobal.java Mon Apr 20 10:48:50 2015 @@ -33,15 +33,16 @@ import javax.persistence.JoinColumn; import javax.persistence.NamedQueries; import javax.persistence.NamedQuery; import javax.persistence.OneToMany; +import javax.persistence.OrderBy; import javax.persistence.Table; import org.apache.openjpa.persistence.jdbc.ForeignKey; @Entity @NamedQueries({ - @NamedQuery(name = "getNavigation", query = "SELECT DISTINCT ng from Naviglobal ng LEFT JOIN ng.mainnavi nm " + @NamedQuery(name = "getNavigation", query = "SELECT DISTINCT ng from Naviglobal ng JOIN ng.mainnavi nm " + "WHERE nm.deleted = false AND ng.level_id <= :level_id AND nm.level_id <= :level_id " - + "AND ng.deleted = false order by ng.naviorder, nm.naviorder"), + + "AND ng.deleted = false ORDER BY ng.naviorder ASC"), @NamedQuery(name = "getNavigationById", query = "SELECT ng from Naviglobal ng WHERE ng.global_id = :global_id") }) @Table(name = "naviglobal") public class Naviglobal implements Serializable { @@ -94,6 +95,7 @@ public class Naviglobal implements Seria @OneToMany(fetch = FetchType.EAGER, cascade = CascadeType.ALL) @JoinColumn(name = "global_id") @ForeignKey(enabled = true) + @OrderBy("naviorder") private List<Navimain> mainnavi; public String getAction() { Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Naviglobal.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Naviglobal.java?rev=1674794&r1=1674793&r2=1674794&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Naviglobal.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Naviglobal.java Mon Apr 20 10:48:50 2015 @@ -32,6 +32,7 @@ import javax.persistence.JoinColumn; import javax.persistence.NamedQueries; import javax.persistence.NamedQuery; import javax.persistence.OneToMany; +import javax.persistence.OrderBy; import javax.persistence.Table; import org.apache.openjpa.persistence.jdbc.ForeignKey; @@ -39,9 +40,9 @@ import org.apache.openmeetings.db.entity @Entity @NamedQueries({ - @NamedQuery(name = "getNavigation", query = "SELECT DISTINCT ng from Naviglobal ng LEFT JOIN ng.mainnavi nm " + @NamedQuery(name = "getNavigation", query = "SELECT DISTINCT ng from Naviglobal ng JOIN ng.mainnavi nm " + "WHERE nm.deleted = false AND ng.level_id <= :level_id AND nm.level_id <= :level_id " - + "AND ng.deleted = false order by ng.naviorder, nm.naviorder"), + + "AND ng.deleted = false ORDER BY ng.naviorder ASC"), @NamedQuery(name = "getNavigationById", query = "SELECT ng from Naviglobal ng WHERE ng.id = :id") }) @Table(name = "naviglobal") public class Naviglobal implements IDataProviderEntity { @@ -94,6 +95,7 @@ public class Naviglobal implements IData @OneToMany(fetch = FetchType.EAGER, cascade = CascadeType.ALL) @JoinColumn(name = "global_id") @ForeignKey(enabled = true) + @OrderBy("naviorder") private List<Navimain> mainnavi; public Long getId() {