svn commit: r1640748 - in /openmeetings: branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java

[solomax]

Author: solomax
Date: Thu Nov 20 14:53:00 2014
New Revision: 1640748

URL: http://svn.apache.org/r1640748
Log:
[OPENMEETINGS-1127] room type is made required

Modified:
    
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
    
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java

Modified: 
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java?rev=1640748&r1=1640747&r2=1640748&view=diff
==============================================================================
--- 
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
 (original)
+++ 
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
 Thu Nov 20 14:53:00 2014
@@ -109,7 +109,7 @@ public class RoomForm extends AdminBaseF
                                }));
 
                add(new DropDownChoice<RoomType>("roomtype", 
Application.getBean(RoomTypeDao.class).getAll(WebSession.getLanguage()),
-                               new ChoiceRenderer<RoomType>("label.value", 
"roomtypes_id")));
+                               new ChoiceRenderer<RoomType>("label.value", 
"roomtypes_id")).setRequired(true).setLabel(Model.of(WebSession.getString(194))));
 
                add(new TextArea<String>("comment"));
 

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=1640748&r1=1640747&r2=1640748&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
 Thu Nov 20 14:53:00 2014
@@ -106,7 +106,7 @@ public class RoomForm extends AdminBaseF
                                        }
                                }));
 
-               add(new RoomTypeDropDown("roomtype"));
+               add(new 
RoomTypeDropDown("roomtype").setRequired(true).setLabel(Model.of(WebSession.getString(194))));
 
                add(new TextArea<String>("comment"));