Closed hwidmann closed 7 years ago
Hi Mikael, fixed all commented issues - except the link to the term_of_use of EUDAT, see my in-lined comment below - and created a next pull request.
Am 16.05.2017 um 15:37 schrieb Mikael Karlsson:
@noumar commented on this pull request. In ckanext/b2find/plugin.py https://github.com/EUDAT-B2FIND/ckanext-b2find/pull/9#discussion_r116701762: map.connect( 'help', '/help', controller='ckanext.b2find.controller:HelpController', action='index' ) map.connect( 'help_action', '/help/{action}.html', controller='ckanext.b2find.controller:HelpController' ) map.connect( 'guidelines', '/guidelines', controller='ckanext.b2find.controller:GuidelinesController', action='index' Guidelines controller doesn't have an index method. Please remove this block or it will crash. In ckanext/b2find/controller.py https://github.com/EUDAT-B2FIND/ckanext-b2find/pull/9#discussion_r116703084: @@ -16,3 +16,44 @@ def nutzungsbedingungen(self): class DocsController(base.BaseController): def search_guide(self): return plugins.toolkit.render('ckanext/docs/search-guide.html') + +class HelpController(base.BaseController): def index(self): return plugins.toolkit.render('ckanext/help/index.html') def search_guide(self): return plugins.toolkit.render('ckanext/help/search-guide.html') def termofuse(self): B2SHARE calls it "Terms of Use" and links at https://b2share.eudat.eu/help/terms-of-use. For legal reasons we have to link here to the (german :-( ) "Terms of Use" of the hosting DKRZ I'm as well not happy with this an we will discuss thsi again with our law department.
@noumar commented on this pull request.
In ckanext/b2find/plugin.py https://github.com/EUDAT-B2FIND/ckanext-b2find/pull/9#discussion_r116701762:
map.connect( 'help', '/help', controller='ckanext.b2find.controller:HelpController', action='index' ) map.connect( 'help_action', '/help/{action}.html', controller='ckanext.b2find.controller:HelpController' ) map.connect( 'guidelines', '/guidelines', controller='ckanext.b2find.controller:GuidelinesController', action='index'
Guidelines controller doesn't have an index method. Please remove this block or it will crash.
In ckanext/b2find/controller.py https://github.com/EUDAT-B2FIND/ckanext-b2find/pull/9#discussion_r116703084:
@@ -16,3 +16,44 @@ def nutzungsbedingungen(self): class DocsController(base.BaseController): def search_guide(self): return plugins.toolkit.render('ckanext/docs/search-guide.html') + +class HelpController(base.BaseController): def index(self): return plugins.toolkit.render('ckanext/help/index.html') def search_guide(self): return plugins.toolkit.render('ckanext/help/search-guide.html') def termofuse(self):
@@ -16,3 +16,44 @@ def nutzungsbedingungen(self): class DocsController(base.BaseController): def search_guide(self): return plugins.toolkit.render('ckanext/docs/search-guide.html') + +class HelpController(base.BaseController):
B2SHARE calls it "Terms of Use" and links at https://b2share.eudat.eu/help/terms-of-use.
For legal reasons we have to link here to the (german :-( ) "Terms of Use" of the hosting DKRZ
Cheers, Heinrich
We could do the same 😉 I.e "terms_of_use" and "terms_of_use.html", since Python doesn't allow minus-sign in method names. In ckanext/b2find/controller.py https://github.com/EUDAT-B2FIND/ckanext-b2find/pull/9#discussion_r116718078: @@ -16,3 +16,44 @@ def nutzungsbedingungen(self): class DocsController(base.BaseController): def search_guide(self): return plugins.toolkit.render('ckanext/docs/search-guide.html') + +class HelpController(base.BaseController): def index(self): return plugins.toolkit.render('ckanext/help/index.html') def search_guide(self): return plugins.toolkit.render('ckanext/help/search-guide.html') Do you want to use this or the DocsController? This method will currently fail because of missing file. In ckanext/b2find/controller.py https://github.com/EUDAT-B2FIND/ckanext-b2find/pull/9#discussion_r116740119: @@ -16,3 +16,44 @@ def nutzungsbedingungen(self): class DocsController(base.BaseController): Please remove this class, move the file to help/ and use HelpController. It would be more consistent. Remember to update "map.connect..." and the HTML. In ckanext/b2find/templates/ckanext/guidelines/introduction.html https://github.com/EUDAT-B2FIND/ckanext-b2find/pull/9#discussion_r116741984: The B2FIND ingestion workflow Versions 1.0 May 2017 - Initial publication 0.1 February 2017 - Initial internal reviewed document 0.0.2 January 2017 - added changes and proposels - still working paper 0.0.1 December 2017 - Early draft, B2FIND team. Editors Juha Hakalan, NFL "Juha Hakala, NLF" In ckanext/b2find/templates/ckanext/guidelines/introduction.html https://github.com/EUDAT-B2FIND/ckanext-b2find/pull/9#discussion_r116742331: The B2FIND ingestion workflow Versions 1.0 May 2017 - Initial publication 0.1 February 2017 - Initial internal reviewed document 0.0.2 January 2017 - added changes and proposels - still working paper 0.0.1 December 2017 - Early draft, B2FIND team. Editors Juha Hakalan, NFL Heinke Höck, DKRZ Mikael Karlson, CSC "Mikael Karlsson, CSC" — You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub https://github.com/EUDAT-B2FIND/ckanext-b2find/pull/9#pullrequestreview-38341902, or mute the thread https://github.com/notifications/unsubscribe-auth/AGm5TD6_4yECsu7IWzhLuW3V4WkxZJoOks5r6aamgaJpZM4NbNqq.
We could do the same 😉 I.e "terms_of_use" and "terms_of_use.html", since Python doesn't allow minus-sign in method names.
In ckanext/b2find/controller.py https://github.com/EUDAT-B2FIND/ckanext-b2find/pull/9#discussion_r116718078:
@@ -16,3 +16,44 @@ def nutzungsbedingungen(self): class DocsController(base.BaseController): def search_guide(self): return plugins.toolkit.render('ckanext/docs/search-guide.html') + +class HelpController(base.BaseController): def index(self): return plugins.toolkit.render('ckanext/help/index.html') def search_guide(self): return plugins.toolkit.render('ckanext/help/search-guide.html')
Do you want to use this or the DocsController? This method will currently fail because of missing file.
In ckanext/b2find/controller.py https://github.com/EUDAT-B2FIND/ckanext-b2find/pull/9#discussion_r116740119:
@@ -16,3 +16,44 @@ def nutzungsbedingungen(self): class DocsController(base.BaseController):
Please remove this class, move the file to help/ and use HelpController. It would be more consistent. Remember to update "map.connect..." and the HTML.
In ckanext/b2find/templates/ckanext/guidelines/introduction.html https://github.com/EUDAT-B2FIND/ckanext-b2find/pull/9#discussion_r116741984:
The B2FIND ingestion workflow Versions 1.0 May 2017 - Initial publication 0.1 February 2017 - Initial internal reviewed document 0.0.2 January 2017 - added changes and proposels - still working paper 0.0.1 December 2017 - Early draft, B2FIND team. Editors Juha Hakalan, NFL
"Juha Hakala, NLF"
In ckanext/b2find/templates/ckanext/guidelines/introduction.html https://github.com/EUDAT-B2FIND/ckanext-b2find/pull/9#discussion_r116742331:
The B2FIND ingestion workflow Versions 1.0 May 2017 - Initial publication 0.1 February 2017 - Initial internal reviewed document 0.0.2 January 2017 - added changes and proposels - still working paper 0.0.1 December 2017 - Early draft, B2FIND team. Editors Juha Hakalan, NFL Heinke Höck, DKRZ Mikael Karlson, CSC
"Mikael Karlsson, CSC"
— You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub https://github.com/EUDAT-B2FIND/ckanext-b2find/pull/9#pullrequestreview-38341902, or mute the thread https://github.com/notifications/unsubscribe-auth/AGm5TD6_4yECsu7IWzhLuW3V4WkxZJoOks5r6aamgaJpZM4NbNqq.
-- Heinrich Widmann Abteilung Datenmanagement
Deutsches Klimarechenzentrum GmbH (DKRZ) Bundesstraße 45a • D-20146 Hamburg • Germany
Phone: +49 40 460094-282 FAX: +49 40 460094-270 Email: widmann@dkrz.de URL: www.dkrz.de
Geschäftsführer: Prof. Dr. Thomas Ludwig Sitz der Gesellschaft: Hamburg Amtsgericht Hamburg HRB 39784
Hi Mikael, fixed all commented issues - except the link to the term_of_use of EUDAT, see my in-lined comment below - and created a next pull request.
Am 16.05.2017 um 15:37 schrieb Mikael Karlsson:
Cheers, Heinrich
-- Heinrich Widmann Abteilung Datenmanagement
Deutsches Klimarechenzentrum GmbH (DKRZ) Bundesstraße 45a • D-20146 Hamburg • Germany
Phone: +49 40 460094-282 FAX: +49 40 460094-270 Email: widmann@dkrz.de URL: www.dkrz.de
Geschäftsführer: Prof. Dr. Thomas Ludwig Sitz der Gesellschaft: Hamburg Amtsgericht Hamburg HRB 39784