Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature/status board #708

Open
wants to merge 16 commits into
base: develop
Choose a base branch
from
Open

Feature/status board #708

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
3d213d2
Cherry pick
Oludare96 May 31, 2017
7c3f6bc
harvestlogs view file
Oludare96 May 31, 2017
1f356d9
Creating new endpoint for Source Config
Oludare96 Jun 6, 2017
346130f
fix atempt
Oludare96 Jun 6, 2017
bf05254
Cherry pick
Oludare96 May 31, 2017
6f8a5aa
no message
Oludare96 Jun 9, 2017
4edb803
Cherry pick
cardene Jun 19, 2017
64f959b
Cherry pick
cardene Jun 19, 2017
1dea184
new backend filter for source config id's
cardene Jun 21, 2017
a2da011
Cherry pick
Oludare96 Jun 21, 2017
fcdf94e
query for statuses
cardene Jul 19, 2017
aabb219
no message
cardene Aug 8, 2017
f876dd5
no message
cardene Aug 8, 2017
b1200f1
Cherry pick
cardene Aug 8, 2017
3db1a1c
Formatting from code review
cardene Aug 11, 2017
abb2126
Change url names
cardene Aug 11, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
no message
  • Loading branch information
@cardene
cardene committed Aug 8, 2017
commit aabb219eeb7f4bf7a6b45bd377789f4651b1455c
2 changes: 1 addition & 1 deletion api/views/harvestlogs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
from share.models import HarvestLog
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

import ordering from most broadly available to most specific:

  • built-ins
  • 3rd-party imports
  • 2nd-party imports
  • 1st-party imports

from api.views import ShareObjectViewSet

<<<<<<< HEAD

class SourceConfigFilterBackend(filters.BaseFilterBackend):
"""
Expand All @@ -22,6 +21,7 @@ def filter_queryset(self, request, queryset, view):
return queryset.filter(source_config_id=decoded)
if 'status' in request.GET:
return queryset.filter(status=request.GET['status'])

else:
return queryset

Expand Down