Author: solomax
Date: Thu Mar 21 05:54:38 2013
New Revision: 1459163
URL: http://svn.apache.org/r1459163
Log:
[OPENMEETINGS-572], [OPENMEETINGS-243] additional null valued fields are
displayed properly
Modified:
openmeetings/branches/2.1/WebContent/src/modules/admin/confadmin/confAdminValueForm.lzx
openmeetings/branches/2.1/WebContent/src/modules/admin/ldap/ldapAdminValueForm.lzx
openmeetings/branches/2.1/WebContent/src/modules/admin/roomadmin/roomValueForm.lzx
openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/confadmin/confAdminValueForm.lzx
openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/ldap/ldapAdminValueForm.lzx
openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/roomadmin/roomValueForm.lzx
Modified:
openmeetings/branches/2.1/WebContent/src/modules/admin/confadmin/confAdminValueForm.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/2.1/WebContent/src/modules/admin/confadmin/confAdminValueForm.lzx?rev=1459163&r1=1459162&r2=1459163&view=diff
==============================================================================
---
openmeetings/branches/2.1/WebContent/src/modules/admin/confadmin/confAdminValueForm.lzx
(original)
+++
openmeetings/branches/2.1/WebContent/src/modules/admin/confadmin/confAdminValueForm.lzx
Thu Mar 21 05:54:38 2013
@@ -69,12 +69,8 @@
this.comment.setAttribute('text',obj.comment);
this.conf_key.setAttribute('text',obj.conf_key);
this.conf_value.setAttribute('text',obj.conf_value);
- this.updatetime.setAttribute('text',obj.updatetime);
- if(obj.users!=null){
-
this.users_login.setAttribute('text',obj.user.login);
- } else {
- this.users_login.setAttribute('text','');
- }
+ this.updatetime.setAttribute('text',
canvas.getNotNullString(obj.updatetime));
+ this.users_login.setAttribute('text',
canvas.getNotNullString(obj.user.login));
]]>
</method>
Modified:
openmeetings/branches/2.1/WebContent/src/modules/admin/ldap/ldapAdminValueForm.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/2.1/WebContent/src/modules/admin/ldap/ldapAdminValueForm.lzx?rev=1459163&r1=1459162&r2=1459163&view=diff
==============================================================================
---
openmeetings/branches/2.1/WebContent/src/modules/admin/ldap/ldapAdminValueForm.lzx
(original)
+++
openmeetings/branches/2.1/WebContent/src/modules/admin/ldap/ldapAdminValueForm.lzx
Thu Mar 21 05:54:38 2013
@@ -101,7 +101,7 @@
this.isActive.setValue(false);
}
- if (this.updated != null) {
+ if (obj.updated != null) {
this.updated.setAttribute('text',obj.updated);
} else {
this.updated.setAttribute('text','');
@@ -112,7 +112,7 @@
this.updatedby.setAttribute('text','');
}
- if (this.inserted != null) {
+ if (obj.inserted != null) {
this.inserted.setAttribute('text',obj.inserted);
} else {
this.inserted.setAttribute('text','');
Modified:
openmeetings/branches/2.1/WebContent/src/modules/admin/roomadmin/roomValueForm.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/2.1/WebContent/src/modules/admin/roomadmin/roomValueForm.lzx?rev=1459163&r1=1459162&r2=1459163&view=diff
==============================================================================
---
openmeetings/branches/2.1/WebContent/src/modules/admin/roomadmin/roomValueForm.lzx
(original)
+++
openmeetings/branches/2.1/WebContent/src/modules/admin/roomadmin/roomValueForm.lzx
Thu Mar 21 05:54:38 2013
@@ -102,7 +102,7 @@
this.rooms_id = obj.rooms_id;
this.roomname.setAttribute('text',obj.name);
- this.comment.setAttribute('text',obj.comment);
+ this.comment.setAttribute('text',
canvas.getNotNullString(obj.comment));
this.ispublic.setValue(obj.ispublic);
this.demoTime.setAttribute("enabled",true);
if ($debug) Debug.write("Appointment:
",obj.appointment);
@@ -150,7 +150,7 @@
this.isClosed.setValue(false);
}
- this.redirectURL.setAttribute("text",obj.redirectURL);
+ this.redirectURL.setAttribute("text",
canvas.getNotNullString(obj.redirectURL));
this.numberOfParticipants.selectItem(String(obj.numberOfPartizipants));
this.roomtype.selectItem(String(obj.roomtype.roomtypes_id));
Modified:
openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/confadmin/confAdminValueForm.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/confadmin/confAdminValueForm.lzx?rev=1459163&r1=1459162&r2=1459163&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/confadmin/confAdminValueForm.lzx
(original)
+++
openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/confadmin/confAdminValueForm.lzx
Thu Mar 21 05:54:38 2013
@@ -69,12 +69,8 @@
this.comment.setAttribute('text',obj.comment);
this.conf_key.setAttribute('text',obj.conf_key);
this.conf_value.setAttribute('text',obj.conf_value);
- this.updatetime.setAttribute('text',obj.updatetime);
- if(obj.users!=null){
-
this.users_login.setAttribute('text',obj.user.login);
- } else {
- this.users_login.setAttribute('text','');
- }
+ this.updatetime.setAttribute('text',
canvas.getNotNullString(obj.updatetime));
+ this.users_login.setAttribute('text',
canvas.getNotNullString(obj.user.login));
]]>
</method>
Modified:
openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/ldap/ldapAdminValueForm.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/ldap/ldapAdminValueForm.lzx?rev=1459163&r1=1459162&r2=1459163&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/ldap/ldapAdminValueForm.lzx
(original)
+++
openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/ldap/ldapAdminValueForm.lzx
Thu Mar 21 05:54:38 2013
@@ -101,7 +101,7 @@
this.isActive.setValue(false);
}
- if (this.updated != null) {
+ if (obj.updated != null) {
this.updated.setAttribute('text',obj.updated);
} else {
this.updated.setAttribute('text','');
@@ -112,7 +112,7 @@
this.updatedby.setAttribute('text','');
}
- if (this.inserted != null) {
+ if (obj.inserted != null) {
this.inserted.setAttribute('text',obj.inserted);
} else {
this.inserted.setAttribute('text','');
Modified:
openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/roomadmin/roomValueForm.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/roomadmin/roomValueForm.lzx?rev=1459163&r1=1459162&r2=1459163&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/roomadmin/roomValueForm.lzx
(original)
+++
openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/roomadmin/roomValueForm.lzx
Thu Mar 21 05:54:38 2013
@@ -102,7 +102,7 @@
this.rooms_id = obj.rooms_id;
this.roomname.setAttribute('text',obj.name);
- this.comment.setAttribute('text',obj.comment);
+ this.comment.setAttribute('text',
canvas.getNotNullString(obj.comment));
this.ispublic.setValue(obj.ispublic);
this.demoTime.setAttribute("enabled",true);
if ($debug) Debug.write("Appointment:
",obj.appointment);
@@ -150,7 +150,7 @@
this.isClosed.setValue(false);
}
- this.redirectURL.setAttribute("text",obj.redirectURL);
+ this.redirectURL.setAttribute("text",
canvas.getNotNullString(obj.redirectURL));
this.numberOfParticipants.selectItem(String(obj.numberOfPartizipants));
this.roomtype.selectItem(String(obj.roomtype.roomtypes_id));
