Merge branch 'master' into feature/automatic-ipn-generation

templates/parts/edit/_advanced.html.twig

@@ -12,4 +12,5 @@
 }) }}>
     {{ form_row(form.ipn) }}
 </div>
-{{ form_row(form.partUnit) }}
+{{ form_row(form.partUnit) }}
+{{ form_row(form.partCustomState) }}

templates/parts/info/_sidebar.html.twig

@@ -36,6 +36,19 @@
     </div>
 {% endif %}
 
+{% if part.partCustomState is not null %}
+    <div class="mt-1">
+        <h6>
+            <span class="badge bg-primary" title="{% trans %}part_custom_state.caption{% endtrans %}"><i class="fas fa-tools fa-fw"></i> {{ part.partCustomState.name }}</span>
+
+            {% if part.partCustomState is not null and part.partCustomState.masterPictureAttachment and attachment_manager.fileExisting(part.partCustomState.masterPictureAttachment) %}
+                <br/>
+                <img class="img-fluid img-thumbnail thumbnail-sm" src="{{ attachment_thumbnail(part.partCustomState.masterPictureAttachment, 'thumbnail_md') }}" alt="{% trans %}attachment.preview.alt{% endtrans %}" />
+            {% endif %}
+        </h6>
+    </div>
+{% endif %}
+
 {# Favorite Status tag #}
 {% if part.favorite %}
     <div class="mt-1">
@@ -79,4 +92,4 @@
             </a>
         </h6>
     </div>
-{% endif %}
+{% endif %}

templates/parts/info/_specifications.html.twig

@@ -4,6 +4,9 @@
 {% for name, parameters in part.groupedParameters %}
     {% if name is not empty %}<h5 class="mt-1">{{ name }}</h5>{% endif %}
     {{ helper.parameters_table(parameters) }}
+    {% if not loop.last %}
+        <hr class="my-0">
+    {% endif %}
 {% endfor %}
 
 {% if description_params is not empty %}
@@ -14,4 +17,4 @@
 {% if comment_params is not empty %}
     <h5 class="mt-1">{% trans %}parameters.auto_extracted_from_comment{% endtrans %}</h5>
     {{ helper.parameters_table(comment_params) }}
-{% endif %}
+{% endif %}

templates/parts/lists/_filter.html.twig

@@ -61,6 +61,7 @@
                     {{ form_row(filterForm.favorite) }}
                     {{ form_row(filterForm.needsReview) }}
                     {{ form_row(filterForm.measurementUnit) }}
+                    {{ form_row(filterForm.partCustomState) }}
                     {{ form_row(filterForm.mass) }}
                     {{ form_row(filterForm.dbId) }}
                     {{ form_row(filterForm.ipn) }}