Merge branch 'master' into unplatform-prod-app-1

CLIxIndia-Dev · Apr 20, 2018 · b277bd5 · b277bd5
2 parents 16f4db9 + a073c3b
commit b277bd5
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 2 deletions.
diff --git a/CHANGENOTES.md b/CHANGENOTES.md
@@ -1,3 +1,8 @@
+## [3.19.0] - 2018-04-18:
+### Added
+  - `bypassAuthorizationForFilesRecordAssetContentLookup` configuration parameter
+    for `JSON` config. Requires `dlkit` `0.7.0` or above.
+
 ## [3.18.1] - 2018-03-28:
 ### Fixed
   - regex for URLs accounts for trailing slash in IDs.
@@ -414,6 +419,7 @@
   - Add endpoints for creating asset contents.
   - Improve unicode / hindi support
 
+[3.19.0]: https://github.com/CLIxIndia-Dev/qbank-lite/compare/v3.18.1...v3.19.0
 [3.18.1]: https://github.com/CLIxIndia-Dev/qbank-lite/compare/v3.18.0...v3.18.1
 [3.18.0]: https://github.com/CLIxIndia-Dev/qbank-lite/compare/v3.17.0...v3.18.0
 [3.17.0]: https://github.com/CLIxIndia-Dev/qbank-lite/compare/v3.16.5...v3.17.0

diff --git a/dlkit_configs/configs.py b/dlkit_configs/configs.py
@@ -290,6 +290,14 @@
                 {'value': False, 'priority': 1}
             ]
         },
+        'bypassAuthorizationForFilesRecordAssetContentLookup': {
+            'syntax': 'BOOLEAN',
+            'displayName': 'Use direct AssetContentLookup for FilesRecord map',
+            'description': 'Bypasses any catalog-hierarchy based authorization for (Asset) AssetContent lookup',
+            'values': [
+                {'value': False, 'priority': 1}
+            ]
+        },
     }
 }
 

diff --git a/main.py b/main.py
@@ -47,7 +47,7 @@ def GET(self, path=None):
 
 class version:
     def GET(self):
-        return '3.18.1'
+        return '3.19.0'
 
 
 class video_test:

diff --git a/requirements.txt b/requirements.txt
@@ -3,7 +3,7 @@ bs4==0.0.1
 cffi==1.7.0
 cryptography==1.4
 diskcache==3.0.1
-dlkit==0.6.9
+dlkit==0.7.0
 enum34==1.1.6
 gunicorn==19.7.1
 html5lib==0.9999999