[MERGE] forward port of branch 8.0 up to 0aab81c

2015-01-19 17:15:56 +01:00
parent f6e5bf847b 0aab81cd3a
commit 18e22be138
272 changed files with 2480 additions and 1214 deletions
@@ -215,6 +215,15 @@
                            <input t-if="!widget.db_list" name="backup_db" class="required" type="text" autofocus="autofocus"/>
                        </td>
                    </tr>
+                    <tr>
+                        <td><label for="backup_format">Backup format:</label></td>
+                        <td class="oe_form_field oe_form_field_selection">
+                            <select name="backup_format">
+                                <option value="zip">zip (includes filestore)</option>
+                                <option value="dump">pg_dump custom format (without filestore)</option>
+                            </select>
+                        </td>
+                    </tr>
                    <tr>
                        <td><label for="backup_pwd">Master Password:</label></td>
                        <td><input type="password" name="backup_pwd" class="required" /></td>