arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-23 08:22:15 +00:00
Code Issues Projects Releases Wiki Activity

FEAT: Markdown support on asset comments

Browse Source
This commit is contained in:
FreneticScribbler
2020-02-09 22:53:39 +00:00
parent d3de04a03b
commit 68799ed0ef
4 changed files with 110 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
RIGS/templatetags/markdown_tags.py
View File

@@ -7,6 +7,7 @@ __author__ = 'ghost'
register = template.Library() register = template.Library()
@register.filter(name="markdown") @register.filter(name="markdown")
def markdown_filter(text, input_format='html'): def markdown_filter(text, input_format='html'):
# markdown library can't handle text=None # markdown library can't handle text=None
@@ -33,7 +34,7 @@ def markdown_filter(text, input_format='html'):
bq.name = 'pre' bq.name = 'pre'
bq.string = bq.text bq.string = bq.text
for alist in soup.find_all(['ul','ol']): for alist in soup.find_all(['ul', 'ol']):
alist['style'] = alist.name alist['style'] = alist.name
for li in alist.find_all('li', recursive=False): for li in alist.find_all('li', recursive=False):
text = li.find(text=True) text = li.find(text=True)

44
assets/templates/asset_create.html
View File

@@ -1,9 +1,36 @@
{% extends 'base_assets.html' %} {% extends 'base_assets.html' %}
{% load static %}
{% load widget_tweaks %} {% load widget_tweaks %}
{% block title %}Asset {{ object.asset_id }}{% endblock %} {% block title %}Asset {{ object.asset_id }}{% endblock %}
{% block content %} {% block css %}
<link rel="stylesheet" href="//cdn.jsdelivr.net/simplemde/latest/simplemde.min.css">
{% endblock %}
{% block preload_js %}
<script src="//cdn.jsdelivr.net/simplemde/latest/simplemde.min.js"></script>
{% endblock %}
{% block js %}
<script src="//code.jquery.com/ui/1.10.4/jquery-ui.js"></script>
<script src="{% static 'js/interaction.js' %}"></script>
<script>
function checkIfCableHidden() {
if (document.getElementById("id_is_cable").checked) {
document.getElementById("cable-table").hidden = false;
} else {
document.getElementById("cable-table").hidden = true;
}
}
checkIfCableHidden();
$(document).ready(function () {
setupMDE('#id_comments');
});
</script>
{% endblock %}
{% block content %}
<div class="page-header"> <div class="page-header">
<h1> <h1>
{% if duplicate %} {% if duplicate %}
@@ -44,17 +71,4 @@
</div> </div>
</form> </form>
{% endblock %} {% endblock %}
{% block js%}
<script>
function checkIfCableHidden() {
if (document.getElementById("id_is_cable").checked) {
document.getElementById("cable-table").hidden = false;
} else {
document.getElementById("cable-table").hidden = true;
}
}
checkIfCableHidden();
</script>
{%endblock%}

136
assets/templates/asset_update.html
View File

@@ -1,70 +1,84 @@
{% extends 'base_assets.html' %} {% extends 'base_assets.html' %}
{% load static %}
{% load widget_tweaks %} {% load widget_tweaks %}
{% block title %}Asset {{ object.asset_id }}{% endblock %} {% block title %}Asset {{ object.asset_id }}{% endblock %}
{% block css %}
<link rel="stylesheet" href="//cdn.jsdelivr.net/simplemde/latest/simplemde.min.css">
{% endblock %}
{% block preload_js %}
<script src="//cdn.jsdelivr.net/simplemde/latest/simplemde.min.js"></script>
{% endblock %}
{% block js %}
{% if edit %}
<script src="//code.jquery.com/ui/1.10.4/jquery-ui.js"></script>
<script src="{% static 'js/interaction.js' %}"></script>
<script>
function checkIfCableHidden() {
if (document.getElementById("id_is_cable").checked) {
document.getElementById("cable-table").hidden = false;
} else {
document.getElementById("cable-table").hidden = true;
}
}
checkIfCableHidden();
$(document).ready(function () {
setupMDE('#id_comments');
});
</script>
{% endif %}
{% endblock %}
{% block content %} {% block content %}
<div class="page-header">
<h1>
{% if edit and object %}
Edit Asset: {{ object.asset_id }}
{% else %}
Asset: {{ object.asset_id }}
{% endif %}
</h1>
</div>
<form method="post" id="asset_update_form" action="{% url 'asset_update' pk=object.asset_id%}">
{% include 'form_errors.html' %}
{% csrf_token %}
<input type="hidden" name="id" value="{{ object.id|default:0 }}" hidden=true>
<div class="row">
<div class="col-sm-12">
{% include 'partials/asset_form.html' %}
</div>
</div>
<div class="row">
{% if perms.assets.asset_finance %}
<div class="col-md-6">
{% include 'partials/purchasedetails_form.html' %}
</div>
{%endif%}
<div class="col-md-6"
{% if not object.is_cable %} hidden="true" {% endif %} id="cable-table">
{% include 'partials/cable_form.html' %}
</div>
<div class="col-md-4">
{% include 'partials/parent_form.html' %}
</div>
</div>
<div class="row">
<div class="col-md-12">
{% include 'partials/asset_buttons.html' %}
</div>
</form>
<div class="page-header"> {% if not edit and perms.assets.view_asset %}
<h1> <div class="col-sm-12 text-right">
{% if edit and object %} <div>
Edit Asset: {{ object.asset_id }} <a href="{% url 'asset_history' object.asset_id %}" title="View Revision History">
{% else %} Last edited at {{ object.last_edited_at|default:'never' }} by {{ object.last_edited_by.name|default:'nobody' }}
Asset: {{ object.asset_id }} </a>
{% endif %} </div>
</h1>
</div>
<form method="post" id="asset_update_form" action="{% url 'asset_update' pk=object.asset_id%}">
{% include 'form_errors.html' %}
{% csrf_token %}
<input type="hidden" name="id" value="{{ object.id|default:0 }}" hidden=true>
<div class="row">
<div class="col-sm-12">
{% include 'partials/asset_form.html' %}
</div> </div>
</div> {% endif %}
<div class="row">
{% if perms.assets.asset_finance %}
<div class="col-md-6">
{% include 'partials/purchasedetails_form.html' %}
</div>
{%endif%}
<div class="col-md-6"
{% if not object.is_cable %} hidden="true" {% endif %} id="cable-table">
{% include 'partials/cable_form.html' %}
</div>
<div class="col-md-4">
{% include 'partials/parent_form.html' %}
</div>
</div>
<div class="row">
<div class="col-md-12">
{% include 'partials/asset_buttons.html' %}
</div>
</form>
{% if not edit and perms.assets.view_asset %}
<div class="col-sm-12 text-right">
<div>
<a href="{% url 'asset_history' object.asset_id %}" title="View Revision History">
Last edited at {{ object.last_edited_at|default:'never' }} by {{ object.last_edited_by.name|default:'nobody' }}
</a>
</div>
</div>
{% endif %}
{% endblock %} {% endblock %}
{% block js%}
{% if edit %}
<script>
function checkIfCableHidden() {
if (document.getElementById("id_is_cable").checked) {
document.getElementById("cable-table").hidden = false;
} else {
document.getElementById("cable-table").hidden = true;
}
}
checkIfCableHidden();
</script>
{% endif %}
{% endblock %}

7
assets/templates/partials/asset_form.html
View File

@@ -1,4 +1,5 @@
{% load widget_tweaks %} {% load widget_tweaks %}
{% load markdown_tags %}
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading"> <div class="panel-heading">
Asset Details Asset Details
@@ -35,14 +36,14 @@
<!---TODO: Lower default number of lines in comments box--> <!---TODO: Lower default number of lines in comments box-->
<div class="form-group"> <div class="form-group">
<label for="{{ form.comments.id_for_label }}">Comments</label> <label for="{{ form.comments.id_for_label }}">Comments</label>
{% render_field form.comments|add_class:'form-control' %} {% render_field form.comments|add_class:'form-control md-enabled' %}
</div> </div>
{% else %} {% else %}
<dt>Asset ID</dt> <dt>Asset ID</dt>
<dd>{{ object.asset_id }}</dd> <dd>{{ object.asset_id }}</dd>
<dt>Description</dt> <dt>Description</dt>
<dd style="overflow-wrap: break-word;">{{ object.description }}</dd> <dd class="dont-break-out">{{ object.description }}</dd>
<dt>Category</dt> <dt>Category</dt>
<dd>{{ object.category }}</dd> <dd>{{ object.category }}</dd>
@@ -54,7 +55,7 @@
<dd>{{ object.serial_number|default:'-' }}</dd> <dd>{{ object.serial_number|default:'-' }}</dd>
<dt>Comments</dt> <dt>Comments</dt>
<dd style="overflow-wrap: break-word;">{{ object.comments|default:'-'|linebreaksbr }}</dd> <dd class="dont-break-out well">{{ object.comments|default:'-'|markdown }}</dd>
{% endif %} {% endif %}
</div> </div>
</div> </div>