Skip to content

Commit

Permalink
Merge branch 'stable'
Browse files Browse the repository at this point in the history
  • Loading branch information
owocki committed Feb 22, 2019
2 parents 005ae3f + 162d6b5 commit af63af7
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions app/assets/v2/js/grants/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ $(document).ready(() => {
minimumResultsForSearch: Infinity
});

$('.grant-item').click(function() {
$(document).on('click', '.grant-item', function() {
$(this).find('img').each(function() {
var src_url = $(this).data('src');

Expand All @@ -20,7 +20,7 @@ $(document).ready(() => {

$('.select2-selection__rendered').removeAttr('title');

$('.flip-card').on('click keypress', e => {
$(document).on('click keypress', '.flip-card', e => {
if ($(e.target).is('a') || $(e.target).is('img')) {
e.stopPropagation();
return;
Expand Down
2 changes: 1 addition & 1 deletion app/assets/v2/js/pages/dashboard.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ var local_storage_keys = JSON.parse(JSON.stringify(filters));

local_storage_keys.push('keywords');
local_storage_keys.push('org');
results_limit = 25;
results_limit = 15;

var localStorage;

Expand Down
2 changes: 1 addition & 1 deletion app/dashboard/router.py
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ def get_queryset(self):

# offset / limit
if 'is_featured' not in param_keys:
limit = int(self.request.query_params.get('limit', 100))
limit = int(self.request.query_params.get('limit', 5))
max_bounties = 100
if limit > max_bounties:
limit = max_bounties
Expand Down

0 comments on commit af63af7

Please sign in to comment.