Commit Graph

98 Commits

Author SHA1 Message Date
Joe Tsoi f9d0bba7df Merge pull request #13 from ckan/unstable
Redo the threading bits
2015-11-10 12:16:55 +00:00
Ian Ward eee49aef51 Merge pull request #14 from gjlawran/master
Adding AGPL 3  license to repo.
2015-06-10 11:19:34 -04:00
Greg Lawrance 3fc3838b15 Adding AGPL 3 license to repo. 2015-04-21 12:43:30 -07:00
nigelb 7c723aa3dc Merge remote-tracking branch 'maxious/api-analytics-event-tracking' into unstable
Conflicts:
	ckanext/googleanalytics/__init__.py
2015-02-17 11:07:06 +05:30
nigelb 13cc8c28d5 Re-land the new tracking from @maxious
This reverts commit f4fce47601.
2015-02-17 11:05:19 +05:30
Alex Sadleir d2d5a5fc48 Move API analytics thread pool initialisation to plugin configuration
One pool should then be available to all controllers avoiding errors with
mod_wsgi under Apache as the number of threads grows infinitely.
2015-02-16 17:52:27 +11:00
nigelb f4fce47601 Revert "Merge pull request #6 from datagovau/api-analytics-event-tracking"
This reverts commit 0febe11dc5, reversing
changes made to e45d73d7a3.

This has been reverted for caushing Apache to max out threads when running
under mod_wsgi.
2015-02-13 14:22:53 +05:30
David Read 0febe11dc5 Merge pull request #6 from datagovau/api-analytics-event-tracking
Google Analytics Event Tracking for CKAN API
2014-11-05 11:38:26 +00:00
Alex Sadleir 803b3f7f81 Use pool of threads and queue for Google Analytics Event Tracking requests 2014-11-05 13:39:53 +11:00
Alex Sadleir 5809f205f5 Use urllib2 timeout for Google Analytics Event Tracking requests 2014-11-05 12:51:51 +11:00
Alex Sadleir d9f811cea7 PEP8 fixes for Google Analytics Event Tracking for CKAN API 2014-11-05 12:43:24 +11:00
root f83664c98e fix typo 2014-07-24 22:58:40 +00:00
Nigel Babu e45d73d7a3 Merge pull request #10 from alexandrainst/master
Declare namespace in ckanext/googleanalytics/__init__.py
2014-07-10 14:15:15 +05:30
Justas Azna 51c212c57c Declare namespace in ckanext/googleanalytics/__init__.py 2014-07-09 18:24:05 +02:00
CKAN data.gov.au 482d8e2ada Use universal analytics 2014-05-22 07:06:47 +00:00
Nigel Babu 78cd2a95a6 Change github URL 2014-01-29 15:08:13 +05:30
Alex Sadleir 56fbb853a4 Adds Google Analytics Event Tracking to some API calls so that usage
of the CKAN API can be reported on via Google Analytics.
2013-11-26 20:26:09 +11:00
Sean Hammond 6d7aa555c3 Fix resource download event tracking js 2013-04-15 19:55:31 +02:00
Sean Hammond b9879ad28d Use g not config in templates
config is no longer available to templates (changed in CKAN core), use g
instead.

This means I have to rename googleanalytics.resource_prefix to
googleanalytics_resource_prefix, because it's now an attribute and can't
have a . in it.

Should probably be using g rather than config to access the setting in
the Python code as well..
2012-12-20 21:39:24 +00:00
Sean Hammond f2c0763fed Merge branch 'master' of github.com:okfn/ckanext-googleanalytics 2012-12-20 21:33:40 +00:00
Sean Hammond ffa86c010d Remove ckan.authz
It has been removed in CKAN 2.0, trying to import it makes CKAN crash on
startup.

This means that get_top_packages() is broken, and needs to be rewritten
to work with CKAN 2.0. At least by removing the import the plugin can
be loaded and its other functions used but if you try to use
get_top_packages() it will crash.
2012-12-20 21:32:53 +00:00
Ross Jones 13a57cd455 Fixed issue where add_resource was used regardless of ckan version 2012-10-23 17:42:04 +01:00
John Martin f254d1afd7 Tweaks to google analytics CKAN 2.0 JS module
1. Specified `resource_prefix` and `resource_url` context more tightly (could be global context)
2. Changed `this.href` to `jQuery(this).prop('href')` as it will never throw a syntax error when upon the condition of a `a.resource-url-analytics` not having a `href` attribute
3. Also added check so that if no `href` is present it doesn't send a blank link to google analytics
2012-10-23 10:21:41 +01:00
Sean Hammond e6bf938054 Update the README 2012-10-19 17:15:45 +02:00
Sean Hammond 70dc8c78d4 Add CKAN 2.0 resource download event tracking 2012-10-19 16:10:58 +02:00
Sean Hammond 58693e9d26 Remove a broken reference to googleanalytics_footer()
googleanalytics_footer() was removed by a previous commit
2012-10-18 19:52:24 +02:00
Sean Hammond e02ccc7438 Merge branch 'master' of github.com:okfn/ckanext-googleanalytics 2012-10-18 19:46:53 +02:00
Sean Hammond a1672cb0ad Remove googleanalytics_footer
It didn't do anything yet and I don't think it will be needed for Google
Analytics Event Tracking with CKAN 2.0 anyway.
2012-10-18 19:46:03 +02:00
Ross Jones c5b7121251 An example, but empty credentials file 2012-10-18 16:02:26 +01:00
Ross Jones c4a720840b Merge pull request #3 from okfn/v3support
V3support
2012-10-18 07:22:12 -07:00
Ross Jones b1585b5c24 Update readme with info about legacy templates 2012-10-18 15:18:14 +01:00
Ross Jones 5ad904400b Minor tidy up 2012-10-18 15:15:43 +01:00
Ross Jones 459ff608a6 Fixes to make sure that data collected for reports is working
Make sure we handle the changes to the API to ensure we collect the
dataset and resource information
2012-10-18 15:11:01 +01:00
Ross Jones 2283571562 Attempts to provide support for v3 of the Google Analytics API.
Since version 2 of the Google Analytics API was shelved the download
of previous data was broken.  This commit should, once the oauth dance
has been complete, allow it to work again by changing all of the calls.
See the README for instructions on setting up OAUTH.  Other bug fixes
are:

- Resources views are now clearly identified
- Package Ids are set for /dataset/edit requests
- Updated README
2012-10-18 13:47:30 +01:00
Sean Hammond 32e3556d26 Remove event tracking support from CKAN 2.0
I'm not going to finish implementing Google Analytics Event Tracking
support for CKAN 2.0 at this point, it can be implemented later if
needed (event tracking with CKAN 1.x should still work).
2012-10-17 17:39:43 +02:00
Sean Hammond 53a778161f Add CKAN 2.0 templates for Google Analytics tracking
Everything should still work as it did with CKAN 1.x templates _if_
ckan.legacy_templates is set in your ini file.

The event tracking javascript (ckanext-googleanalytics.js) still needs
to be updated for CKAN 2.0.

Also there is some code in plugin.py:filter() that adds something to the
package and group pages that I haven't implemented for CKAN 2.0 yet.

Tests need to be updated.

README needs to be updated.
2012-10-17 13:06:31 +02:00
Sean Hammond 8f5d60821f Add some docstrings
Make things slightly easier to follow.
2012-10-16 16:03:41 +02:00
Sean Hammond dcce83bb31 Fix up imports in plugin.py
Follow CKAN coding standards: don't use from foo import bar, but
standard library imports before all other imports and ckan imports after
all other imports.
2012-10-16 15:55:15 +02:00
Sean Hammond bdef9ea233 Move templates and public to legacy_templates and legacy_public
Making way for new CKAN 2.0 templates and scripts to be added.

This shouldn't break existing CKAN 1.x functionality.
2012-10-16 15:39:27 +02:00
John Glover 45a4e5b4d2 Update tests: gasnippet.gacode renamed to gasnippet.header_code.
JS should not be added on the dataset view page
any more so remove that test.
2012-07-23 12:11:09 +01:00
John Glover 0cb3944ccd Merge branch '2551-feature-track-events' 2012-07-23 11:53:00 +01:00
John Glover df3f575119 Add remaining track events. 2012-07-23 11:48:59 +01:00
John Glover ffd28f4619 Add first batch of Google Analytics track events. 2012-07-11 16:40:17 +01:00
John Glover 03b4023676 Add 'track_events' config option, tidy up config
reading.
2012-07-11 14:34:18 +01:00
John Glover 1fa09bae92 Tidy up imports a bit in plugin.py 2012-07-11 10:38:47 +01:00
amercader 1f534141ed [ui][xs] Show downloads instead of headers on table headers 2012-05-10 16:47:20 +01:00
amercader 7373e814fd Merge branch 'enhancement-2251-tracking' 2012-05-10 16:46:32 +01:00
amercader 02644f1d2d Merge branch 'master' into enhancement-2251-tracking 2012-05-10 15:56:40 +01:00
amercader a8747809d2 [ui] Update summary page design and links 2012-05-10 13:44:29 +01:00
amercader 8f22a3a3a0 [doc] Update README 2012-05-10 13:43:36 +01:00