WARNING: id is very generic, it has been now renamed to booking_id, please fix your...

diff --git a/inc/extensions/ext-booking.php b/inc/extensions/ext-booking.php
index c31b3ced8e4a5cb68c7e484b7c4ceac69da288f0..50cfdf62545f0c193f62fb47594d42e05d369437 100644 (file)
--- a/inc/extensions/ext-booking.php
+++ b/inc/extensions/ext-booking.php
@@ -56,7 +56,7 @@ switch (getExtensionMode()) {
                // Drop/create table for user bookings
                addDropTableSql('user_booking');
                addCreateTableSql('user_booking', "
-`id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
+`booking_id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 `userid` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 `subject` VARCHAR(255) NOT NULL DEFAULT 'missing',
 `points_mode` ENUM('ADD','SUB') NOT NULL DEFAULT 'ADD',

diff --git a/templates/de/html/admin/admin_list_booking.tpl b/templates/de/html/admin/admin_list_booking.tpl
index 79774d102a920debc1d66d8eeaed5420f8f7e9fc..838f346702ea1063305c326b0d79f416e833fa74 100644 (file)
--- a/templates/de/html/admin/admin_list_booking.tpl
+++ b/templates/de/html/admin/admin_list_booking.tpl
@@ -32,7 +32,7 @@
 $content
 <tr>
        <td colspan="7" class="table_footer" align="center">
-               <input type="hidden" name="id[0]" value="1" />
+               <input type="hidden" name="booking_id[0]" value="1" />
                <input type="hidden" name="userid" value="{%get,bigintval=userid%}" />
                <input type="submit" class="form_delete" name="do_delete" value="{--ADMIN_ACTION_DELETE_BOOKING_SUBMIT--}" />
        </td>

diff --git a/templates/de/html/admin/admin_list_booking_row.tpl b/templates/de/html/admin/admin_list_booking_row.tpl
index 2a2f0d276521dc6b3b05808e0b6b608f9e666611..2d693dc82e7a41b1b3b2707de9e3e49e591614ae 100644 (file)
--- a/templates/de/html/admin/admin_list_booking_row.tpl
+++ b/templates/de/html/admin/admin_list_booking_row.tpl
@@ -1,6 +1,6 @@
 <tr>
        <td align="center" class="bottom right {%template,ColorSwitch%}">
-               <strong>$content[id]</strong>
+               <strong>$content[booking_id]</strong>
        </td>
        <td align="center" class="bottom right {%template,ColorSwitch%}">
                {%pipe,translatePointsSubject=$content[subject]%}

diff --git a/templates/de/html/ext/ext_booking.tpl b/templates/de/html/ext/ext_booking.tpl
index 102f28999412a25b3fa4591083c04848f502fa15..2b67af4539bb6b1647d864183a485ba4fd92416a 100644 (file)
--- a/templates/de/html/ext/ext_booking.tpl
+++ b/templates/de/html/ext/ext_booking.tpl
@@ -1,3 +1,5 @@
-Ein Kontoauszug aller Auf- und Abbuchungen, die Ihre Mitglieder erhalten haben.
-Sie können den Bereinigungsinterval für veraltete Einträge, sowie
-die Anzahl Einträge pro Seite einstellen.
+<div class="para">
+       Ein Kontoauszug aller Auf- und Abbuchungen, die Ihre Mitglieder erhalten
+       haben. Sie k&ouml;nnen den Bereinigungsinterval f&uuml;r veraltete
+       Eintr&auml;ge, sowie die Anzahl Eintr&auml;ge pro Seite einstellen.
+</div>

diff --git a/templates/xml/admin/admin_delete_do_booking.xml b/templates/xml/admin/admin_delete_do_booking.xml
index 07a62058e4d708a344e6a0c47f2fce4bca73802b..38c6ca7d24a8d1e686cc47fca82568a620e52039 100644 (file)
--- a/templates/xml/admin/admin_delete_do_booking.xml
+++ b/templates/xml/admin/admin_delete_do_booking.xml
@@ -60,7 +60,7 @@ MA  02110-1301  USA
        The table column which should be taken for the ids (see first parameter).
        This' type can again only be 'string' (remember why?).
        //-->
-       <table-id-column name="" type="string" value="id" />
+       <table-id-column name="" type="string" value="booking_id" />
        <!--
        The table column which should be taken for user ids
        This' type can again only be 'string' (remember why?).

diff --git a/templates/xml/admin/admin_list_booking.xml b/templates/xml/admin/admin_list_booking.xml
index e754b13aa2d28450170416727d71031e149c8de4..f4fb7b70b03cab426baf572bf7f05cdbc1a130c1 100644 (file)
--- a/templates/xml/admin/admin_list_booking.xml
+++ b/templates/xml/admin/admin_list_booking.xml
@@ -64,7 +64,7 @@ MA  02110-1301  USA
                        always be set), alias (again can be left empty) and SQL function
                        (can also be left empty) which shall be applied on the column.
                        //-->
-                       <select-data-from-list-entry type="string" table="" value="id" alias="" function="" />
+                       <select-data-from-list-entry type="string" table="" value="booking_id" alias="" function="" />
                        <select-data-from-list-entry type="string" table="" value="userid" alias="" function="" />
                        <select-data-from-list-entry type="string" table="" value="subject" alias="" function="" />
                        <select-data-from-list-entry type="string" table="" value="points_mode" alias="" function="" />