Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/stable'
Browse files Browse the repository at this point in the history
  • Loading branch information
danlipert committed Nov 13, 2020
2 parents 3dd18a5 + d4c72d6 commit e91dea5
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
4 changes: 4 additions & 0 deletions app/grants/router.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,10 @@ def get_queryset(self):
if 'pk' in param_keys:
queryset = queryset.filter(pk=self.request.query_params.get('pk'))

# Filter by admin_address.
if 'admin_address' in param_keys:
queryset = queryset.filter(admin_address__iexact=self.request.query_params.get('admin_address'))

# Filter by description.
if 'description' in param_keys:
queryset = queryset.filter(description__iexact=self.request.query_params.get('description'))
Expand Down
2 changes: 0 additions & 2 deletions app/retail/templates/home/index2020.html
Original file line number Diff line number Diff line change
Expand Up @@ -496,9 +496,7 @@ <h2>Legal</h2>
<figure><a href="/fb"><svg class="fusion"><use xlink:href="/static_proxy/landingpage/fusion/fusion-interface.svg#facebook"></use></svg></a></figure>
<figure><a href="/youtube"><svg class="fusion"><use xlink:href="/static_proxy/landingpage/fusion/fusion-interface.svg#youtube"></use></svg></a></figure>
<figure><a href="/twitter"><svg class="fusion"><use xlink:href="/static_proxy/landingpage/fusion/fusion-interface.svg#twitter"></use></svg></a></figure>
<figure><a href="/telegram"><svg class="fusion"><use xlink:href="/static_proxy/landingpage/fusion/fusion-interface.svg#telegram"></use></svg></a></figure>
<figure><a href="/github"><svg class="fusion"><use xlink:href="/static_proxy/landingpage/fusion/fusion-interface.svg#github"></use></svg></a></figure>
<figure><a href="/chat"><svg class="fusion"><use xlink:href="/static_proxy/landingpage/fusion/fusion-interface.svg#chat2"></use></svg></a></figure>
<figure><a href="mailto:[email protected]"><svg class="fusion"><use xlink:href="/static_proxy/landingpage/fusion/fusion-interface.svg#email"></use></svg></a></figure>


Expand Down
2 changes: 1 addition & 1 deletion docs/API.md
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ The grants endpoint provides a listing of grants and all it's information. There

**Filters**

You can filter the data returned from the API by providing these keys as URL parameters `title`, `description`, `keyword`, `grant_type` and `pk` that takes an ID and returns a single grant. You can also add a `limit` parameter to limit the results (typically for performance reasons).
You can filter the data returned from the API by providing these keys as URL parameters `title`, `admin_address`, `description`, `keyword`, `grant_type` and `pk` that takes an ID and returns a single grant. You can also add a `limit` parameter to limit the results (typically for performance reasons).


#### Example Request
Expand Down

0 comments on commit e91dea5

Please sign in to comment.