Author: solomax
Date: Sun Sep 14 17:21:44 2014
New Revision: 1624875
URL: http://svn.apache.org/r1624875
Log:
[OPENMEETINGS-1081] poll display+import/export is export
Modified:
openmeetings/branches/3.0.x/src/install/java/org/apache/openmeetings/backup/BackupExport.java
openmeetings/branches/3.0.x/src/install/java/org/apache/openmeetings/backup/BackupImport.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileItem.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/LdapConfig.java
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.java
Modified:
openmeetings/branches/3.0.x/src/install/java/org/apache/openmeetings/backup/BackupExport.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/install/java/org/apache/openmeetings/backup/BackupExport.java?rev=1624875&r1=1624874&r2=1624875&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/install/java/org/apache/openmeetings/backup/BackupExport.java
(original)
+++
openmeetings/branches/3.0.x/src/install/java/org/apache/openmeetings/backup/BackupExport.java
Sun Sep 14 17:21:44 2014
@@ -67,6 +67,7 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.db.entity.room.Room;
import org.apache.openmeetings.db.entity.room.RoomPoll;
import org.apache.openmeetings.db.entity.room.RoomType;
+import org.apache.openmeetings.db.entity.server.LdapConfig;
import org.apache.openmeetings.db.entity.user.Organisation;
import org.apache.openmeetings.db.entity.user.PrivateMessage;
import org.apache.openmeetings.db.entity.user.State;
@@ -228,8 +229,11 @@ public class BackupExport {
/*
* ##################### LDAP Configs
*/
- writeList(simpleSerializer, backup_dir, "ldapconfigs.xml",
- "ldapconfigs", ldapConfigDao.get());
+ List<LdapConfig> ldapList = ldapConfigDao.get();
+ if (!ldapList.isEmpty()) {
+ ldapList.remove(0);
+ }
+ writeList(simpleSerializer, backup_dir, "ldapconfigs.xml",
"ldapconfigs", ldapList);
progressHolder.setProgress(35);
/*
Modified:
openmeetings/branches/3.0.x/src/install/java/org/apache/openmeetings/backup/BackupImport.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/install/java/org/apache/openmeetings/backup/BackupImport.java?rev=1624875&r1=1624874&r2=1624875&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/install/java/org/apache/openmeetings/backup/BackupImport.java
(original)
+++
openmeetings/branches/3.0.x/src/install/java/org/apache/openmeetings/backup/BackupImport.java
Sun Sep 14 17:21:44 2014
@@ -444,7 +444,9 @@ public class BackupImport {
{
List<LdapConfig> list = readList(simpleSerializer, f,
"ldapconfigs.xml", "ldapconfigs", LdapConfig.class, true);
for (LdapConfig c : list) {
- ldapConfigDao.addLdapConfigByObject(c);
+ if (!"local DB [internal]".equals(c.getName()))
{
+ ldapConfigDao.addLdapConfigByObject(c);
+ }
}
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileItem.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileItem.java?rev=1624875&r1=1624874&r2=1624875&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileItem.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileItem.java
Sun Sep 14 17:21:44 2014
@@ -48,7 +48,7 @@ public abstract class FileItem implement
private String fileHash;
@Column(name = "parent_fileexploreritem_id")
- @Element(data = true, name = "parentFileExplorerItemId")
+ @Element(data = true, name = "parentFileExplorerItemId", required =
false)
private Long parentItemId;
@Column(name = "room_id")
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/LdapConfig.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/LdapConfig.java?rev=1624875&r1=1624874&r2=1624875&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/LdapConfig.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/LdapConfig.java
Sun Sep 14 17:21:44 2014
@@ -53,7 +53,6 @@ public class LdapConfig implements IData
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "id")
- @Element(data = true)
private Long id;
@Column(name = "name")
Modified:
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java?rev=1624875&r1=1624874&r2=1624875&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java
Sun Sep 14 17:21:44 2014
@@ -67,6 +67,7 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.db.entity.room.Room;
import org.apache.openmeetings.db.entity.room.RoomPoll;
import org.apache.openmeetings.db.entity.room.RoomType;
+import org.apache.openmeetings.db.entity.server.LdapConfig;
import org.apache.openmeetings.db.entity.user.Organisation;
import org.apache.openmeetings.db.entity.user.PrivateMessage;
import org.apache.openmeetings.db.entity.user.State;
@@ -229,8 +230,11 @@ public class BackupExport {
/*
* ##################### LDAP Configs
*/
- writeList(simpleSerializer, backup_dir, "ldapconfigs.xml",
- "ldapconfigs", ldapConfigDao.get());
+ List<LdapConfig> ldapList = ldapConfigDao.get();
+ if (!ldapList.isEmpty()) {
+ ldapList.remove(0);
+ }
+ writeList(simpleSerializer, backup_dir, "ldapconfigs.xml",
"ldapconfigs", ldapList);
progressHolder.setProgress(35);
/*
Modified:
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java?rev=1624875&r1=1624874&r2=1624875&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
Sun Sep 14 17:21:44 2014
@@ -445,7 +445,9 @@ public class BackupImport {
{
List<LdapConfig> list = readList(simpleSerializer, f,
"ldapconfigs.xml", "ldapconfigs", LdapConfig.class, true);
for (LdapConfig c : list) {
- ldapConfigDao.addLdapConfigByObject(c);
+ if (!"local DB [internal]".equals(c.getName()))
{
+ ldapConfigDao.addLdapConfigByObject(c);
+ }
}
}
@@ -609,7 +611,7 @@ public class BackupImport {
}
}
- log.info("File explorer item import complete, starting file
poll import");
+ log.info("File explorer item import complete, starting room
poll import");
/*
* ##################### Import Room Polls
*/
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java?rev=1624875&r1=1624874&r2=1624875&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java
Sun Sep 14 17:21:44 2014
@@ -142,7 +142,7 @@ public class PollResultsDialog extends A
}
private String[] getTicks(RoomPoll p) {
- return p.getType().isNumeric()
+ return p != null && p.getType().isNumeric()
? new String[] {"1", "2", "3", "4", "5", "6",
"7", "8", "9", "10"}
: new String[] {WebSession.getString(34),
WebSession.getString(35)};
}
@@ -156,12 +156,12 @@ public class PollResultsDialog extends A
}
private Integer[] getValues(RoomPoll p) {
- Integer[] values = initValues(p.getType().isNumeric() ? 10 : 2);
- if (p.getType().isNumeric()) {
+ Integer[] values = initValues(p != null &&
p.getType().isNumeric() ? 10 : 2);
+ if (p != null && p.getType().isNumeric()) {
for (RoomPollAnswer a : p.getAnswers()) {
values[a.getPointList() - 1] ++;
}
- } else {
+ } else if (p != null) {
for (RoomPollAnswer a : p.getAnswers()) {
values[a.getAnswer() ? 0 : 1] ++;
}
@@ -230,12 +230,12 @@ public class PollResultsDialog extends A
@Override
public Object getDisplayValue(RoomPoll object) {
- return String.format("%s%s",
object.getName(), object.isArchived() ? "" : String.format(" (%s)",
WebSession.getString(1413)));
+ return object == null ? "" :
String.format("%s%s", object.getName(), object.isArchived() ? "" :
String.format(" (%s)", WebSession.getString(1413)));
}
@Override
public String getIdValue(RoomPoll object, int
index) {
- return "" + object.getId();
+ return object == null ? "" : "" +
object.getId();
}
})).add(new AjaxFormComponentUpdatingBehavior("change")
{
private static final long serialVersionUID = 1L;
@@ -250,7 +250,10 @@ public class PollResultsDialog extends A
public void updateModel(AjaxRequestTarget target) {
List<RoomPoll> list = new ArrayList<RoomPoll>();
- list.add(getBean(PollDao.class).getPoll(roomId));
+ RoomPoll p = getBean(PollDao.class).getPoll(roomId);
+ if (p != null) {
+ list.add(p);
+ }
list.addAll(getBean(PollDao.class).getArchived(roomId));
select.setChoices(list);
select.setModelObject(list.isEmpty() ? null :
list.get(0));
@@ -287,10 +290,10 @@ public class PollResultsDialog extends A
public void updateModel(RoomPoll poll, boolean redraw,
AjaxRequestTarget target) {
setModelObject(poll);
- name.setObject(VoteDialog.getName(poll.getCreator()));
- count.setObject(poll.getAnswers().size());
+ name.setObject(poll == null ? "" :
VoteDialog.getName(poll.getCreator()));
+ count.setObject(poll == null ? 0 :
poll.getAnswers().size());
target.add(this);
- close.setVisible(moderator && !poll.isArchived(),
target);
+ close.setVisible(moderator && (poll != null &&
!poll.isArchived()), target);
delete.setVisible(moderator, target);
if (redraw) {
redraw(target);
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.java?rev=1624875&r1=1624874&r2=1624875&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.java
Sun Sep 14 17:21:44 2014
@@ -69,7 +69,7 @@ public class VoteDialog extends Abstract
}
static String getName(User u) {
- return getUserId() == u.getId() ? WebSession.getString(1411) :
u.getFirstname() + " " + u.getLastname();
+ return u == null ? "" : getUserId() == u.getId() ?
WebSession.getString(1411) : u.getFirstname() + " " + u.getLastname();
}
public void updateModel(AjaxRequestTarget target) {
