Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
effc3f3
Set up links to raw json responses of links in json responses.(what)
NyanHelsing May 20, 2016
559694f
Getting branch up to date
NyanHelsing May 21, 2016
eee8ae2
saving changes
NyanHelsing May 21, 2016
14e677f
Browsable json links!
NyanHelsing May 24, 2016
808b9c4
Tidy up JSON browsing script
NyanHelsing May 25, 2016
7755b3a
Fix an issue with the way swagger (introspects?) one of the routes.
NyanHelsing May 25, 2016
896c136
Fixes the way the node views interpret arguments embedded in the url
NyanHelsing May 25, 2016
e9e9d8e
formatting link correctly for waterbutler
Aug 5, 2016
69fd94b
flake8 fixes
Aug 8, 2016
3fafac4
Update views.py
NyanHelsing Aug 8, 2016
d9f3890
Forgot asterisks.
NyanHelsing Aug 8, 2016
66741d5
fixes
Aug 8, 2016
abc4370
fix merge conflict
Aug 11, 2016
2c73ff1
fix merge conflicts
Aug 11, 2016
d642954
fix node arguments formatting
Aug 11, 2016
d2ad2f7
ng osf to unicode strings
Aug 21, 2016
5032f7a
Merge branch 'develop' of https://github.com/CenterForOpenScience/osf…
Aug 22, 2016
f462407
fix flake8 errors
Aug 22, 2016
c91f90c
monkeypatch simplify_regex
Aug 22, 2016
64095a6
fix flake8 errors
Aug 22, 2016
ce77528
define path_components array
Aug 22, 2016
2ff8bd6
setting correct permissions for endpoints
Aug 22, 2016
6b25d6a
fix whitespace
Aug 22, 2016
6bd9fe1
fix flake errors
Aug 22, 2016
b29e1ad
updating to unicode, fix typo
Aug 23, 2016
fbcfb4a
Update tests to account for increase in second precision in datetime …
Aug 24, 2016
b9547bf
update bearer tokens to be passed into request constructor as bytestr…
Aug 24, 2016
fcd4eb9
update Tests to provide bytestring to Request constructor.
Aug 24, 2016
d72f561
remove unneccesary code
Aug 24, 2016
e2c2840
unused import
Aug 24, 2016
cfce105
updateing for new drf error message
Aug 24, 2016
fb16f01
updating tests to differentiate between 401 and 403 errors
Aug 24, 2016
88ff69d
updating tests
Aug 25, 2016
68a286f
fix broken test
Aug 25, 2016
764849d
fix tests
Aug 25, 2016
6c3df1c
remove dead code
Aug 25, 2016
2be2170
relocating swagger-ui js file
Aug 25, 2016
1f07750
Wierd. git doesn't want to do the things...
NyanHelsing Aug 25, 2016
4c462a6
removing dead code
Aug 25, 2016
4eab556
Merge branch 'feature/make-swagger-json-links-browsable' of https://g…
Aug 25, 2016
78279a9
fix tests
Aug 26, 2016
ca3ab5b
endpoint categories are now sorted in swagger-ui.
Aug 26, 2016
7ce405a
debugging missing paths
Aug 29, 2016
5ae48ee
Merge branch 'develop' of github.com:CenterForOpenScience/osf.io into…
Aug 29, 2016
f20e453
fix regex. fix api schema generation.
Aug 29, 2016
392a4ac
fix flake8 stuff
Aug 29, 2016
f5cb930
Merge branch 'develop' of github.com:CenterForOpenScience/osf.io into…
Aug 30, 2016
21283c3
Updating docs
Aug 30, 2016
18ff1aa
make model list alphabetical
Aug 30, 2016
7a9664b
code cleanup
Sep 1, 2016
c727d60
missing comma
Sep 1, 2016
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
fix regex. fix api schema generation.
  • Loading branch information
Joshua Bird committed Aug 29, 2016
commit f20e453ec34810fc97f75b1a0891e39eac52d44c
5 changes: 1 addition & 4 deletions api/base/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,6 @@ def get_schema(self, request=None):
return None
content = {}
for category, action, link in links:
try:
print(category)
except:
pass
if category is None:
content[action] = link
elif category in content:
Expand All @@ -80,6 +76,7 @@ def get_schema(self, request=None):
content[category] = {action: link}
doc = coreapi.Document(title=self.title, content=content, url=self.url)
return doc


def get_link(self, path, method, callback, view):
"""
Expand Down
2 changes: 1 addition & 1 deletion api/base/wsgi.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ def dump(self, document, **kwargs):

OpenAPICodec.dump = dump

named_group_matcher = re.compile(r'\(\?P(<\w+>).+?[^/]\)')
named_group_matcher = re.compile(r'\(\?P(<\w+>)[^\)]+\)')
non_named_group_matcher = re.compile(r'\(.*?\)')

def simplify_regex(pattern):
Expand Down
3 changes: 2 additions & 1 deletion api/nodes/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -1784,7 +1784,8 @@ def get_queryset(self):


class NodeFileDetail(JSONAPIBaseView, generics.RetrieveAPIView, WaterButlerMixin, NodeMixin):

"""Node File Detail.
"""
permission_classes = (
drf_permissions.IsAuthenticatedOrReadOnly,
base_permissions.PermissionWithGetter(ContributorOrPublic, 'node'),
Expand Down
2 changes: 1 addition & 1 deletion api/templates/rest_framework_swagger/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<script src='{% static "rest_framework_swagger/lib/js-yaml.min.js" %}' type='text/javascript'></script>
<script src='{% static "rest_framework_swagger/lib/lodash.min.js" %}' type='text/javascript'></script>
<script src='{% static "rest_framework_swagger/lib/backbone-min.js" %}' type='text/javascript'></script>
<script src='{% static "rest_framework_swagger/swagger-ui.js" %}' type='text/javascript'></script>
<script src='{% static "rest_framework_swagger/js/swagger-ui.js" %}' type='text/javascript'></script>
<script src='{% static "rest_framework_swagger/lib/highlight.9.1.0.pack.js" %}' type='text/javascript'></script>
<script src='{% static "rest_framework_swagger/lib/highlight.9.1.0.pack_extended.js" %}' type='text/javascript'></script>
<script src='{% static "rest_framework_swagger/lib/jsoneditor.min.js" %}' type='text/javascript'></script>
Expand Down