You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2015/12/04 10:05:34 UTC
svn commit: r1717914 - in /openmeetings:
branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/
branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/
trunk/singlewebapp/openmeetings-db/src/mai...
Author: solomax
Date: Fri Dec 4 09:05:33 2015
New Revision: 1717914
URL: http://svn.apache.org/viewvc?rev=1717914&view=rev
Log:
Build is fixed
Modified:
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserContactDao.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserContactDao.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
Modified: openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserContactDao.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserContactDao.java?rev=1717914&r1=1717913&r2=1717914&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserContactDao.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserContactDao.java Fri Dec 4 09:05:33 2015
@@ -190,7 +190,7 @@ public class UserContactDao {
}
public UserContact update(UserContact c) {
- if (c.getId() == 0) {
+ if (c.getId() == null) {
c.setInserted(new Date());
em.persist(c);
} else {
Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java?rev=1717914&r1=1717913&r2=1717914&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java Fri Dec 4 09:05:33 2015
@@ -254,7 +254,7 @@ public class RoomForm extends AdminBaseF
protected void populateItem(final ListItem<RoomModerator> item) {
RoomModerator moderator = item.getModelObject();
Label name = new Label("uName", moderator.getUser().getFirstname() + " " + moderator.getUser().getLastname());
- if (moderator.getId() == 0) {
+ if (moderator.getId() == null) {
name.add(AttributeAppender.append("class", "newItem"));
}
item.add(new CheckBox("superModerator", new PropertyModel<Boolean>(moderator, "superModerator")))
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserContactDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserContactDao.java?rev=1717914&r1=1717913&r2=1717914&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserContactDao.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserContactDao.java Fri Dec 4 09:05:33 2015
@@ -190,7 +190,7 @@ public class UserContactDao {
}
public UserContact update(UserContact c) {
- if (c.getId() == 0) {
+ if (c.getId() == null) {
c.setInserted(new Date());
em.persist(c);
} else {
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java?rev=1717914&r1=1717913&r2=1717914&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java Fri Dec 4 09:05:33 2015
@@ -254,7 +254,7 @@ public class RoomForm extends AdminBaseF
protected void populateItem(final ListItem<RoomModerator> item) {
RoomModerator moderator = item.getModelObject();
Label name = new Label("uName", moderator.getUser().getFirstname() + " " + moderator.getUser().getLastname());
- if (moderator.getId() == 0) {
+ if (moderator.getId() == null) {
name.add(AttributeAppender.append("class", "newItem"));
}
item.add(new CheckBox("superModerator", new PropertyModel<Boolean>(moderator, "superModerator")))