2
0
mirror of https://github.com/inventree/InvenTree.git synced 2025-04-29 20:16:44 +00:00

Merge pull request #1508 from matmair/use-spaces

use spaces instead of tabs
This commit is contained in:
Oliver 2021-04-22 21:16:45 +10:00 committed by GitHub
commit 2f4e78fe51
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 18 additions and 18 deletions

View File

@ -20,17 +20,17 @@
{% block js_ready %} {% block js_ready %}
{{ block.super }} {{ block.super }}
/* Hide Button Toolbar */ /* Hide Button Toolbar */
window.onload = function hideButtonToolbar() { window.onload = function hideButtonToolbar() {
var toolbar = document.getElementById("button-toolbar"); var toolbar = document.getElementById("button-toolbar");
toolbar.style.display = "none"; toolbar.style.display = "none";
}; };
loadParametricPartTable( loadParametricPartTable(
"#parametric-part-table", "#parametric-part-table",
{ {
headers: {{ headers|safe }}, headers: {{ headers|safe }},
data: {{ parameters|safe }}, data: {{ parameters|safe }},
} }
); );

View File

@ -44,7 +44,7 @@
}); });
{% if category %} {% if category %}
$("#param-table").inventreeTable({ $("#param-table").inventreeTable({
url: "{% url 'api-part-category-parameters' pk=category.pk %}", url: "{% url 'api-part-category-parameters' pk=category.pk %}",
queryParams: { queryParams: {
ordering: 'name', ordering: 'name',
@ -66,7 +66,7 @@
field: 'default_value', field: 'default_value',
title: '{% trans "Default Value" %}', title: '{% trans "Default Value" %}',
sortable: 'true', sortable: 'true',
formatter: function(value, row, index, field) { formatter: function(value, row, index, field) {
var bEdit = "<button title='{% trans "Edit Template" %}' class='template-edit btn btn-default btn-glyph' type='button' pk='" + row.pk + "'><span class='fas fa-edit'></span></button>"; var bEdit = "<button title='{% trans "Edit Template" %}' class='template-edit btn btn-default btn-glyph' type='button' pk='" + row.pk + "'><span class='fas fa-edit'></span></button>";
var bDel = "<button title='{% trans "Delete Template" %}' class='template-delete btn btn-default btn-glyph' type='button' pk='" + row.pk + "'><span class='fas fa-trash-alt icon-red'></span></button>"; var bDel = "<button title='{% trans "Delete Template" %}' class='template-delete btn btn-default btn-glyph' type='button' pk='" + row.pk + "'><span class='fas fa-trash-alt icon-red'></span></button>";
@ -79,7 +79,7 @@
] ]
}); });
$("#new-param").click(function() { $("#new-param").click(function() {
launchModalForm("{% url 'category-param-template-create' category.pk %}", { launchModalForm("{% url 'category-param-template-create' category.pk %}", {
success: function() { success: function() {
$("#param-table").bootstrapTable('refresh'); $("#param-table").bootstrapTable('refresh');

View File

@ -21,7 +21,7 @@
{% include "InvenTree/settings/setting.html" with key="STOCK_STALE_DAYS" icon="fa-calendar" %} {% include "InvenTree/settings/setting.html" with key="STOCK_STALE_DAYS" icon="fa-calendar" %}
{% include "InvenTree/settings/setting.html" with key="STOCK_ALLOW_EXPIRED_SALE" icon="fa-truck" %} {% include "InvenTree/settings/setting.html" with key="STOCK_ALLOW_EXPIRED_SALE" icon="fa-truck" %}
{% include "InvenTree/settings/setting.html" with key="STOCK_ALLOW_EXPIRED_BUILD" icon="fa-tools" %} {% include "InvenTree/settings/setting.html" with key="STOCK_ALLOW_EXPIRED_BUILD" icon="fa-tools" %}
{% include "InvenTree/settings/setting.html" with key="STOCK_OWNERSHIP_CONTROL" icon="fa-users" %} {% include "InvenTree/settings/setting.html" with key="STOCK_OWNERSHIP_CONTROL" icon="fa-users" %}
</tbody> </tbody>
</table> </table>
{% endblock %} {% endblock %}

View File

@ -25,12 +25,12 @@
</form> </form>
{% if invalid_color_theme %} {% if invalid_color_theme %}
<div class="alert alert-danger alert-block" role="alert" style="display: inline-block;"> <div class="alert alert-danger alert-block" role="alert" style="display: inline-block;">
{% blocktrans %} {% blocktrans %}
The CSS sheet "{{invalid_color_theme}}.css" for the currently selected color theme was not found.<br> The CSS sheet "{{invalid_color_theme}}.css" for the currently selected color theme was not found.<br>
Please select another color theme :) Please select another color theme :)
{% endblocktrans %} {% endblocktrans %}
</div> </div>
{% endif %} {% endif %}
{% endblock %} {% endblock %}