You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by vd...@apache.org on 2016/12/22 10:17:22 UTC
svn commit: r1775608 - in /openmeetings/application:
branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/
branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/
trunk/openmeetings-web/src/ma...
Author: vdegtyarev
Date: Thu Dec 22 10:17:22 2016
New Revision: 1775608
URL: http://svn.apache.org/viewvc?rev=1775608&view=rev
Log:
OPENMEETINGS-1524 is fixed. Poll's question is shown.
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java?rev=1775608&r1=1775607&r2=1775608&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java Thu Dec 22 10:17:22 2016
@@ -322,6 +322,7 @@ public class PollResultsDialog extends A
private final String SIMPLE_CHART = Application.getString(1414);
private final String PIE_CHART = Application.getString(1415);
private final IModel<String> name = Model.of((String)null);
+ private final IModel<String> question = Model.of((String)null);
private final IModel<Integer> count = Model.of(0);
private final DropDownChoice<String> chartType = new DropDownChoice<String>("chartType", Model.of(SIMPLE_CHART), Arrays.asList(SIMPLE_CHART, PIE_CHART));
@@ -329,7 +330,7 @@ public class PollResultsDialog extends A
super(id, Model.of((RoomPoll)null));
setOutputMarkupId(true);
add(new Label("name", name));
- add(new Label("question"));
+ add(new Label("question", question));
add(new Label("count", count));
add(chartType.add(new AjaxFormComponentUpdatingBehavior("change") {
private static final long serialVersionUID = 1L;
@@ -345,6 +346,7 @@ public class PollResultsDialog extends A
public void updateModel(RoomPoll poll, boolean redraw, IPartialPageRequestHandler handler) {
setModelObject(poll);
name.setObject(poll == null ? "" : VoteDialog.getName(poll.getCreator()));
+ question.setObject(poll == null ? "" : poll.getQuestion());
count.setObject(poll == null ? 0 : poll.getAnswers().size());
handler.add(this);
close.setVisible(moderator && (poll != null && !poll.isArchived()), handler);
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java?rev=1775608&r1=1775607&r2=1775608&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java Thu Dec 22 10:17:22 2016
@@ -322,6 +322,7 @@ public class PollResultsDialog extends A
private final String SIMPLE_CHART = Application.getString(1414);
private final String PIE_CHART = Application.getString(1415);
private final IModel<String> name = Model.of((String)null);
+ private final IModel<String> question = Model.of((String)null);
private final IModel<Integer> count = Model.of(0);
private final DropDownChoice<String> chartType = new DropDownChoice<String>("chartType", Model.of(SIMPLE_CHART), Arrays.asList(SIMPLE_CHART, PIE_CHART));
@@ -329,7 +330,7 @@ public class PollResultsDialog extends A
super(id, Model.of((RoomPoll)null));
setOutputMarkupId(true);
add(new Label("name", name));
- add(new Label("question"));
+ add(new Label("question", question));
add(new Label("count", count));
add(chartType.add(new AjaxFormComponentUpdatingBehavior("change") {
private static final long serialVersionUID = 1L;
@@ -345,6 +346,7 @@ public class PollResultsDialog extends A
public void updateModel(RoomPoll poll, boolean redraw, IPartialPageRequestHandler handler) {
setModelObject(poll);
name.setObject(poll == null ? "" : VoteDialog.getName(poll.getCreator()));
+ question.setObject(poll == null ? "" : poll.getQuestion());
count.setObject(poll == null ? 0 : poll.getAnswers().size());
handler.add(this);
close.setVisible(moderator && (poll != null && !poll.isArchived()), handler);
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java?rev=1775608&r1=1775607&r2=1775608&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java Thu Dec 22 10:17:22 2016
@@ -322,6 +322,7 @@ public class PollResultsDialog extends A
private final String SIMPLE_CHART = Application.getString(1414);
private final String PIE_CHART = Application.getString(1415);
private final IModel<String> name = Model.of((String)null);
+ private final IModel<String> question = Model.of((String)null);
private final IModel<Integer> count = Model.of(0);
private final DropDownChoice<String> chartType = new DropDownChoice<String>("chartType", Model.of(SIMPLE_CHART), Arrays.asList(SIMPLE_CHART, PIE_CHART));
@@ -329,7 +330,7 @@ public class PollResultsDialog extends A
super(id, Model.of((RoomPoll)null));
setOutputMarkupId(true);
add(new Label("name", name));
- add(new Label("question"));
+ add(new Label("question", question));
add(new Label("count", count));
add(chartType.add(new AjaxFormComponentUpdatingBehavior("change") {
private static final long serialVersionUID = 1L;
@@ -345,6 +346,7 @@ public class PollResultsDialog extends A
public void updateModel(RoomPoll poll, boolean redraw, IPartialPageRequestHandler handler) {
setModelObject(poll);
name.setObject(poll == null ? "" : VoteDialog.getName(poll.getCreator()));
+ question.setObject(poll == null ? "" : poll.getQuestion());
count.setObject(poll == null ? 0 : poll.getAnswers().size());
handler.add(this);
close.setVisible(moderator && (poll != null && !poll.isArchived()), handler);