Bläddra i källkod

HUE-1176 [core] Rename user preference API url to be more intuitive

Romain Rigaux 8 år sedan
förälder
incheckning
dd434f0

+ 3 - 3
desktop/core/src/desktop/lib/django_util_test.py

@@ -162,12 +162,12 @@ def test_reverse_with_get():
   # Basic view
   assert_equal("/", reverse_with_get("desktop.views.index"))
   # Arguments for the view
-  assert_equal("/desktop/api2/get_user_preferences/foo", reverse_with_get("desktop.api2.user_preferences", kwargs=dict(key="foo")))
+  assert_equal("/desktop/api2/user_preferences/foo", reverse_with_get("desktop.api2.user_preferences", kwargs=dict(key="foo")))
   # Arguments for the view as well as GET parameters
-  assert_equal("/desktop/api2/get_user_preferences/foo?a=1&b=2",
+  assert_equal("/desktop/api2/user_preferences/foo?a=1&b=2",
     reverse_with_get("desktop.api2.user_preferences", kwargs=dict(key="foo"), get=dict(a=1,b=2)))
   # You can use a list of args instead of kwargs, too
-  assert_equal("/desktop/api2/get_user_preferences/foo?a=1&b=2",
+  assert_equal("/desktop/api2/user_preferences/foo?a=1&b=2",
     reverse_with_get("desktop.api2.user_preferences", args=["foo"], get=dict(a=1,b=2)))
   # Just GET parameters
   assert_equal("/?a=1", reverse_with_get("desktop.views.index", get=dict(a="1")))

+ 3 - 3
desktop/core/src/desktop/models.py

@@ -1526,9 +1526,9 @@ class ClusterConfig():
       if apps.get(user_default_app['app']):
         default_app = self.get_apps()[user_default_app['app']]
         if default_app.get('interpreters'):
-          interpreters = [interpreter for interpreter in default_app['interpreters'] if interpreter['type'] == default_app['interpreter']]
+          interpreters = [interpreter for interpreter in default_app['interpreters'] if interpreter['type'] == user_default_app['interpreter']]
           if interpreters:
-            default_interpreter = interpreter[0]
+            default_interpreter = interpreters
     except UserPreferences.DoesNotExist:
       pass
     except Exception:
@@ -1566,7 +1566,7 @@ class ClusterConfig():
         'name': 'editor',
         'displayName': _('Editor'),
         'interpreters': interpreters,
-        'page': interpreters[0 if len(interpreters) == 1 else 1]['page']
+        'page': interpreters[0]['page']
       }
     else:
       return None

+ 11 - 11
desktop/core/src/desktop/tests.py

@@ -281,34 +281,34 @@ def test_prefs():
   c = make_logged_in_client()
 
   # Get everything
-  response = c.get('/desktop/api2/get_user_preferences/')
+  response = c.get('/desktop/api2/user_preferences/')
   assert_equal({}, json.loads(response.content)['data'])
 
   # Set and get
-  response = c.post('/desktop/api2/get_user_preferences/foo', {'set': 'bar'})
+  response = c.post('/desktop/api2/user_preferences/foo', {'set': 'bar'})
   assert_equal('bar', json.loads(response.content)['data']['foo'])
-  response = c.get('/desktop/api2/get_user_preferences/')
+  response = c.get('/desktop/api2/user_preferences/')
   assert_equal('bar', json.loads(response.content)['data']['foo'])
 
   # Reset (use post this time)
-  c.post('/desktop/api2/get_user_preferences/foo', {'set': 'baz'})
-  response = c.get('/desktop/api2/get_user_preferences/foo')
+  c.post('/desktop/api2/user_preferences/foo', {'set': 'baz'})
+  response = c.get('/desktop/api2/user_preferences/foo')
   assert_equal('baz', json.loads(response.content)['data']['foo'])
 
   # Check multiple values
-  c.post('/desktop/api2/get_user_preferences/elephant', {'set': 'room'})
-  response = c.get('/desktop/api2/get_user_preferences/')
+  c.post('/desktop/api2/user_preferences/elephant', {'set': 'room'})
+  response = c.get('/desktop/api2/user_preferences/')
   assert_true("baz" in json.loads(response.content)['data'].values(), response.content)
   assert_true("room" in json.loads(response.content)['data'].values(), response.content)
 
   # Delete everything
-  c.post('/desktop/api2/get_user_preferences/elephant', {'delete': ''})
-  c.post('/desktop/api2/get_user_preferences/foo', {'delete': ''})
-  response = c.get('/desktop/api2/get_user_preferences/')
+  c.post('/desktop/api2/user_preferences/elephant', {'delete': ''})
+  c.post('/desktop/api2/user_preferences/foo', {'delete': ''})
+  response = c.get('/desktop/api2/user_preferences/')
   assert_equal({}, json.loads(response.content)['data'])
 
   # Check non-existent value
-  response = c.get('/desktop/api2/get_user_preferences/doesNotExist')
+  response = c.get('/desktop/api2/user_preferences/doesNotExist')
   assert_equal(None, json.loads(response.content)['data'])
 
 

+ 1 - 1
desktop/core/src/desktop/urls.py

@@ -136,7 +136,7 @@ dynamic_patterns += patterns('desktop.api2',
   (r'^desktop/api2/doc/share/?$', 'share_document'),
 
   (r'^desktop/api2/get_config/?$', 'get_config'),
-  (r'^desktop/api2/get_user_preferences/(?P<key>\w+)?$', 'user_preferences'),
+  (r'^desktop/api2/user_preferences/(?P<key>\w+)?$', 'user_preferences'),
 
   (r'^desktop/api2/doc/export/?$', 'export_documents'),
   (r'^desktop/api2/doc/import/?$', 'import_documents'),