mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

Merge branch 'feature' of https://github.com/netbox-community/netbox into feature

Browse Source 
# Conflicts:
#	netbox/dcim/tables/template_code.py
#	netbox/netbox/views/__init__.py
#	netbox/project-static/css/base.css
#	netbox/templates/base.html
#	netbox/templates/circuits/circuit.html
#	netbox/templates/circuits/circuittermination_edit.html
#	netbox/templates/circuits/inc/circuit_termination.html
#	netbox/templates/circuits/provider.html
#	netbox/templates/dcim/device.html
#	netbox/templates/dcim/device/base.html
#	netbox/templates/dcim/device_component.html
#	netbox/templates/dcim/devicetype.html
#	netbox/templates/dcim/inc/device_napalm_tabs.html
#	netbox/templates/dcim/rack.html
#	netbox/templates/dcim/site.html
#	netbox/templates/dcim/virtualchassis.html
#	netbox/templates/extras/configcontext.html
#	netbox/templates/extras/object_journal.html
#	netbox/templates/extras/tag.html
#	netbox/templates/generic/object.html
#	netbox/templates/generic/object_list.html
#	netbox/templates/home.html
#	netbox/templates/inc/nav_menu.html
#	netbox/templates/ipam/aggregate.html
#	netbox/templates/ipam/ipaddress.html
#	netbox/templates/ipam/prefix.html
#	netbox/templates/ipam/vlan.html
#	netbox/templates/ipam/vlangroup_edit.html
#	netbox/templates/ipam/vlangroup_vlans.html
#	netbox/templates/secrets/secret.html
#	netbox/templates/tenancy/tenant.html
#	netbox/templates/users/api_tokens.html
#	netbox/templates/virtualization/cluster.html
#	netbox/templates/virtualization/vminterface_edit.html
#	netbox/utilities/forms/fields.py
#	netbox/utilities/templates/buttons/export.html
This commit is contained in:
checktheroads
2021-04-14 11:30:15 -07:00
parent 8ca2884c1c e3f5062583
commit 4c3b0abe7b
256 changed files with 5928 additions and 2111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
netbox/project-static/js/forms.js
View File

@@ -158,11 +158,9 @@ $(document).ready(function() {
q: params.term,
limit: 50,
offset: offset,
brief: true,
};
// Allow for controlling the brief setting from within APISelect
parameters.brief = ( $(element).is('[data-full]') ? undefined : true );
// Attach any extra query parameters
$.each(element.attributes, function(index, attr){
if (attr.name.includes("data-query-param-")){
@@ -213,26 +211,7 @@ $(document).ready(function() {
// The disabled-indicator equated to true, so we disable this option
record.disabled = true;
}
if( record.group !== undefined && record.group !== null && record.site !== undefined && record.site !== null ) {
results[record.site.name + ":" + record.group.name] = results[record.site.name + ":" + record.group.name] || { text: record.site.name + " / " + record.group.name, children: [] };
results[record.site.name + ":" + record.group.name].children.push(record);
}
else if( record.group !== undefined && record.group !== null ) {
results[record.group.name] = results[record.group.name] || { text: record.group.name, children: [] };
results[record.group.name].children.push(record);
}
else if( record.site !== undefined && record.site !== null ) {
results[record.site.name] = results[record.site.name] || { text: record.site.name, children: [] };
results[record.site.name].children.push(record);
}
else if ( (record.group !== undefined || record.group == null) && (record.site !== undefined || record.site === null) ) {
results['global'] = results['global'] || { text: 'Global', children: [] };
results['global'].children.push(record);
}
else {
results[idx] = record
}
results[idx] = record;
return results;
},Object.create(null));

22
netbox/project-static/js/tableconfig.js
View File

@@ -1,9 +1,27 @@
$(document).ready(function() {
$('form.userconfigform input.reset').click(function(event) {
// Deselect all columns when the reset button is clicked
// Select or reset table columns
$('#save_tableconfig').click(function(event) {
$('select[name="columns"] option').attr("selected", "selected");
});
$('#reset_tableconfig').click(function(event) {
$('select[name="columns"]').val([]);
});
// Swap columns between available and selected lists
$('#add_columns').click(function(e) {
let selected_columns = $('#id_available_columns option:selected');
$('#id_columns').append($(selected_columns).clone());
$(selected_columns).remove();
e.preventDefault();
});
$('#remove_columns').click(function(e) {
let selected_columns = $('#id_columns option:selected');
$('#id_available_columns').append($(selected_columns).clone());
$(selected_columns).remove();
e.preventDefault();
});
$('form.userconfigform').submit(function(event) {
event.preventDefault();