From 2aa4fbfdc4d2db81a121353c56c60f6641f86b9c Mon Sep 17 00:00:00 2001 From: Thorge Petersen <petersen@rz.uni-kiel.de> Date: Mon, 16 Sep 2024 15:34:54 +0200 Subject: [PATCH] Removed deprecated dataset-form and dataset-resource-form classes --- .../odsh/templates/organization/snippets/organization_form.html | 2 +- ckanext/odsh/templates/package/edit_view.html | 2 +- ckanext/odsh/templates/package/new_view.html | 2 +- ckanext/odsh/templates/package/snippets/package_form.html | 2 +- ckanext/odsh/templates/package/snippets/resource_form.html | 2 +- ckanext/odsh/templates/user/edit_user_form.html | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ckanext/odsh/templates/organization/snippets/organization_form.html b/ckanext/odsh/templates/organization/snippets/organization_form.html index 77797c54..89b3397b 100644 --- a/ckanext/odsh/templates/organization/snippets/organization_form.html +++ b/ckanext/odsh/templates/organization/snippets/organization_form.html @@ -1,6 +1,6 @@ {% import 'macros/form.html' as form %} -<form id='organization-edit-form' class="dataset-form form-horizontal" method="post" data-module="basic-form" enctype="multipart/form-data"> +<form id='organization-edit-form' class="form-horizontal" method="post" data-module="basic-form" enctype="multipart/form-data"> {{ h.csrf_input() }} {% block error_summary %} {{ form.errors(error_summary) }} diff --git a/ckanext/odsh/templates/package/edit_view.html b/ckanext/odsh/templates/package/edit_view.html index 92eb2ced..b2c6a316 100644 --- a/ckanext/odsh/templates/package/edit_view.html +++ b/ckanext/odsh/templates/package/edit_view.html @@ -13,7 +13,7 @@ {% endblock %} {% block form %} -<form class="dataset-form dataset-resource-form form-horizontal" method="post" data-module="basic-form resource-form"> +<form class="form-horizontal" method="post" data-module="basic-form resource-form"> {% include 'package/snippets/view_form.html' %} <div class="form-actions"> <button class="btn btn-danger pull-left" name="delete" value="Delete"> {{ _('Delete') }} </button> diff --git a/ckanext/odsh/templates/package/new_view.html b/ckanext/odsh/templates/package/new_view.html index ff0d2893..e5104883 100644 --- a/ckanext/odsh/templates/package/new_view.html +++ b/ckanext/odsh/templates/package/new_view.html @@ -24,7 +24,7 @@ </p> {% endif %} -<form class="dataset-form dataset-resource-form form-horizontal" method="post" data-module="basic-form resource-form"> +<form class="form-horizontal" method="post" data-module="basic-form resource-form"> {% include 'package/snippets/view_form.html' %} <div class="form-actions"> <button class="btn {% if not h.resource_view_display_preview(data) %}hide{%endif%}" name="preview" value="True" diff --git a/ckanext/odsh/templates/package/snippets/package_form.html b/ckanext/odsh/templates/package/snippets/package_form.html index 2cb0e5cc..a8a57f88 100644 --- a/ckanext/odsh/templates/package/snippets/package_form.html +++ b/ckanext/odsh/templates/package/snippets/package_form.html @@ -2,7 +2,7 @@ {% set action = g.form_action or '' %} {% set form_style = g.form_style or g.action %} -<form id="dataset-edit" class="dataset-form {% if(form_style=='edit') %} dataset-edit-form {%endif%} " method="post" +<form id="dataset-edit" class="{% if(form_style=='edit') %}dataset-edit-form{%endif%}" method="post" action="{{ action }}" data-module="basic-form" novalidate> {{ h.csrf_input() }} {% block stages %} diff --git a/ckanext/odsh/templates/package/snippets/resource_form.html b/ckanext/odsh/templates/package/snippets/resource_form.html index 5adc1346..d67a14ba 100644 --- a/ckanext/odsh/templates/package/snippets/resource_form.html +++ b/ckanext/odsh/templates/package/snippets/resource_form.html @@ -5,7 +5,7 @@ {% set active = data and data.state=='active' %} {% set action = form_action or h.url_for('resource.new', id=pkg_name) %} -<form id="resource-edit" class="dataset-form dataset-resource-form {%if(data)%}resource-edit-form{%endif%}" method="post" action="{{ action }}" data-module="basic-form resource-form" enctype="multipart/form-data" novalidate> +<form id="resource-edit" class="{%if(data)%}resource-edit-form{%endif%}" method="post" action="{{ action }}" data-module="basic-form resource-form" enctype="multipart/form-data" novalidate> {{ h.csrf_input() }} {% block stages %} <div class='search-form'> diff --git a/ckanext/odsh/templates/user/edit_user_form.html b/ckanext/odsh/templates/user/edit_user_form.html index ddfb63c7..887701a8 100644 --- a/ckanext/odsh/templates/user/edit_user_form.html +++ b/ckanext/odsh/templates/user/edit_user_form.html @@ -1,7 +1,7 @@ {% import 'macros/form.html' as form %} {% block form %} - <form id="user-edit-form" class="dataset-form form-horizontal" method="post" action="{{ action }}"> + <form id="user-edit-form" class="form-horizontal" method="post" action="{{ action }}"> {{ h.csrf_input() }} {{ form.errors(error_summary) }} -- GitLab