Merge branch '2375-demo-organizations' of github.com:okfn/ckan into 2…

…375-demo-organizations

ckan/public/base/javascript/modules/autocomplete.js

@@ -18,6 +18,7 @@ this.ckan.module('autocomplete', function (jQuery, _) {
       tags: false,
       items: 10,
       source: null,
+      completions: null,
       interval: 1000,
       dropdownClass: '',
       containerClass: '',
@@ -98,6 +99,9 @@ this.ckan.module('autocomplete', function (jQuery, _) {
       var source = parts.join('?') + encodeURIComponent(string) + end;
       var client = this.sandbox.client;
       var options = {format: client.parseCompletionsForPlugin};
+      if (this.options.completions) {
+        options.format = this[this.options.completions];
+      }
 
       return client.getCompletions(source, options, fn);
     },
@@ -223,6 +227,25 @@ this.ckan.module('autocomplete', function (jQuery, _) {
       return formatted;
     },
 
+    /* Callback for completions for when querying users
+     *
+     * Returns results object
+     */
+    parseCompletionsForUsers: function (data) {
+      var users = [];
+      jQuery.each(data, function() {
+        if (typeof this.name != 'undefined') {
+          users.push({
+            id: this.name,
+            text: this.name
+          });
+        } else {
+          users.push(this);
+        }
+      });
+      return { results: users };
+    },
+
     /* Callback triggered when the select2 plugin needs to make a request.
      *
      * Returns nothing.

ckan/templates/organization/users_form.html

@@ -47,12 +47,14 @@
 		</tbody>
 	</table>
 
-	<legend>{{ _('Add user') }}</legend>
-	<div class="control-group organization-adduser">
-		<label for="users__{{data.users|length}}__name" class="control-label">{{ _('Username') }}</label>
-		<div class="controls">
-			<input id="users__{{data.users|length}}__name" name="users__{{data.users|length}}__name" type="text">
-			<input id="users__{{data.users|length}}__capacity" name="users__{{data.users|length}}__capacity" value="editor" type="hidden">
+	<div class="organization-adduser">
+		<legend>{{ _('Add user') }}</legend>
+		<div class="control-group">
+			<label for="users__{{data.users|length}}__name" class="control-label">{{ _('Username') }}</label>
+			<div class="controls">
+				<input id="users__{{data.users|length}}__name" name="users__{{data.users|length}}__name" type="text" data-module="autocomplete" data-module-source="/api/2/util/user/autocomplete?q=?" data-module-completions="parseCompletionsForUsers">
+				<input id="users__{{data.users|length}}__capacity" name="users__{{data.users|length}}__capacity" value="editor" type="hidden">
+			</div>
 		</div>
 	</div>
 

ckan/tests/__init__.py

@@ -45,6 +45,7 @@
            'CkanServerCase',
         ]
 
+
 here_dir = os.path.dirname(os.path.abspath(__file__))
 conf_dir = os.path.dirname(os.path.dirname(here_dir))
 
@@ -404,3 +405,4 @@ class StatusCodes:
     STATUS_404_NOT_FOUND = 404
     STATUS_409_CONFLICT = 409
 
+

ckan/tests/functional/test_activity.py

@@ -19,6 +19,9 @@ class TestActivity(HtmlCheckMethods):
     """
     @classmethod
     def setup(cls):
+        from nose import SkipTest
+        raise SkipTest("Disable UI tests for 2.0 branch")
+
         ckan.tests.CreateTestData.create()
         cls.sysadmin_user = ckan.model.User.get('testsysadmin')
         cls.app = paste.fixture.TestApp(pylonsapp)

ckan/tests/functional/test_admin.py

@@ -1,11 +1,12 @@
 import ckan.model as model
 from ckan.tests import url_for, CreateTestData, WsgiAppCase
-from nose.plugins.skip import SkipTest
 
 class TestAdminController(WsgiAppCase):
     @classmethod
     def setup_class(cls):
-        raise SkipTest()
+        from nose import SkipTest
+        raise SkipTest("Disable UI tests for 2.0 branch")
+
 
         # setup test data including testsysadmin user
         CreateTestData.create()
@@ -34,11 +35,12 @@ class TestAdminAuthzController(WsgiAppCase):
 
     @classmethod
     def setup_class(cls):
-        # setup test data including testsysadmin user
+        from nose import SkipTest
+        raise SkipTest("Disable UI tests for 2.0 branch")
+
         CreateTestData.create()
         model.Session.commit()
 
-        raise SkipTest()
 
     @classmethod
     def teardown_class(self):
@@ -160,9 +162,11 @@ def get_roles_by_name(user=None, group=None):
 
 class TestAdminTrashController(WsgiAppCase):
     def setup(cls):
+        from nose import SkipTest
+        raise SkipTest("Disable UI tests for 2.0 branch")
+
         model.repo.rebuild_db()
         CreateTestData.create()
-        raise SkipTest()
 
     def teardown(self):
         model.repo.rebuild_db()

ckan/tests/functional/test_authz.py

@@ -23,7 +23,9 @@ class AuthzTestBase(object):
 
     @classmethod
     def setup_class(self):
-        raise SkipTest()
+        from nose import SkipTest
+        raise SkipTest("Disable UI tests for 2.0 branch")
+
         setup_test_search_index()
         self._create_test_data()
         model.Session.remove()
@@ -592,7 +594,9 @@ class TestLockedDownViaRoles(TestController):
     '''
     @classmethod
     def setup_class(self):
-        raise SkipTest()
+        from nose import SkipTest
+        raise SkipTest("Disable UI tests for 2.0 branch")
+
         model.repo.init_db()
         q = model.Session.query(model.UserObjectRole) \
             .filter(sa.or_(model.UserObjectRole.role==model.Role.EDITOR,

ckan/tests/functional/test_edit_authz.py

@@ -28,6 +28,9 @@ def check_and_set_checkbox(theform, user, role, should_be, set_to):
 class TestEditAuthz(TestController):
     @classmethod
     def setup_class(self):
+        from nose import SkipTest
+        raise SkipTest("Disable UI tests for 2.0 branch")
+
         # for the authorization editing tests we set up test data so:
         # three users, sysadmin , administrator, and another
         # one group, one package

ckan/tests/functional/test_follow.py

@@ -9,6 +9,9 @@ class TestFollow(HtmlCheckMethods):
 
     @classmethod
     def setupClass(cls):
+        from nose import SkipTest
+        raise SkipTest("Disable UI tests for 2.0 branch")
+
         ckan.tests.CreateTestData.create()
         cls.testsysadmin = ckan.model.User.get('testsysadmin')
         cls.annafan = ckan.model.User.get('annafan')
@@ -66,8 +69,8 @@ def test_dataset_read_not_logged_in(self):
         assert 'href="/dataset/followers/annakarenina"' in result
         assert 'Followers (3)' in result
         assert 'id="dataset_follow_button"' not in result
-    
-    def test_dataset_followers_not_logged_in(self): 
+
+    def test_dataset_followers_not_logged_in(self):
         offset = url_for(controller='package', action='followers',
                 id='warandpeace')
         result = self.app.get(offset)
@@ -101,7 +104,7 @@ def test_user_read_not_logged_in(self):
         assert 'href="/user/followers/annafan"' in result
         assert 'Followers (2)' in result
         assert 'id="user_follow_button"' not in result
-    
+
     def test_user_followers_not_logged_in(self):
         offset = url_for(controller='user', action='followers',
                 id='joeadmin')
@@ -137,7 +140,7 @@ def test_own_user_read_logged_in(self):
         assert 'href="/user/followers/annafan"' in result
         assert 'My Followers (2)' in result
         assert 'id="user_follow_button"' not in result
-    
+
     def test_own_user_followers_logged_in(self):
         offset = url_for(controller='user', action='followers',
                 id='joeadmin')
@@ -205,7 +208,7 @@ def test_dataset_follow_logged_in(self):
         extra_environ = {'Authorization': str(self.joeadmin.apikey)}
         result = self.app.get(offset, extra_environ=extra_environ)
         assert 'Unfollow' in result
-        
+
     def test_user_read_logged_in(self):
         offset = url_for(controller='user', action='read',
                 id='joeadmin')

ckan/tests/functional/test_group.py

@@ -52,7 +52,7 @@ class TestGroup(FunctionalTestCase):
     @classmethod
     def setup_class(self):
         from nose import SkipTest
-        raise SkipTest("Use organizations instead of groups")
+        raise SkipTest("Disable UI tests for 2.0 branch")
 
         model.Session.remove()
         CreateTestData.create()
@@ -234,7 +234,7 @@ class TestGroupWithSearch(FunctionalTestCase):
     @classmethod
     def setup_class(self):
         from nose import SkipTest
-        raise SkipTest("Use organizations instead of groups")
+        raise SkipTest("Disable UI tests for 2.0 branch")
 
         setup_test_search_index()
         model.Session.remove()
@@ -280,7 +280,7 @@ class TestEdit(FunctionalTestCase):
     @classmethod
     def setup_class(self):
         from nose import SkipTest
-        raise SkipTest("Use organizations instead of groups")
+        raise SkipTest("Disable UI tests for 2.0 branch")
 
         setup_test_search_index()
         model.Session.remove()
@@ -507,7 +507,7 @@ class TestNew(FunctionalTestCase):
     @classmethod
     def setup_class(self):
         from nose import SkipTest
-        raise SkipTest("Use organizations instead of groups")
+        raise SkipTest("Disable UI tests for 2.0 branch")
 
         model.Session.remove()
         CreateTestData.create()
@@ -627,7 +627,7 @@ class TestRevisions(FunctionalTestCase):
     @classmethod
     def setup_class(self):
         from nose import SkipTest
-        raise SkipTest("Use organizations instead of groups")
+        raise SkipTest("Disable UI tests for 2.0 branch")
 
         model.Session.remove()
         CreateTestData.create()

ckan/tests/functional/test_home.py

@@ -13,11 +13,14 @@
 class TestHomeController(TestController, PylonsTestCase, HtmlCheckMethods):
     @classmethod
     def setup_class(cls):
+        from nose import SkipTest
+        raise SkipTest("Disable UI tests for 2.0 branch")
+
         setup_test_search_index()
         PylonsTestCase.setup_class()
         model.repo.init_db()
         CreateTestData.create()
-        
+
     @classmethod
     def teardown_class(self):
         model.repo.rebuild_db()
@@ -36,7 +39,7 @@ def test_packages_link(self):
         offset = url_for('home')
         res = self.app.get(offset)
         res.click('Search', index=0)
-        
+
     def test_template_head_end(self):
         offset = url_for('home')
         res = self.app.get(offset)
@@ -98,7 +101,7 @@ def test_template_footer_end(self):
 ##            tag='a', href_attr='href',
 ##            href_extract=None,
 ##            content='Deutsch',
-##            id=None, 
+##            id=None,
 ##            href_pattern=None,
 ##            html_pattern=None,
 ##            index=None, verbose=False)
@@ -219,12 +222,15 @@ def test_update_profile_notice(self):
 class TestHomeControllerWithoutSearch(TestController, PylonsTestCase, HtmlCheckMethods):
     @classmethod
     def setup_class(cls):
+        from nose import SkipTest
+        raise SkipTest("Disable UI tests for 2.0 branch")
+
         PylonsTestCase.setup_class()
-        
+
     @classmethod
     def teardown_class(self):
         model.repo.rebuild_db()
-        
+
     def test_404(self):
         offset = '/some_nonexistent_url'
         res = self.app.get(offset, status=404)
@@ -238,6 +244,9 @@ def test_about(self):
 class TestDatabaseNotInitialised(TestController):
     @classmethod
     def setup_class(cls):
+        from nose import SkipTest
+        raise SkipTest("Disable UI tests for 2.0 branch")
+
         PylonsTestCase.setup_class()
         model.repo.clean_db()