Fixed 'Open task' button doesn't work (cvat-ai#1474)

xindiguo · Apr 30, 2020 · ee6deba · ee6deba
1 parent f4ae611
commit ee6deba
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 35 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -33,6 +33,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - CVAT new UI: add arrows on a mouse cursor (<https://github.com/opencv/cvat/pull/1391>)
 - Delete point bug (in new UI) (<https://github.com/opencv/cvat/pull/1440>)
 - Fix apache startup after PC restart (https://github.com/opencv/cvat/pull/1467)
+- Open task button doesn't work (https://github.com/opencv/cvat/pull/1474)
 
 ### Security
 -

diff --git a/cvat/apps/documentation/installation.md b/cvat/apps/documentation/installation.md
@@ -539,34 +539,33 @@ server {
 server {
     listen       443 ssl;
     server_name  ${CVAT_HOST};
+
+    proxy_pass_header       X-CSRFToken;
+    proxy_set_header        Host $http_host;
+    proxy_pass_header       Set-Cookie;
+
     ssl_certificate /cert/certificate.cer;
     ssl_certificate_key /cert/certificate.key;
 
     location ~* /api/.*|git/.*|tensorflow/.*|auto_annotation/.*|analytics/.*|static/.*|admin|admin/.*|documentation/.*|dextr/.*|reid/.*  {
         proxy_pass              http://cvat:8080;
-        proxy_pass_header       X-CSRFToken;
-        proxy_set_header        Host $http_host;
-        proxy_pass_header       Set-Cookie;
     }
 
-    location / {
-        # workaround for match location by arguments
+    # workaround for match location by arguments
+    location = / {
         error_page 418 = @annotation_ui;
 
         if ( $query_string ~ "^id=\d+.*" ) { return 418; }
+        proxy_pass              http://cvat_ui;
+    }
 
+    location / {
         proxy_pass              http://cvat_ui;
-        proxy_pass_header       X-CSRFToken;
-        proxy_set_header        Host $http_host;
-        proxy_pass_header       Set-Cookie;
     }
 
     # old annotation ui, will be removed in the future.
     location @annotation_ui {
         proxy_pass              http://cvat:8080;
-        proxy_pass_header       X-CSRFToken;
-        proxy_set_header        Host $http_host;
-        proxy_pass_header       Set-Cookie;
     }
 }
 ```

diff --git a/cvat/settings/base.py b/cvat/settings/base.py
@@ -187,19 +187,7 @@ def generate_ssh_keys():
     'dj_pagination.middleware.PaginationMiddleware',
 ]
 
-# Cross-Origin Resource Sharing settings for CVAT UI
-UI_SCHEME = os.environ.get('UI_SCHEME', 'http')
-UI_HOST = os.environ.get('UI_HOST', 'localhost')
-UI_PORT = os.environ.get('UI_PORT', '3000')
-CORS_ALLOW_CREDENTIALS = True
-CSRF_TRUSTED_ORIGINS = [UI_HOST]
-UI_URL = '{}://{}'.format(UI_SCHEME, UI_HOST)
-
-if UI_PORT and UI_PORT != '80':
-    UI_URL += ':{}'.format(UI_PORT)
-
-CORS_ORIGIN_WHITELIST = [UI_URL]
-CORS_REPLACE_HTTPS_REFERER = True
+UI_URL = ''
 
 STATICFILES_FINDERS = [
     'django.contrib.staticfiles.finders.FileSystemFinder',

diff --git a/cvat/settings/development.py b/cvat/settings/development.py
@@ -26,3 +26,17 @@
         'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
     }
 }
+
+# Cross-Origin Resource Sharing settings for CVAT UI
+UI_SCHEME = os.environ.get('UI_SCHEME', 'http')
+UI_HOST = os.environ.get('UI_HOST', 'localhost')
+UI_PORT = os.environ.get('UI_PORT', 3000)
+CORS_ALLOW_CREDENTIALS = True
+CSRF_TRUSTED_ORIGINS = [UI_HOST]
+UI_URL = '{}://{}'.format(UI_SCHEME, UI_HOST)
+
+if UI_PORT and UI_PORT != '80':
+    UI_URL += ':{}'.format(UI_PORT)
+
+CORS_ORIGIN_WHITELIST = [UI_URL]
+CORS_REPLACE_HTTPS_REFERER = True
diff --git a/cvat_proxy/conf.d/cvat.conf.template b/cvat_proxy/conf.d/cvat.conf.template
@@ -8,30 +8,28 @@ server {
     listen       80;
     server_name  ${CVAT_HOST};
 
+    proxy_pass_header       X-CSRFToken;
+    proxy_set_header        Host $http_host;
+    proxy_pass_header       Set-Cookie;
+
     location ~* /api/.*|git/.*|tensorflow/.*|auto_annotation/.*|analytics/.*|static/.*|admin|admin/.*|documentation/.*|dextr/.*|reid/.*  {
         proxy_pass              http://cvat:8080;
-        proxy_pass_header       X-CSRFToken;
-        proxy_set_header        Host $http_host;
-        proxy_pass_header       Set-Cookie;
     }
 
-    location / {
-        # workaround for match location by arguments
+    # workaround for match location by arguments
+    location = / {
         error_page 418 = @annotation_ui;
 
         if ( $query_string ~ "^id=\d+.*" ) { return 418; }
+        proxy_pass              http://cvat_ui;
+    }
 
+    location / {
         proxy_pass              http://cvat_ui;
-        proxy_pass_header       X-CSRFToken;
-        proxy_set_header        Host $http_host;
-        proxy_pass_header       Set-Cookie;
     }
 
     # old annotation ui, will be removed in the future.
     location @annotation_ui {
         proxy_pass              http://cvat:8080;
-        proxy_pass_header       X-CSRFToken;
-        proxy_set_header        Host $http_host;
-        proxy_pass_header       Set-Cookie;
     }
 }