Skip to content

Commit

Permalink
mvc: first scoping fix was before for, that obviously didn't work; cl…
Browse files Browse the repository at this point in the history 
…oses #1245
  • Loading branch information
@fichtner
fichtner committed Mar 25, 2017
1 parent 465cd35 commit 867a9a9
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 19 deletions.
2 changes: 1 addition & 1 deletion src/opnsense/mvc/app/views/layout_partials/base_dialog.volt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,9 @@ label : dialog label
</tr>
{% endif %}
{% for field in base_dialog_fields|default({})%}
{# looks a bit buggy in the volt templates, field parameters won't reset properly here #}
{% set advanced=false %}
{% set help=false %}
{% set style=false %}
{% set hint=false %}
{% set style=false %}
{% set maxheight=false %}
Expand Down
26 changes: 8 additions & 18 deletions src/opnsense/mvc/app/views/layout_partials/base_form.volt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,15 +66,15 @@ data_title : data-title to set on form
{% if help|default(false) %}<small>{{ lang._('full help') }} </small><a href="#"><i class="fa fa-toggle-off text-danger" id="show_all_help_{{base_form_id}}" type="button"></i></a>{% endif %}
</td>
</tr>
{% set advanced=false %}
{% set help=false %}
{% set style=false %}
{% set hint=false %}
{% set style=false %}
{% set maxheight=false %}
{% set width=false %}
{% set allownew=false %}
{% for field in fields|default({})%}
{# looks a bit buggy in the volt templates, field parameters won't reset properly here #}
{% set advanced=false %}
{% set help=false %}
{% set hint=false %}
{% set style=false %}
{% set maxheight=false %}
{% set width=false %}
{% set allownew=false %}
{% if field['type'] == 'header' %}
{# close table and start new one with header #}
Expand All @@ -100,16 +100,6 @@ data_title : data-title to set on form
{% else %}
{{ partial("layout_partials/form_input_tr",field)}}
{% endif %}

{# looks a bit buggy in the volt templates, field parameters won't reset properly here #}
{% set advanced=false %}
{% set help=false %}
{% set style=false %}
{% set hint=false %}
{% set style=false %}
{% set maxheight=false %}
{% set width=false %}
{% set allownew=false %}
{% endfor %}
{% if apply_btn_id|default('') != '' %}
<tr>
Expand Down

2 comments on commit 867a9a9

@fichtner
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@AdSchellevis I found out why you had to add the second block ;)

@AdSchellevis
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@fichtner oops, you're right, the field tag itself wasn't the issue, for some vague reason I was under the impression that I couldn't move it to the top and failed to try ;) thanks!

Please sign in to comment.