diff options
| author | Michael Scherle | 2017-03-03 00:15:02 +0100 |
|---|---|---|
| committer | Michael Scherle | 2017-03-03 00:15:02 +0100 |
| commit | ddaa9d0a6553e872d7522538d3be63ed4889251e (patch) | |
| tree | 9241d81d0803c8afe874d17ce9f6901ce4cd13f7 | |
| parent | code reformat (diff) | |
| parent | Changed RoomServerID to String instead of int (diff) | |
| download | slx-admin-ddaa9d0a6553e872d7522538d3be63ed4889251e.tar.gz slx-admin-ddaa9d0a6553e872d7522538d3be63ed4889251e.tar.xz slx-admin-ddaa9d0a6553e872d7522538d3be63ed4889251e.zip | |
Merge branch 'location-info-panel' of git.openslx.org:openslx-ng/slx-admin into location-info-panel
| -rw-r--r-- | modules-available/locationinfo/page.inc.php | 2 | ||||
| -rw-r--r-- | modules-available/locationinfo/templates/config.html | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/modules-available/locationinfo/page.inc.php b/modules-available/locationinfo/page.inc.php index b7a3f570..c2abe93f 100644 --- a/modules-available/locationinfo/page.inc.php +++ b/modules-available/locationinfo/page.inc.php @@ -97,7 +97,7 @@ class Page_LocationInfo extends Page $result['roomupdate'] = Request::post('roomupdate', 30, 'int'); $result['configupdate'] = Request::post('configupdate', 180, 'int'); $serverid = Request::post('serverid', 0, 'int'); - $serverroomid = Request::post('serverroomid', 0, 'int'); + $serverroomid = Request::post('serverroomid','', 'string'); Database::exec("INSERT INTO `location_info` (locationid, serverid, serverroomid, config) VALUES (:id, :serverid, :serverroomid, :config) ON DUPLICATE KEY UPDATE config=:config, serverid=:serverid, serverroomid=:serverroomid", diff --git a/modules-available/locationinfo/templates/config.html b/modules-available/locationinfo/templates/config.html index 778b5c55..5e221756 100644 --- a/modules-available/locationinfo/templates/config.html +++ b/modules-available/locationinfo/templates/config.html @@ -16,7 +16,7 @@ <div style="float: left; margin-left: 15px;"> <Label>{{lang_serverRoomId}}</Label><br> - <input name="serverroomid" id="serverroomid" value="{{serverroomid}}" style="width: 50px; text-align: center;"></input> + <input name="serverroomid" id="serverroomid" value="{{serverroomid}}" style="width: 250px; text-align: center;"></input> </div> |