Skip to content

Commit

Permalink
[Performance] Dinamically loading the list of users geo-limits
Browse files Browse the repository at this point in the history 
(cherry picked from commit c54cc61)
  • Loading branch information
afabiani committed Nov 20, 2020
1 parent 694c4d0 commit 756c1aa
Show file tree
Hide file tree
Showing 2 changed files with 106 additions and 47 deletions.
2 changes: 1 addition & 1 deletion geonode/layers/views.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -764,7 +764,7 @@ def sld_definition(style):

if request.user.is_authenticated and (request.user.is_superuser or "change_resourcebase_permissions" in perms_list):
context_dict['users'] = [user for user in get_user_model().objects.all().exclude(
id=request.user.id).exclude(is_superuser=True)]
id=request.user.id).exclude(is_superuser=True).order_by('username')]
if request.user.is_superuser:
context_dict['groups'] = [group for group in GroupProfile.objects.all()]
else:
Expand Down
151 changes: 105 additions & 46 deletions geonode/templates/_permissions_form.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,53 +104,15 @@ <h4 class="modal-title" id="myModalLabel">{% trans "Set permissions for this res
<div id="gis-limits-users">
<div class="row">
<div class="col-md-12">
<input class="search form-control" placeholder="{% trans "Search" %}" />
<!-- input class="search form-control" placeholder="{% trans "Search" %}" / -->
<!-- button class="sort btn btn-primary" data-sort="gis-limits-user-name">Sort by name</button -->
<!-- button class="sort btn btn-primary" data-sort="gis-limits-user-title">Sort by title</button -->
</div>
</div>
<div class="row">
<div class="col-md-12">
<div class="list-group list bt-scrollable">

{% for profile in users %}
<a href="javascript:void(0)" class="list-group-item">
<div class="col-md-8">
{% with 64 as avatar_size %}
<div class="pull-left photo">
{% autoescape off %}{% avatar profile avatar_size %}{% endautoescape %}
</div>
{% endwith %}
<h4 class="list-group-item-heading gis-limits-user-name">{% if profile.first_name != '' %}{{ profile.first_name }}{% else %}{{ profile.username }}{% endif %} {% if profile.last_name != '' %}{{ profile.last_name }}{% endif %}</h4>
<p class="list-group-item-text gis-limits-user-title">{% if profile.organization %}{{ profile.organization }}{% else %}{% trans "No Group" %}{% endif %}</p>
</div>
<div class="col-md-4">
<div class="expertise">
<div class="read-more pull-right">
<button id="user-load{{ profile.id }}" type="button" class="btn btn-default btn-sm deserialize-geo-limit"
data-toggle="tooltip" data-placement="top" title="{% trans "Show Geo Limits" %}" aria-pressed="true">
<span class="glyphicon glyphicon glyphicon glyphicon-eye-open" aria-hidden="true"></span>
</button>
<button id="user-upload{{ profile.id }}" type="button" class="btn btn-default btn-sm"
data-toggle="tooltip" data-placement="top" title="{% trans "Upload Geo Limits" %}" aria-pressed="true">
<span class="glyphicon glyphicon glyphicon glyphicon-open-file"
data-toggle="modal" data-target="#_add_shp_zip" aria-hidden="true"></span>
</button>
<button id="user-save{{ profile.id }}" type="button" class="btn btn-default btn-sm serialize-geo-limit"
data-toggle="tooltip" data-placement="top" title="{% trans "Save Geo Limits" %}" aria-pressed="true">
<span class="glyphicon glyphicon glyphicon-floppy-disk" aria-hidden="true"></span>
</button>
<button id="user-remove{{ profile.id }}" type="button" class="btn btn-default btn-sm delete-geo-limit"
data-toggle="tooltip" data-placement="top" title="{% trans "Delete Geo Limits" %}" aria-pressed="true">
<span class="glyphicon glyphicon glyphicon-trash" aria-hidden="true"></span>
</button>
</div>
</div>
</div>
<div class="clearfix"></div>
{% endfor %}

</a>
<div id="gis-limits-users-content" class="list-group list bt-scrollable" style="min-height: 200px; height: 500px; overflow-y: scroll">
<span id="gis-limits-users-list">
</div>
</div>
</div>
Expand Down Expand Up @@ -202,9 +164,9 @@ <h4 class="list-group-item-heading gis-limits-group-name">{{ group.title }}</h4>
</div>
</div>
<div class="clearfix"></div>
</a>
{% endfor %}

</a>
</div>
</div>
</div>
Expand Down Expand Up @@ -305,6 +267,102 @@ <h4 class="modal-title" id="exampleModalLabel">{% trans "Message box" %}</h4>

var userList = new List('gis-limits-users', {valueNames: ['gis-limits-user-name', 'gis-limits-user-title']});
var groupList = new List('gis-limits-groups', {valueNames: ['gis-limits-group-name', 'gis-limits-group-title']});
var limit = 5;
var offset = 0;
var lastOffset = 0;
$(function() {
load_gis_limits_users();
$('#gis-limits-users-content').on("scroll", function(event) {
var scrollHeight = $('#gis-limits-users').height();
var scrollPosition = $('#gis-limits-users-content').scrollTop();
if (scrollPosition >= 50*(offset-3)){
if (offset == lastOffset) {
offset += limit;
load_gis_limits_users();
}
// event.stopPropagation();
event.preventDefault();
}
});

function load_gis_limits_users() {
$.ajax({
url: "/api/profiles/",
dataType: 'json',
data: {
limit: limit,
offset: offset,
order_by: 'username'
},
beforeSend: function() {
$('#loading_icon').show();
},
success: function(data) {
$('#loading_icon').hide();
users = $(data.objects);
if (users.length) {
var html = "";
users.each(function() {
userid = $(this)[0].id;
username = $(this)[0].username;
avatar = $(this)[0].avatar_100;
organization = $(this)[0].organization;
if (organization == null) {
organization = "{% trans "No Group" %}";
}
html += `
<a href="javascript:void(0)" class="list-group-item">
<div class="col-md-8">
<div class="pull-left photo">
<img src="${avatar}" class="pull-left photo">
</div>
<h4 class="list-group-item-heading gis-limits-user-name">${username}</h4>
<p class="list-group-item-text gis-limits-user-title">${organization}</p>
</div>
<div class="col-md-4">
<div class="expertise">
<div class="read-more pull-right">
<button id="user-load${userid}" type="button" class="btn btn-default btn-sm deserialize-geo-limit"
data-toggle="tooltip" data-placement="top" title="{% trans "Show Geo Limits" %}" aria-pressed="true">
<span class="glyphicon glyphicon glyphicon glyphicon-eye-open" aria-hidden="true"></span>
</button>
<button id="user-upload${userid}" type="button" class="btn btn-default btn-sm"
data-toggle="tooltip" data-placement="top" title="{% trans "Upload Geo Limits" %}" aria-pressed="true">
<span class="glyphicon glyphicon glyphicon glyphicon-open-file"
data-toggle="modal" data-target="#_add_shp_zip" aria-hidden="true"></span>
</button>
<button id="user-save${userid}" type="button" class="btn btn-default btn-sm serialize-geo-limit"
data-toggle="tooltip" data-placement="top" title="{% trans "Save Geo Limits" %}" aria-pressed="true">
<span class="glyphicon glyphicon glyphicon-floppy-disk" aria-hidden="true"></span>
</button>
<button id="user-remove${userid}" type="button" class="btn btn-default btn-sm delete-geo-limit"
data-toggle="tooltip" data-placement="top" title="{% trans "Delete Geo Limits" %}" aria-pressed="true">
<span class="glyphicon glyphicon glyphicon-trash" aria-hidden="true"></span>
</button>
</div>
</div>
</div>
<div class="clearfix"></div>
</a>`
});

if (html) {
$('#gis-limits-users-list').append(html);
lastOffset = offset;
// offset += limit;
}
} else {
$('#warning_area').text("That's all folks!");
}
},
error: function() {
$('#loading_icon').hide();
$('#warning_area').text('Unable to load articles, please check your internet connection or try again later.');
console.log('Ajax Request Has Failed');
}
});
}
});

$(".input-file").before(
function() {
Expand Down Expand Up @@ -553,7 +611,7 @@ <h4 class="modal-title" id="exampleModalLabel">{% trans "Message box" %}</h4>
});
}

$('.serialize-geo-limit').click(function() {
$(document).on('click', '.serialize-geo-limit', function() {
serializeGeoLimit($(this).attr('id'));
});

Expand Down Expand Up @@ -624,7 +682,8 @@ <h4 class="modal-title" id="exampleModalLabel">{% trans "Message box" %}</h4>
});
}

$('.deserialize-geo-limit').click(function(event) {
$(document).on('click', '.deserialize-geo-limit', function(event) {
console.log($(this).attr('id'));
deserializeGeoLimit($(this).attr('id'));
});

Expand Down Expand Up @@ -675,10 +734,10 @@ <h4 class="modal-title" id="exampleModalLabel">{% trans "Message box" %}</h4>
});
}

$('.delete-geo-limit').click(function() {
$(document).on('click', '.delete-geo-limit', function() {
deleteGeoLimit($(this).attr('id'));
});
}
});
</script>
{% endif %}
{% endif %}

0 comments on commit 756c1aa

Please sign in to comment.