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

Fix some tests

Browse Source 
And some things that were actually borked
This commit is contained in:
FreneticScribbler
2020-05-24 22:04:00 +01:00
parent c9ea1bb75d
commit 544b6df35c
8 changed files with 67 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
assets/templates/asset_audit_list.html
View File

@@ -56,10 +56,12 @@
<h3>Audit Asset:</h3>
<form id="asset-search-form" class="form-horizontal" method="POST">
<div class="input-group input-group-lg" style="width: auto;">
<div class="input-group input-group-lg" style="width=auto;">
{% render_field form.query|add_class:'form-control' placeholder='Enter Asset ID' autofocus="true" %}
<label for="query" class="sr-only">Asset ID:</label>
<span class="input-group-btn"><a id="searchButton" class="btn btn-default" class="submit" type="submit">Search</a></span>
<div class="input-group-append">
<label for="query" class="sr-only">Asset ID:</label>
<a id="searchButton" class="btn btn-primary" class="submit" type="submit">Search</a>
</div>
</div>
</form>

49
assets/templates/asset_form.html
View File

@@ -5,8 +5,8 @@
{% block title %}Asset {{ object.asset_id }}{% endblock %}
{% block css %}
<link rel="stylesheet" href="{% static "css/bootstrap-select.css" %}"/>
<link rel="stylesheet" href="{% static "css/ajax-bootstrap-select.css" %}"/>
<link rel="stylesheet" href="{% static 'css/bootstrap-select.css' %}"/>
<link rel="stylesheet" href="{% static 'css/ajax-bootstrap-select.css' %}"/>
{% endblock %}
{% block js %}
@@ -23,6 +23,51 @@
}
checkIfCableHidden();
</script>
<script>
$('#parent_id')
.selectpicker({
liveSearch: true
})
.ajaxSelectPicker({
ajax: {
url: '{% url 'asset_search_json' %}',
type: "GET",
data: function () {
var params = {
{% verbatim %}query: '{{{q}}}'{% endverbatim %}
};
return params;
}
},
locale: {
emptyTitle: 'Search for item...'
},
preprocessData: function(data){
var assets = [];
if(data.length){
var len = data.length;
for(var i = 0; i < len; i++){
var curr = data[i];
assets.push(
{
'value': curr.id,
'text': curr.label,
'disabled': false
}
);
}
assets.push(
{
'value': null,
'text': "No parent"
});
}
return assets;
},
preserveSelected: false
});
</script>
{% endblock %}
{% block content %}

52
assets/templates/partials/asset_picker.html
View File

@@ -1,52 +0,0 @@
<select name="parent" id="parent_id" class="selectpicker">
{% if object.parent%}
<option value="{{object.parent.pk}}" selected>{{object.parent.description}}</option>
{% endif %}
</select>
{% block js %}
<script>
$('#parent_id')
.selectpicker({
liveSearch: true
})
.ajaxSelectPicker({
ajax: {
url: '{% url 'asset_search_json'%}',
type: "get",
data: function () {
var params = {
{% verbatim %}query: '{{{q}}}'{% endverbatim %}
};
return params;
}
},
locale: {
emptyTitle: 'Search for item...'
},
preprocessData: function(data){
var assets = [];
if(data.length){
var len = data.length;
for(var i = 0; i < len; i++){
var curr = data[i];
assets.push(
{
'value': curr.id,
'text': curr.label,
'disabled': false
}
);
}
assets.push(
{
'value': null,
'text': "No parent"
});
}
return assets;
},
preserveSelected: false
});
</script>
{% endblock js %}

6
assets/templates/partials/parent_form.html
View File

@@ -7,7 +7,11 @@
{% if create or edit or duplicate %}
<div class="form-group" id="parent-group">
<label for="selectpicker">Set Parent</label>
{% include 'partials/asset_picker.html' %}
<select name="parent" id="parent_id" class="form-control selectpicker" data-live-search="true">
{% if object.parent %}
<option value="{{object.parent.pk}}" selected>{{object.parent.description}}</option>
{% endif %}
</select>
</div>
{% else %}
<dl>

4
assets/templates/partials/purchasedetails_form.html
View File

@@ -9,7 +9,7 @@
<label for="{{ form.purchased_from.id_for_label }}">Supplier</label>
<select id="{{ form.purchased_from.id_for_label }}" name="{{ form.purchased_from.name }}" class="form-control selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='supplier' %}">
{% if object.purchased_from %}
<option value="{{form.purchased_from.value}}" selected="selected" data-update_url="{% url 'supplier_update' form.purchased_from.value %}">{{ object.purchased_from }}</option>
<option value="{{form.purchased_from.value}}" selected="selected" data-update_url="{% url 'supplier_update' form.purchased_from.value %}">{{ object.purchased_from }}</option>
{% endif %}
</select>
</div>
@@ -37,7 +37,7 @@
{% render_field form.date_acquired|add_class:'form-control'|attr:'type="date"' value=date_acq %}
{% endwith %}
{% else %}
<input type="date" name="date_acquired" value="{% now "Y-m-d" %}"
<input type="date" name="date_acquired" value="{% now 'Y-m-d' %}"
class="form-control" id="id_date_acquired">
{% endif %}
</div>