Merge branch 'dev' into 59-datenserien-kennzeichnen

ckanext/odsh/plugin.py

@@ -45,7 +45,7 @@ class OdshPlugin(plugins.SingletonPlugin, DefaultTranslation, DefaultDatasetForm
 
     # IBlueprint
     def get_blueprint(self):
-        log.info("OdshPlugin::get_blueprint")
+        log.debug("OdshPlugin::get_blueprint")
 
         # Default
         bp_default = default.blueprint

ckanext/odsh/tests_wip/test_datarequest.py

 
-from ckanext.odsh.tests.test_helpers import AppProxy
-import ckanext.odsh.tests.test_helpers as testhelpers
+from ckanext.odsh.tests_wip.test_helpers import AppProxy
+import ckanext.odsh.tests_wip.test_helpers as testhelpers
 import ckan.tests.factories as factories
 import uuid
 import pdb
-from ckanext.odsh.tests.harvest_sever_mock import HarvestServerMock
-import ckanext.odsh.tests.harvest_sever_mock as harvest_sever_mock
+from ckanext.odsh.tests_wip.harvest_sever_mock import HarvestServerMock
+import ckanext.odsh.tests_wip.harvest_sever_mock as harvest_sever_mock
 import subprocess
 import re
 

ckanext/odsh/tests_wip/test_harvest.py

-from ckanext.odsh.tests.test_helpers import AppProxy
-import ckanext.odsh.tests.test_helpers as testhelpers
+from ckanext.odsh.tests_wip.test_helpers import AppProxy
+import ckanext.odsh.tests_wip.test_helpers as testhelpers
 import ckan.tests.factories as factories
 import uuid
 import pdb
-from ckanext.odsh.tests.harvest_sever_mock import HarvestServerMock
-import ckanext.odsh.tests.harvest_sever_mock as harvest_sever_mock
+from ckanext.odsh.tests_wip.harvest_sever_mock import HarvestServerMock
+import ckanext.odsh.tests_wip.harvest_sever_mock as harvest_sever_mock
 import subprocess
 
 

ckanext/odsh/tests_wip/test_selenium.py

 # coding: utf-8
 
-from ckanext.odsh.tests.ckan_selenium import SeleniumCkanApp
+from ckanext.odsh.tests_wip.ckan_selenium import SeleniumCkanApp
 import pdb
 import uuid
 

ckanext/odsh/views/dashboard.py

@@ -12,7 +12,7 @@ blueprint = Blueprint('odsh_dashboard', __name__)
 
 
 def dashboard(offset=0):
-    log.info("views.dashboard::dashboard")
+    log.debug("views.dashboard::dashboard")
     is_sysadmin = authz.is_sysadmin(g.user)
 
     if not is_sysadmin:
@@ -22,7 +22,7 @@ def dashboard(offset=0):
 
 
 def dashboard_datasets():
-    log.info("views.dashboard::dashboard_datasets")
+    log.debug("views.dashboard::dashboard_datasets")
     is_sysadmin = authz.is_sysadmin(g.user)
 
     if not is_sysadmin:

ckanext/odsh/views/default.py

@@ -8,19 +8,19 @@ log = logging.getLogger(__name__)
 blueprint = Blueprint('odsh_default', __name__)
 
 def info_page():
-    log.info("views.default::info_page")
+    log.debug("views.default::info_page")
     return toolkit.redirect_to('http://www.schleswig-holstein.de/odpinfo')
 
 def start():
-    log.info("views.default::start")
+    log.debug("views.default::start")
     return toolkit.redirect_to('/dataset')
 
 def not_found():
-    log.info("views.default::not_found")
+    log.debug("views.default::not_found")
     toolkit.abort(404)
 
 def robots_txt():
-    log.info("views.default::robots_txt")
+    log.debug("views.default::robots_txt")
     resp = make_response(base.render('home/robots.txt'))
     resp.headers['Content-Type'] = "text/plain; charset=utf-8"
     return resp

ckanext/odsh/views/package.py

@@ -9,5 +9,5 @@ log = logging.getLogger(__name__)
 blueprint = Blueprint('odsh_package', __name__)
 
 def redirect_dataset_resource(id, resource_id):
-    log.info("views.package::redirect_dataset_resource")
+    log.debug("views.package::redirect_dataset_resource")
     return toolkit.redirect_to('/dataset/{}'.format(id))

ckanext/odsh/views/user.py

@@ -12,7 +12,7 @@ blueprint = Blueprint('odsh_user', __name__)
 
 
 def index():
-    log.info("views.user::index")
+    log.debug("views.user::index")
     is_sysadmin = authz.is_sysadmin(g.user)
 
     if not is_sysadmin:
@@ -21,7 +21,7 @@ def index():
 
 
 # def register():
-#     log.info("views.user::register")
+#     log.debug("views.user::register")
 #     is_sysadmin = authz.is_sysadmin(g.user)
 
 #     if not is_sysadmin:
@@ -30,14 +30,14 @@ def index():
 
 
 def read(id=None):
-    log.info("views.user::read")
+    log.debug("views.user::read")
     if not g.user:
         return ckan_user_view.login()
     return ckan_user_view.read(id)
 
 
 def activity(id, offset=0):
-    log.info("views.user::activity")
+    log.debug("views.user::activity")
     is_sysadmin = authz.is_sysadmin(g.user)
 
     if not is_sysadmin: