build order

InvenTree/build/templates/build/detail.html

@@ -3,7 +3,6 @@
 {% load i18n %}
 {% load inventree_extras %}
 {% load status_codes %}
-{% load markdownify %}
 
 {% block sidebar %}
 {% include "build/sidebar.html" %}
@@ -309,24 +308,16 @@
 
 <div class='panel panel-hidden' id='panel-notes'>
     <div class='panel-heading'>
-        <div class='row'>
+        <div class='d-flex flex-wrap'>
-            <div class='col-sm-6'>
+            <h4>{% trans "Build Notes" %}</h4>
-                <h4>{% trans "Build Notes" %}</h4>
+            {% include "spacer.html" %}
-            </div>
+            <div class='btn-group' role='group'>
-            <div class='col-sm-6'>
+                {% include "notes_buttons.html" %}
-                <div class='btn-group float-right'>
-                    <button type='button' id='edit-notes' title='{% trans "Edit Notes" %}' class='btn btn-small btn-outline-secondary'>
-                        <span class='fas fa-edit'>      
-                        </span>
-                    </button>
-                </div>
             </div>
         </div>
     </div>
     <div class='panel-content'>
-        {% if build.notes %}
+        <textarea id='build-notes'></textarea>
-        {{ build.notes | markdownify }}
-        {% endif %}
     </div>
 </div>
 
@@ -392,17 +383,18 @@ onPanelLoad('attachments', function() {
 });
 
 onPanelLoad('notes', function() {
-    $('#edit-notes').click(function() {
+
-        constructForm('{% url "api-build-detail" build.pk %}', {
+    setupNotesField(
-            fields: {
+        'build-notes',
-                notes: {
+        '{% url "api-build-detail" build.pk %}',
-                    multiline: true,
+        {
-                }
+            {% if roles.build.change %}
-            },
+            editable: true,
-            title: '{% trans "Edit Notes" %}',
+            {% else %}
-            reload: true,
+            editable: false,
-        });
+            {% endif %}
-    });
+        }
+    );
 });
 
 function reloadTable() {

InvenTree/company/templates/company/detail.html

@@ -1,7 +1,6 @@
 {% extends "company/company_base.html" %}
 {% load static %}
 {% load i18n %}
-{% load markdownify %}
 
 {% block sidebar %}
 {% include 'company/sidebar.html' %}

InvenTree/order/templates/order/purchase_order_detail.html

@@ -4,7 +4,6 @@
 {% load status_codes %}
 {% load i18n %}
 {% load static %}
-{% load markdownify %}
 
 {% block sidebar %}
 {% include 'order/po_sidebar.html' %}

InvenTree/order/templates/order/sales_order_detail.html

@@ -4,7 +4,6 @@
 {% load status_codes %}
 {% load i18n %}
 {% load static %}
-{% load markdownify %}
 
 {% block sidebar %}
 {% include "order/so_sidebar.html"  %}
@@ -118,24 +117,16 @@
 
 <div class='panel panel-hidden' id='panel-order-notes'>
     <div class='panel-heading'>
-        <div class='row'>
+        <div class='d-flex flex-wrap'>
-            <div class='col-sm-6'>
+            <h4>{% trans "Order Notes" %}</h4>
-                <h4>{% trans "Order Notes" %}</h4>
+            {% include "spacer.html" %}
-            </div>
+            <div class='btn-group' role='group'>
-            <div class='col-sm-6'>
+                {% include "notes_buttons.html" %}
-                <div class='btn-group float-right'>
-                    <button type='button' id='edit-notes' title='{% trans "Edit Notes" %}' class='btn outline-secondary'>
-                        <span class='fas fa-edit'>      
-                        </span>
-                    </button>
-                </div>
             </div>
         </div>
     </div>
     <div class='panel-content'>
-        {% if order.notes %}
+        <textarea id='order-notes'></textarea>
-        {{ order.notes | markdownify }}
-        {% endif %}
     </div>
 </div>
 
@@ -176,16 +167,18 @@
         });
     });
 
-    $('#edit-notes').click(function() {
+    onPanelLoad('order-notes', function() {
-        constructForm('{% url "api-so-detail" order.pk %}', {
+        setupNotesField(
-            fields: {
+            'order-notes',
-                notes: {
+            '{% url "api-so-detail" order.pk %}',
-                    multiline: true,
+            {
-                }
+                {% if roles.purchase_order.change %}
-            },
+                editable: true,
-            title: '{% trans "Edit Notes" %}',
+                {% else %}
-            reload: true,
+                editable: false,
-        });
+                {% endif %}
+            }
+        );
     });
 
     enableDragAndDrop(

InvenTree/part/templates/part/detail.html

@@ -3,7 +3,6 @@
 {% load i18n %}
 {% load inventree_extras %}
 {% load crispy_forms_tags %}
-{% load markdownify %}
 
 {% block sidebar %}
 {% include 'part/part_sidebar.html' %}

InvenTree/report/templates/report/inventree_po_report.html

@@ -4,7 +4,6 @@
 {% load report %}
 {% load barcode %}
 {% load inventree_extras %}
-{% load markdownify %}
 
 {% block page_margin %}
 margin: 2cm;

InvenTree/stock/templates/stock/item.html

@@ -4,7 +4,6 @@
 {% load inventree_extras %}
 {% load i18n %}
 {% load l10n %}
-{% load markdownify %}
 
 {% block sidebar %}
 {% include "stock/stock_sidebar.html" %}