Skip to content

Commit

Permalink
[FIX] formio: settings view (res.config.settings).
Browse files Browse the repository at this point in the history 
Some settings and info appeared while searching for other settings.
Fixes #164
  • Loading branch information
@bobslee
bobslee committed Oct 28, 2021
1 parent 5cecb14 commit 34df49d
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 28 deletions.
5 changes: 5 additions & 0 deletions formio/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Changelog

### 8.34

- Fix settings view (res.config.settings). Some settings and info appeared while searching for other settings.
Issue: [\#164](https://github.com/novacode-nl/odoo-formio/issues/164)

### 8.33

- Fix warning: `Two fields (formio_version_name, formio_version_id) of formio.builder() have the same label.`
Expand Down
2 changes: 1 addition & 1 deletion formio/__manifest__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
{
'name': 'Forms',
'summary': 'Form Builder & integration of professional and versatile Forms to collect any information you need for your business.',
'version': '8.33',
'version': '8.34',
'license': 'LGPL-3',
'author': 'Nova Code',
'website': 'https://www.novacode.nl',
Expand Down
52 changes: 25 additions & 27 deletions formio/views/res_config_settings_views.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html) -->
<xpath expr="//div[hasclass('settings')]" position="inside">
<div class="app_settings_block" data-string="Forms" data-key="formio">
<h2>formio.js library (js, css) version importer</h2>
<div class="row mt16 o_settings_container formio_version">
<div class="col-12 col-md-6 o_setting_box">
<div class="row mt16 o_settings_container" name="formio_version">
<div class="col-12 col-md-6 o_setting_box" id="formio_default_version">
<div class="o_setting_left_pane"/>
<div class="o_setting_right_pane">
<div class="row">
Expand All @@ -24,7 +24,7 @@ License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html) -->
</div>
</div>
</div>
<div class="col-12 col-md-6 o_setting_box">
<div class="col-12 col-md-6 o_setting_box" id="formio_verion_github_importer">
<div class="o_setting_left_pane"/>
<div class="o_setting_right_pane">
<strong>Check, register and install the latest 30 available Versions</strong>
Expand All @@ -50,14 +50,13 @@ License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html) -->
</div>
</div>
<h2>Default CSS assets</h2>
<div class="row mt16 o_settings_container formio_assets">
<div class="text-muted">
Add additional CSS files to be included for every new installed formio client/library.
</div>
<div class="o_setting_left_pane"/>
<div class="o_setting_right_pane">
<div class="col-12 col-md-12 o_setting_box">
<div class="row">
<div class="row mt16 o_settings_container" name="formio_assets">
<div class="col-12 col-md-12 o_setting_box">
<div class="text-muted mb32">
Add additional CSS files to be included for every new installed formio client/library.
</div>

<div class="row ml16">
<field name="formio_default_asset_css_ids">
<tree editable="bottom">
<field name="url" widget="url"/>
Expand All @@ -66,45 +65,44 @@ License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html) -->
</tree>
</field>
</div>
</div>
</div>
</div>
<h2>Components</h2>
<div class="row mt16 o_settings_container formio_components">
<div class="text-muted">
Custom and 3rd-party Component settings.
</div>
<div class="row mt16 o_settings_container" name="formio_components">
<div class="col-xs-12 col-md-6 o_setting_box">
<div class="text-muted">
Custom and 3rd-party Component settings.
</div>
<div class="o_setting_left_pane"/>
<div class="o_setting_right_pane">
</div>
</div>
</div>
<h2>Default Form Builder formio.js Options Template</h2>
<div class="row mt16 o_settings_container formio_default_builder_js_options">
<div class="text-muted">
Select a default Form Builder JavaScript Options Template.<br/>
It's contents, the Form Builder JavaScript Options, shall be shown below.
</div>

<div class="row mt16 o_settings_container" name="formio_default_builder_js_options">
<div class="col-12 col-md-12 o_setting_box">
<div class="row">
<div class="text-muted mb32">
Select a default Form Builder JavaScript Options Template.<br/>
It's contents, the Form Builder JavaScript Options, shall be shown below.
</div>
<div class="o_setting_left_pane"/>
<!-- <div class="row"> -->
<div class="o_setting_right_pane">
<label for="formio_default_builder_js_options_id" string="Options Template"/>
<field name="formio_default_builder_js_options_id"/>
</div>
<div class="row">
<code><field name="formio_default_builder_js_options"/></code>
</div>
</div>

<div class="row">
<div class="col-12 col-md-12 text-muted">
<div class="col-12 col-md-12 o_setting_box">
<div class="text-muted">
<strong>Example below</strong>. Options could contain the Form Builder "editForm" with some "File" component settings:<br/>
<a href="https://github.com/formio/formio.js/blob/master/src/components/file/editForm/File.edit.file.js" target="_blank">
https://github.com/formio/formio.js/blob/master/src/components/file/editForm/File.edit.file.js
</a>
</div>
<div class="col-12 col-md-12">
<div>
<pre style="background-color: #e9ecef;">{
'editForm': {
'file': [
Expand Down

0 comments on commit 34df49d

Please sign in to comment.