From c82dbac396ff11b5d7eaa7742dfd1f5e24bc5300 Mon Sep 17 00:00:00 2001 From: EricOuma Date: Sat, 6 Nov 2021 17:08:28 +0300 Subject: [PATCH 1/5] update to language based title --- .idea/.gitignore | 8 ++ .idea/aws.xml | 11 +++ .idea/django-forms-fieldset.iml | 20 +++++ .idea/inspectionProfiles/Project_Default.xml | 81 +++++++++++++++++++ .../inspectionProfiles/profiles_settings.xml | 6 ++ .idea/modules.xml | 8 ++ .idea/vcs.xml | 6 ++ .../templates/forms_fieldset/tabular.html | 2 +- 8 files changed, 141 insertions(+), 1 deletion(-) create mode 100644 .idea/.gitignore create mode 100644 .idea/aws.xml create mode 100644 .idea/django-forms-fieldset.iml create mode 100644 .idea/inspectionProfiles/Project_Default.xml create mode 100644 .idea/inspectionProfiles/profiles_settings.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/vcs.xml diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..73f69e0 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml +# Editor-based HTTP Client requests +/httpRequests/ diff --git a/.idea/aws.xml b/.idea/aws.xml new file mode 100644 index 0000000..b63b642 --- /dev/null +++ b/.idea/aws.xml @@ -0,0 +1,11 @@ + + + + + + \ No newline at end of file diff --git a/.idea/django-forms-fieldset.iml b/.idea/django-forms-fieldset.iml new file mode 100644 index 0000000..458e202 --- /dev/null +++ b/.idea/django-forms-fieldset.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 0000000..2d8cbe5 --- /dev/null +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,81 @@ + + + + \ No newline at end of file diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml new file mode 100644 index 0000000..105ce2d --- /dev/null +++ b/.idea/inspectionProfiles/profiles_settings.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..6264eea --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/forms_fieldset/templates/forms_fieldset/tabular.html b/forms_fieldset/templates/forms_fieldset/tabular.html index 632dd7d..4026bcd 100644 --- a/forms_fieldset/templates/forms_fieldset/tabular.html +++ b/forms_fieldset/templates/forms_fieldset/tabular.html @@ -35,7 +35,7 @@

{{ label }}

{% endfor %} - Ajout supplémentaire + {{ title_add }} From 1962d12e2e998fe6a127e57ca3e1229cd50f044d Mon Sep 17 00:00:00 2001 From: EricOuma Date: Sat, 6 Nov 2021 17:11:02 +0300 Subject: [PATCH 2/5] updates --- .gitignore | 3 + .idea/.gitignore | 8 -- .idea/aws.xml | 11 --- .idea/django-forms-fieldset.iml | 20 ----- .idea/inspectionProfiles/Project_Default.xml | 81 ------------------- .../inspectionProfiles/profiles_settings.xml | 6 -- .idea/modules.xml | 8 -- .idea/vcs.xml | 6 -- 8 files changed, 3 insertions(+), 140 deletions(-) delete mode 100644 .idea/.gitignore delete mode 100644 .idea/aws.xml delete mode 100644 .idea/django-forms-fieldset.iml delete mode 100644 .idea/inspectionProfiles/Project_Default.xml delete mode 100644 .idea/inspectionProfiles/profiles_settings.xml delete mode 100644 .idea/modules.xml delete mode 100644 .idea/vcs.xml diff --git a/.gitignore b/.gitignore index b6e4761..51d82d6 100644 --- a/.gitignore +++ b/.gitignore @@ -127,3 +127,6 @@ dmypy.json # Pyre type checker .pyre/ + +# Pycharm stuff +.idea/ diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index 73f69e0..0000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml -# Datasource local storage ignored files -/dataSources/ -/dataSources.local.xml -# Editor-based HTTP Client requests -/httpRequests/ diff --git a/.idea/aws.xml b/.idea/aws.xml deleted file mode 100644 index b63b642..0000000 --- a/.idea/aws.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/django-forms-fieldset.iml b/.idea/django-forms-fieldset.iml deleted file mode 100644 index 458e202..0000000 --- a/.idea/django-forms-fieldset.iml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml deleted file mode 100644 index 2d8cbe5..0000000 --- a/.idea/inspectionProfiles/Project_Default.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml deleted file mode 100644 index 105ce2d..0000000 --- a/.idea/inspectionProfiles/profiles_settings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 6264eea..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 94a25f7..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file From 80723a5dfb2204cda97bbb1070a133b6e92d838d Mon Sep 17 00:00:00 2001 From: EricOuma Date: Sat, 6 Nov 2021 20:25:37 +0300 Subject: [PATCH 3/5] support multiple formsets --- .../templates/forms_fieldset/tabular.html | 115 +++++++++--------- 1 file changed, 59 insertions(+), 56 deletions(-) diff --git a/forms_fieldset/templates/forms_fieldset/tabular.html b/forms_fieldset/templates/forms_fieldset/tabular.html index 4026bcd..7db5909 100644 --- a/forms_fieldset/templates/forms_fieldset/tabular.html +++ b/forms_fieldset/templates/forms_fieldset/tabular.html @@ -1,51 +1,54 @@ -
+
{{ inline_formset.management_form }}
-

{{ label }}

- {{ inline_formset.non_form_errors }} - - - - {% for field in inline_formset.0 %} - - {% endfor %} - - +

{{ label }}

+ {{ inline_formset.non_form_errors }} +
- {% if not field.is_hidden %} - {{ field.label_tag }} - {% endif %} -
+ + + {% for field in inline_formset.0 %} + + {% endfor %} + + - - {% for form in inline_formset %} - - {% for field in form %} - {% if field.is_readonly %} -

{{ field.contents }}

- {% else %} - - {% endif %} - {% endfor %} - - {% endfor %} - - -
+ {% if not field.is_hidden %} {{ field.label_tag }} {% endif %} +
- {{ field.errors }} - {{ field }} -
+ + {% for form in inline_formset %} + + {% for field in form %} {% if field.is_readonly %} +

{{ field.contents }}

+ {% else %} + {{ field.errors }} {{ field }} + {% endif %} {% endfor %} + + {% endfor %} + + + {{ title_add }} + + + +
-
- + `.replaceAll("0", next_id); + // Internet Explorer, Opera, Chrome, Firefox 8+ and Safari + let el = target.parentElement.parentElement.previousElementSibling; + if (el.insertAdjacentHTML) el.insertAdjacentHTML("beforebegin", html); + else { + var range = document.createRange(); + var frag = range.createContextualFragment(html); + el.parentNode.insertBefore(frag, el); + } + target.parentNode.setAttribute("colspan", next_id); + }); + }); +
From 81882b2b68ea3f3d23dbb88170b54bf6742e40ae Mon Sep 17 00:00:00 2001 From: EricOuma Date: Mon, 8 Nov 2021 10:54:43 +0300 Subject: [PATCH 4/5] add id to add link --- .../templates/forms_fieldset/tabular.html | 91 +++++++++---------- 1 file changed, 41 insertions(+), 50 deletions(-) diff --git a/forms_fieldset/templates/forms_fieldset/tabular.html b/forms_fieldset/templates/forms_fieldset/tabular.html index 7db5909..31223d6 100644 --- a/forms_fieldset/templates/forms_fieldset/tabular.html +++ b/forms_fieldset/templates/forms_fieldset/tabular.html @@ -1,54 +1,46 @@ -
-
+
+
{{ inline_formset.management_form }} -
+

{{ label }}

{{ inline_formset.non_form_errors }} - - {% for field in inline_formset.0 %} - - {% endfor %} - + + {% for field in inline_formset.0 %} + + {% endfor %} + - {% for form in inline_formset %} - - {% for field in form %} {% if field.is_readonly %} -

{{ field.contents }}

- {% else %} - - {% endif %} {% endfor %} - - {% endfor %} - - - + {% for form in inline_formset %} + + {% for field in form %} {% if field.is_readonly %} +

{{ field.contents }}

+ {% else %} + + {% endif %} {% endfor %} + + {% endfor %} + + +
- {% if not field.is_hidden %} {{ field.label_tag }} {% endif %} -
+ {% if not field.is_hidden %} {{ field.label_tag }} {% endif %} +
{{ field.errors }} {{ field }}
- {{ title_add }} -
{{ field.errors }} {{ field }}
+ {{ title_add }} +
-
+
\ No newline at end of file From 7403d2b6ac827bdb682917334684c35055c57354 Mon Sep 17 00:00:00 2001 From: EricOuma Date: Tue, 9 Nov 2021 13:45:03 +0300 Subject: [PATCH 5/5] revert id selector --- .../templates/forms_fieldset/tabular.html | 100 ++++++++++-------- 1 file changed, 53 insertions(+), 47 deletions(-) diff --git a/forms_fieldset/templates/forms_fieldset/tabular.html b/forms_fieldset/templates/forms_fieldset/tabular.html index 31223d6..a2f8f5f 100644 --- a/forms_fieldset/templates/forms_fieldset/tabular.html +++ b/forms_fieldset/templates/forms_fieldset/tabular.html @@ -1,46 +1,51 @@ -
-
+
{{ inline_formset.management_form }} -
-

{{ label }}

- {{ inline_formset.non_form_errors }} - - - - {% for field in inline_formset.0 %} - - {% endfor %} - - +
+

{{ label }}

+ {{ inline_formset.non_form_errors }} +
- {% if not field.is_hidden %} {{ field.label_tag }} {% endif %} -
+ + + {% for field in inline_formset.0 %} + + {% endfor %} + + - - {% for form in inline_formset %} - - {% for field in form %} {% if field.is_readonly %} -

{{ field.contents }}

- {% else %} - - {% endif %} {% endfor %} - - {% endfor %} - - - - -
+ {% if not field.is_hidden %} + {{ field.label_tag }} + {% endif %} +
{{ field.errors }} {{ field }}
- {{ title_add }} -
+ + {% for form in inline_formset %} + + {% for field in form %} + {% if field.is_readonly %} +

{{ field.contents }}

+ {% else %} + + {{ field.errors }} + {{ field }} + + {% endif %} + {% endfor %} + + {% endfor %} + + {{ title_add }} + +
-
- + target.parentNode.setAttribute('colspan', next_id); + } +
\ No newline at end of file