Author: solomax
Date: Wed May 13 04:41:24 2015
New Revision: 1679137
URL: http://svn.apache.org/r1679137
Log:
[OPENMEETINGS-1207] Poll type is being displayed as expected
Modified:
openmeetings/branches/3.0.x/WebContent/src/base/functions.lzx
openmeetings/branches/3.0.x/WebContent/src/modules/conference/polls/createPollWin.lzx
Modified: openmeetings/branches/3.0.x/WebContent/src/base/functions.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/WebContent/src/base/functions.lzx?rev=1679137&r1=1679136&r2=1679137&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/WebContent/src/base/functions.lzx (original)
+++ openmeetings/branches/3.0.x/WebContent/src/base/functions.lzx Wed May 13
04:41:24 2015
@@ -87,9 +87,7 @@ function setLabelObjectByHundred(no,obj)
function getLabelTag(labelid){
var l = labels["id" + labelid];
- if (l != undefined) {
- if ($debug) l += " [" + labelid + "]";
- } else {
+ if (l == undefined) {
l = "Error Missing [" + labelid + "]";
}
return l;
Modified:
openmeetings/branches/3.0.x/WebContent/src/modules/conference/polls/createPollWin.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/WebContent/src/modules/conference/polls/createPollWin.lzx?rev=1679137&r1=1679136&r2=1679137&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/WebContent/src/modules/conference/polls/createPollWin.lzx
(original)
+++
openmeetings/branches/3.0.x/WebContent/src/modules/conference/polls/createPollWin.lzx
Wed May 13 04:41:24 2015
@@ -43,7 +43,7 @@
//The onResult-Handler will be called be the
rtmpconnection
if ($debug) Debug.write("getPollTypeList :
",value)
for (var i = 0; i < value.length; ++i) {
-
this.parent._polltypes.addItem(canvas.getLabelName(value[i].label.fieldvalues_id),
value[i].pollTypesId);
+
this.parent._polltypes.addItem(canvas.getLabelName(value[i].label),
value[i].pollTypesId);
}
this.parent._polltypes.selectItem(value[0].pollTypesId);
]]>
