From d6217b6ca44cdd35c1e75f8c9f37491c2b129178 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aitor=20Mag=C3=A1n=20Garc=C3=ADa?=
 <aitormagan@users.noreply.github.com>
Date: Tue, 25 Sep 2018 09:16:49 +0200
Subject: [PATCH 001/276] Add missing float cast

---
 ckanext/datarequests/tests/test_selenium.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ckanext/datarequests/tests/test_selenium.py b/ckanext/datarequests/tests/test_selenium.py
index 83f5cd80..370e233b 100644
--- a/ckanext/datarequests/tests/test_selenium.py
+++ b/ckanext/datarequests/tests/test_selenium.py
@@ -467,7 +467,7 @@ def test_close_datarequest(self):
         self.check_datarequest(datarequest_id, datarequest_title,
                                datarequest_description, False, True)
 
-    @unittest.skipIf('.'.join(os.environ.get('CKANVERSION', '2.7').split('.')[:-1]) >= 2.8, 
+    @unittest.skipIf(float('.'.join(os.environ.get('CKANVERSION', '2.7').split('.')[:-1])) >= 2.8, 
                      'This test cannot be run in CKAN >= 2.8 because elements in combo boxes cannot be selected')
     def test_close_datarequest_with_organization_and_accepted_dataset(self):
 

From 54067ded0ca7b8139929bdc165fad553301d9e6a Mon Sep 17 00:00:00 2001
From: Benoit Orihuela <borihuela@ozwillo.org>
Date: Tue, 27 Nov 2018 11:17:47 +0100
Subject: [PATCH 002/276] Add French translations

---
 .../fr/LC_MESSAGES/ckanext-datarequests.mo    | Bin 0 -> 8685 bytes
 .../fr/LC_MESSAGES/ckanext-datarequests.po    | 505 ++++++++++++++++++
 2 files changed, 505 insertions(+)
 create mode 100644 ckanext/datarequests/i18n/fr/LC_MESSAGES/ckanext-datarequests.mo
 create mode 100644 ckanext/datarequests/i18n/fr/LC_MESSAGES/ckanext-datarequests.po

diff --git a/ckanext/datarequests/i18n/fr/LC_MESSAGES/ckanext-datarequests.mo b/ckanext/datarequests/i18n/fr/LC_MESSAGES/ckanext-datarequests.mo
new file mode 100644
index 0000000000000000000000000000000000000000..db5bf07d4d2c96ee77436060f0f06ca36c8e9b73
GIT binary patch
literal 8685
zcmc(kZH!!18OIM=5Ehk+yejHpp_Izbu)8hLEZw%-ErptH+qBz?#z5}QoSnVxoqLD-
zGVMa}C4L|ven22-tO;l$tYZA25To*iF~r0KLwq5|Xrg|Sgb!krs4?;PoO|xfz0+M<
z^n*=1|2gM8=bYy}@6Yu27q5F<@n?a5SMhJ`oiZBy*>;{%*D#z0&jmg3y<iJm4|c(e
zzz4t!!6)4OH^BEX{=Qp(39K>xH8=^bdzVstRkwh0?so8EaJQTPILKdh7ax~^i{J+E
zK2U>CfmeVpf*$~X>&AZv&u4rQALHN^U>)2Gz8^dZLZTja_!ubno&w(ueizi>kHIU!
z-+><m-vs6U(F>Hi47>w;4|q3t&N)i8L3wX9lHdP1P~P_tC~|oO+zfsV6uMX3`k%nd
z8NcSn?|@kLT>#2G>p|gvqZ=OuuVvf@Mebh$*MVOLMK4c-vj2HE{{krQdJ&ZO{2Ua%
z{|w5#Z-OHKiy#vHUkZx8C&4lBs2hJC6uPIuOTq7eqR$@qUf%x~P~;;_i~`qz!p~kl
zMDBNja()1c93BL>fG>b@&Kuw^Q1d96Z-8PaUj}~#{tQIK>M4wltJJqadB+bx(dSDb
zDpD_l!r!Z)-1j;te2*Y>k;{5e_FoRl{%hTM(v5e3u%hO`t>CA?dGK-YS>E{?IL`P9
z9wqnv6#O9g3MlsYI>?pkJd9TKcR9$Es)HW}cYz-QJ@6**GvF5RIZ)p58Yq0e0dkf4
z2PpSk$fHn|x&*u$)Zj*N7q|&L25RszQ0{pS6g~VBl=r>~ZU)!El*n}}D0Ig`x#uBJ
z<a-Jfe!uDPhu|3FmqFqCU!d6El^D<U;CApMU<-s*^#HgHIh_JUF26x2B9Fg;a{hT3
zp}b=~DEwRn%6$hxd4Cg>^8!%h@GvO+KMIOnJ_*i(KLNQyosaVie;Sl?=0MT62g<${
zDEFnHocCEb{{SfGJqB7k0<UBI5-9s$2gQE=3JO2#d5qZUI9Lbo0)_62psYXY*1rc{
z!~6dLZe#vjgmx>q3l#Z%nh#i4r$7xp5AFnC1!ur3P|D5VC&7c@Bj6tJkD%DyCNBH8
ztb-!YJ9Yl<1yJPQ1#uPi1yJPvRZ!mbtixY`B8Pv1BJXpq&gFCgC~~+A6#Ksxl>M6>
z?gmBfN5I42S3ot|@mgk7cf8nZo7BX*oh7MWFxm^XAEu^dVl}f6WvQBJG)$+icYCRq
z7&lB!vow+VT|Zschtt@2Z8g(u>e;B>HX+1(myP<6xhFG8KH=%moG6p{sUL-2p!bH0
zk(!B(UXC)IWbVreFHChB>81%_RHsXRq8s`7JI;=}DICN(2RqcP7dA|wW`ig(`Dc|y
zyU<j{6CCOdi4LPwFGg9|U#v_bHkdQo-nM|OiX-&i-FnH(w=WnY@@)iJ(+rN0RlAbE
zag~Kmwh;Kq(rSCM4mS=KlH%HApi<rTPWtVvt)oS~p{W~7XuW~b6CFfhYt;>YSZtUW
z&^vO}j3O#}owai?E*QmXHj85nK=1aGMwTS#S5@fC1Cios5*Q{J$bQY0(-lx5T~iAc
zs@3mFD%>a93xeo`&JqzJrs*ZeF^o7@eY)hO8XJ|9`f4k9>jYj3Wm_+sw66CqT2r?c
zo<wb<la6Wli+&?N$qSoy-NO^)G;blm{v*BUv*0ssqdnop+TGx;X6~xVnBCpLqZ_%(
za?g|H!X4a=%RUG7jh7dM1ID<p1+!KH1b~tkh~St(IMy|Rq!Ifa@#gaPv$n(Anmnqk
z4Rw1QWt~Lbfv`OZM)^a8*(fwS)SMR*#ngUtLSoDQsIob6zPkFfKH;ZJ_Q@^3i%-Hh
z4&i%pN?AaqQ&yR_S|7cS*cLC}KPr2pxaEcZy`B}qez;^3wk6o0OycK(pef8A=$KF)
zC=-_lh5dBBz;9N_5_Q;kabv0a)Ox+H4ySmfniuO!{S-^V2E72qH<!iwFjf|sD+{<x
zlk=F<l%HCST`uyv$Jhfa#HCA%1BDqiZ&|_?#gIuerrk-G-E2SgoFPulM*~AHUpj_I
zI47{aC4Q58(z5oPFl5dnhx9Gfs*Xex7p_p(2LppWkJ&6pj$stz+I=TNh*8`mRpJps
zXsrhiI4)t;Yap49#Avb3>bajForxEEK@trZlhX#aqJ0|+Tnur^O4MVe7%amjp#!m7
zyY&ek>PYBi=~5K?_c9GneJ3w#_%te5tU6huj@S&Mi;U-nl~d#i{V-Iybwi@oUbM_x
zIh9W%;J?M5ex9$Un6um@5_84J+H6@FNVs#PiD*#9XU}Dxb>HTuu212!);(e&IH}&|
z>802#PLE#G_TuBs=tMZ0+wk=0oSV@1WPal~Cb4M9vJL9ECZV{NdNGlDdbAUDqOOVE
zY$Kwa3z^<<eR1I3X%q#i-`SKnnx(WIOpm5<W=6O7FA-nz(iD5%cB8jlFL7607q)Eg
zw%1Aq&<l84v+1&kAL}EB_SKb>F13lUSNK_Fkl2ybl|o{ZiD~7<W>GWh{Zy#xwAqp?
ztCpmR{4-Hyuc{0ZRrnC0zFiq4>b~*&bwUKiJNyR2Fl#TE_<mjH+$EG%*NQx`>SDfe
zC|RsZ>5ds9Js3yFOe3xBZPt!ba*$uAbmO=env-cw7<Azx(c|^a^@))~rW3_!Z7yl~
z&DyT4mDJ{=Df^P0)cP^j5ttT+6H!mp7vqtG2j*+GaO2?GZlcVTo*bXJxi-F~Hn~+#
zY?<0}(+%U3<Kqz44w<em3=HUQsf|z6CN}Gd@u~628^$M~+vg=|Z9ewGgqRh@Q+gMd
zk=qZ%{!&I9)7uuJ1>*%fTW!w|>e$J4_JpmBY(Ayos2J4d=_q7IZ`-$TXW-XS?)H&`
zK^A*KZ4dUDOzE&=hspHhtvdfYeSN66>xoSxb9?7*8%S)TK0Y#=J40=Lxx-B<0=$uu
z%nxt1MK1O?ou!MltphrF1YTCVEo?+$-&1<)f}f7uZbB1FJg)6p=6T+N3G^hw-!h{1
znY^p&JwrdFU7yvI=l8xPGg(Lp)n4EmUg=Alr8}aNB=5AO7bAHeGa1=RH={7@t(Zi8
ztU8u_V>)SXMePZ)le)Q)dS1FPCT5ONC~*k)I0y9n*p#L@)wIcn<vCc&y2c|<<-yZ#
zk$y}<0P0TY$2y&$w<2wwEGDY=P->D|H_BM+{fNY6G=m_*`-L|4+c44S$5`2<cbx66
zlm^3b$)=ew%mO5}$HW}!Kx0S6LuP|0&0-!uTVfwYlwKoU289=;5FU_qrIr>|4N-&}
zJ+znT-U_1BmXcHVZKQc<R)nLgl%5D(D61!W?jR?SwFzwTzV>pPwAOo4a|x~0;EBob
zeW6$kmL^YV_ErE|6x;IIj<5HOC~k;HyCF{!s16foM?U(d?d$KMt-}b#qy}0k8>hq!
z(SHLnYc6&JldwDJ0I}H=??>*tbNiDmeFNXu*JgQIw04>hQQUxdHMLe&tBP_e<p`@&
zQ?jBpRJsbY6(e%%PCB{2s#zlzEWfenju<V?8g81UKBb413;OBH()#L<!%K>XA+cCd
zCRskhe>w;_k-nN=M<hx}oR<iy5BuVL2|2bwp61`Zxw3M0*v=_2nJo*5I2v|nS@Io-
zrwg@Q!r{`Zi>2XPR#Ff*iGbXdNJt{m3{)l-b`08rDf&&zLq|f%z1A3pYz8)xPH#n8
zT=`K)9M~~f@Qs<(Pm6V7#4ju2v^WTHu)>5oT*R7k%b6R<pw>StznCMyFN%1CFBc(g
z18Nd=5YM|Oi%^MZRrFDQ-wt(qZzVRdA~RVrHqeop$r@`oOz|2b@Y*!ogwAo;P9(hx
z&z2t5x-e=E6XUl?4T&B;qi^B%?BPUGT#e~qLW9=TF_ITgm?$wnKbZcNw-)i$K9C>K
zeCb|Mb4({|yBN16xBK!bB_p=otf_2B)S<#+*9<ROy4&7^6lb`Vl){oa@e5~uxl>^p
z`Q1)){iso}&d+hyCyVtWEI7}~1HQ`!Sm6+L+3ZVq4-TilCCL(6bN<9k48K>1t>kIH
z>yvQH>t_zsVsvFQD_9>eGlnJDt~0^mhzF9dGwK;zTv*3!5O2iQ3dV4KY**Y)rgQu3
z`$=8T5j=d#iJWJ4QBg?`%8^(M!9jk4^7sKt0>Pr!AfDNRMXGxjc~~L1<$j&i^-&2+
zE+q6;T3%qJgy_cs7a=MZLkQ|dqUGYjB5}ATcF{z4O@p$6G*WB$b!Cqag<ozJY10$a
z5+`JDLX#w<p%^p}UUG)bT`6TG@HsZ}knJ9(=CCGMbXi#hTq-3_TOCA{w`O?5nV8Bg
zjyDa0l&GSRw{*#GeZ!zO``=HfR(EH(xG&C<oUBOyTRzCD6%F)d{PqNr^EKF9NYL4A
z9$pam|GO_oOq7ArHCQ({x@gpGckbg1y6kIRTMqPA7Hwt{JEb8QE;7WQq;i#5kPzp~
zZ95UQ@V}CQ6?0W*7&=!CmkNsNLz|Oh()oyX)=+t$tkm2~-93D~?e|UI@SCFJcNwT0
zNoZ0YbUh2fg9r78R5XmMZNK~v)u8boy0gfe6@p47Qc#r6DCAe9<l&?{_z55{H~7zl
Myv&hUR?W}<0Yx3mF#rGn

literal 0
HcmV?d00001

diff --git a/ckanext/datarequests/i18n/fr/LC_MESSAGES/ckanext-datarequests.po b/ckanext/datarequests/i18n/fr/LC_MESSAGES/ckanext-datarequests.po
new file mode 100644
index 00000000..70474312
--- /dev/null
+++ b/ckanext/datarequests/i18n/fr/LC_MESSAGES/ckanext-datarequests.po
@@ -0,0 +1,505 @@
+# French translations for ckanext-datarequests.
+# Copyright (C) 2018 SICTIAM
+# This file is distributed under the same license as the
+# ckanext-datarequests project.
+# Benoit Orihuela <bobeal@gmail.com>, 2018.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ckanext-datarequests 0.3.1\n"
+"Report-Msgid-Bugs-To: data@metropolegrenoble.fr\n"
+"POT-Creation-Date: 2016-04-28 14:45+0200\n"
+"PO-Revision-Date: 2017-01-13 10:02+0100\n"
+"Last-Translator: Benoit Orihuela <bobeal@gmail.com>\n"
+"Language: fr\n"
+"Language-Team: fr <LL@li.org>\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.3.4\n"
+
+#: ckanext/datarequests/actions.py:192 ckanext/datarequests/actions.py:244
+#: ckanext/datarequests/actions.py:435 ckanext/datarequests/actions.py:480
+#: ckanext/datarequests/actions.py:536 ckanext/datarequests/actions.py:624
+msgid "Data Request ID has not been included"
+msgstr "L'ID de la demande n'a pas été ajouté"
+
+#: ckanext/datarequests/actions.py:203 ckanext/datarequests/actions.py:255
+#: ckanext/datarequests/actions.py:446 ckanext/datarequests/actions.py:491
+#, python-format
+msgid "Data Request %s not found in the data base"
+msgstr "La demande %s n'a pas été trouvée"
+
+#: ckanext/datarequests/actions.py:500
+msgid "This Data Request is already closed"
+msgstr "Cette demande a été cloturée"
+
+#: ckanext/datarequests/actions.py:578 ckanext/datarequests/actions.py:671
+#: ckanext/datarequests/actions.py:717
+msgid "Comment ID has not been included"
+msgstr "L'ID du commentaire n'a pas été ajouté"
+
+#: ckanext/datarequests/actions.py:589 ckanext/datarequests/actions.py:682
+#: ckanext/datarequests/actions.py:728
+#, python-format
+msgid "Comment %s not found in the data base"
+msgstr "Le commentaire %s n'a pas été trouvé"
+
+#: ckanext/datarequests/templates/datarequests/snippets/datarequest_form.html:17
+#: ckanext/datarequests/validator.py:31 ckanext/datarequests/validator.py:34
+#: ckanext/datarequests/validator.py:41
+msgid "Title"
+msgstr "Titre"
+
+#: ckanext/datarequests/validator.py:31
+#, python-format
+msgid "Title must be a maximum of %d characters long"
+msgstr "Le titre ne doit pas dépasser %d caractères"
+
+#: ckanext/datarequests/validator.py:34
+msgid "Title cannot be empty"
+msgstr "Le titre ne peut pas être vide"
+
+#: ckanext/datarequests/validator.py:41
+msgid "That title is already in use"
+msgstr "Ce titre est déjà utilisé"
+
+#: ckanext/datarequests/templates/datarequests/snippets/datarequest_form.html:21
+#: ckanext/datarequests/validator.py:45
+msgid "Description"
+msgstr "Description"
+
+#: ckanext/datarequests/validator.py:45
+#, python-format
+msgid "Description must be a maximum of %d characters long"
+msgstr "La description ne doit pas dépasser %d caractères"
+
+#: ckanext/datarequests/templates/datarequests/snippets/additional_info.html:11
+#: ckanext/datarequests/templates/datarequests/snippets/datarequest_form.html:25
+#: ckanext/datarequests/validator.py:52
+msgid "Organization"
+msgstr "Organisation"
+
+#: ckanext/datarequests/validator.py:52
+msgid "Organization is not valid"
+msgstr "Cette organisation n'est pas valide"
+
+#: ckanext/datarequests/templates/datarequests/snippets/additional_info.html:24
+#: ckanext/datarequests/validator.py:65
+msgid "Accepted Dataset"
+msgstr "Jeu de données accepté"
+
+#: ckanext/datarequests/validator.py:65
+msgid "Dataset not found"
+msgstr "Jeu de données non trouvé"
+
+#: ckanext/datarequests/templates/datarequests/base.html:17
+#: ckanext/datarequests/templates/datarequests/show.html:25
+#: ckanext/datarequests/validator.py:75
+msgid "Data Request"
+msgstr "Demande de données"
+
+#: ckanext/datarequests/validator.py:75
+msgid "Data Request not found"
+msgstr "Demande de données introuvable"
+
+#: ckanext/datarequests/validator.py:78 ckanext/datarequests/validator.py:81
+msgid "Comment"
+msgstr "Commentaire"
+
+#: ckanext/datarequests/validator.py:78
+msgid "Comments must be a minimum of 1 character long"
+msgstr "Le commentaire doit contenir au moins 1 caractère"
+
+#: ckanext/datarequests/validator.py:81
+#, python-format
+msgid "Comments must be a maximum of %d characters long"
+msgstr "Le commentaire ne doit pas dépasser %d caractères"
+
+#: ckanext/datarequests/controllers/ui_controller.py:129
+msgid "Newest"
+msgstr "Plus récent"
+
+#: ckanext/datarequests/controllers/ui_controller.py:129
+msgid "Oldest"
+msgstr "Plus ancien"
+
+#: ckanext/datarequests/controllers/ui_controller.py:145
+#: ckanext/datarequests/tests/test_ui_controller.py:628
+msgid "State"
+msgstr "État"
+
+#: ckanext/datarequests/controllers/ui_controller.py:150
+#: ckanext/datarequests/templates/header.html:6
+#: ckanext/datarequests/tests/test_ui_controller.py:630
+msgid "Organizations"
+msgstr "Organisations"
+
+#: ckanext/datarequests/controllers/ui_controller.py:156
+msgid "\"page\" parameter must be an integer"
+msgstr "Le paramètre \"page\" doit être un nombre entier"
+
+#: ckanext/datarequests/controllers/ui_controller.py:159
+msgid "Unauthorized to list Data Requests"
+msgstr "Vous n'êtes pas autorisé à voir les demandes de données"
+
+#: ckanext/datarequests/controllers/ui_controller.py:210
+msgid "Unauthorized to create a Data Request"
+msgstr "Vous n'êtes pas autorisé à créer une demande de données"
+
+#: ckanext/datarequests/controllers/ui_controller.py:225
+#: ckanext/datarequests/controllers/ui_controller.py:248
+#: ckanext/datarequests/controllers/ui_controller.py:265
+#: ckanext/datarequests/controllers/ui_controller.py:334
+#: ckanext/datarequests/controllers/ui_controller.py:401
+#, python-format
+msgid "Data Request %s not found"
+msgstr "La demande %s est introuvable"
+
+#: ckanext/datarequests/controllers/ui_controller.py:228
+#, python-format
+msgid "You are not authorized to view the Data Request %s"
+msgstr "Vous n'êtes pas autorisé à voir la demande %s"
+
+#: ckanext/datarequests/controllers/ui_controller.py:251
+#, python-format
+msgid "You are not authorized to update the Data Request %s"
+msgstr "Vous n'êtes pas autorisé à mettre à jour la demande de données %s"
+
+#: ckanext/datarequests/controllers/ui_controller.py:261
+#: ckanext/datarequests/tests/test_ui_controller.py:672
+#, python-format
+msgid "Data Request %s has been deleted"
+msgstr "La demande de données %s a été supprimée"
+
+#: ckanext/datarequests/controllers/ui_controller.py:268
+#, python-format
+msgid "You are not authorized to delete the Data Request %s"
+msgstr "Vous n'êtes pas autorisé à supprimer la demande de données %s"
+
+#: ckanext/datarequests/controllers/ui_controller.py:316
+msgid "This data request is already closed"
+msgstr "Cette demande de données est déjà cloturée"
+
+#: ckanext/datarequests/controllers/ui_controller.py:337
+#, python-format
+msgid "You are not authorized to close the Data Request %s"
+msgstr "Vous n'êtes pas autorisé à cloturer la demande de données %s"
+
+#: ckanext/datarequests/controllers/ui_controller.py:366
+msgid "Comment has been published"
+msgstr "Le commentaire a été publié"
+
+#: ckanext/datarequests/controllers/ui_controller.py:368
+msgid "Comment has been updated"
+msgstr "Le commentaire a été mis à jour"
+
+#: ckanext/datarequests/controllers/ui_controller.py:374
+#, python-format
+msgid "You are not authorized to %s"
+msgstr "Vous n'êtes pas autorisé à %s"
+
+#: ckanext/datarequests/controllers/ui_controller.py:405
+#, python-format
+msgid "You are not authorized to list the comments of the Data Request %s"
+msgstr "Vous n'êtes pas autorisé à voir les commentaires de la demande de données %s"
+
+#: ckanext/datarequests/controllers/ui_controller.py:414
+msgid "Comment has been deleted"
+msgstr "Le commentaire a été supprimé"
+
+#: ckanext/datarequests/controllers/ui_controller.py:419
+#, python-format
+msgid "Comment %s not found"
+msgstr "Le commentaire %s est introuvable"
+
+#: ckanext/datarequests/controllers/ui_controller.py:422
+msgid "You are not authorized to delete this comment"
+msgstr "Vous n'êtes pas autorisé à supprimer ce commentaire"
+
+#: ckanext/datarequests/templates/header.html:5
+#: ckanext/datarequests/templates/organization/read_base.html:4
+#: ckanext/datarequests/templates/user/read_base.html:4
+msgid "Datasets"
+msgstr "Jeux de données"
+
+#: ckanext/datarequests/templates/header.html:7
+msgid "Groups"
+msgstr "Groupes"
+
+#: ckanext/datarequests/templates/datarequests/base.html:8
+#: ckanext/datarequests/templates/datarequests/base.html:11
+#: ckanext/datarequests/templates/datarequests/close.html:6
+#: ckanext/datarequests/templates/datarequests/edit.html:6
+#: ckanext/datarequests/templates/datarequests/new.html:6
+#: ckanext/datarequests/templates/datarequests/show.html:8
+#: ckanext/datarequests/templates/header.html:8
+#: ckanext/datarequests/templates/organization/read_base.html:6
+#: ckanext/datarequests/templates/user/read_base.html:6
+msgid "Data Requests"
+msgstr "Demander une donnée"
+
+#: ckanext/datarequests/templates/header.html:9
+#: ckanext/datarequests/templates/organization/read_base.html:7
+msgid "About"
+msgstr "A propos"
+
+#: ckanext/datarequests/templates/datarequests/base.html:20
+msgid ""
+"Data Requests allow users to ask for data that is not published in the "
+"platform yet. If you want some specific data and you are not able to find"
+" it among all the published datasets, you can create a new data request "
+"specifying the data than you want to get."
+msgstr ""
+"Cette page permet aux utilisateurs de demander un jeu de données qui "
+"n'est pas encore présent sur le portail. Si vous recherchez une donnée "
+"en particulier et que vous n'avez pas réussi à la trouver dans les jeux "
+"de données déjà présents, vous pouvez créer une demande en spécifiant "
+"la donnée recherchée."
+
+#: ckanext/datarequests/templates/datarequests/close.html:3
+#: ckanext/datarequests/templates/datarequests/close.html:8
+#: ckanext/datarequests/templates/datarequests/close.html:12
+#: ckanext/datarequests/templates/datarequests/snippets/close_datarequest_form.html:25
+msgid "Close Data Request"
+msgstr "Fermer la demande"
+
+#: ckanext/datarequests/templates/datarequests/comment.html:5
+#: ckanext/datarequests/templates/datarequests/show.html:28
+msgid "Comments"
+msgstr "Commentaires"
+
+#: ckanext/datarequests/templates/datarequests/edit.html:3
+#: ckanext/datarequests/templates/datarequests/edit.html:8
+#: ckanext/datarequests/templates/datarequests/edit.html:12
+msgid "Edit Data Request"
+msgstr "Modifier la demande"
+
+#: ckanext/datarequests/templates/datarequests/index.html:9
+#: ckanext/datarequests/templates/organization/datarequests.html:10
+msgid "Add Data Request"
+msgstr "Ajouter une demande"
+
+#: ckanext/datarequests/templates/datarequests/index.html:12
+#: ckanext/datarequests/templates/organization/datarequests.html:13
+#: ckanext/datarequests/templates/user/datarequests.html:9
+msgid "Search Data Requests..."
+msgstr "Rechercher une demande de données ..."
+
+#: ckanext/datarequests/templates/datarequests/new.html:3
+#: ckanext/datarequests/templates/datarequests/new.html:7
+#: ckanext/datarequests/templates/datarequests/new.html:11
+#: ckanext/datarequests/templates/datarequests/snippets/datarequest_form.html:47
+#: ckanext/datarequests/templates/datarequests/snippets/new_datarequest_form.html:7
+msgid "Create Data Request"
+msgstr "Créer une demande de données"
+
+#: ckanext/datarequests/templates/datarequests/new.html:16
+msgid ""
+"To create a data request, fill the form and specify a title and a "
+"description for your request. Please, be as clear as you can in order to "
+"ease the task of accomplishing your request. You can also specify an "
+"organization if your data request is closely related with it. "
+msgstr ""
+"Pour créer une demande de donnée, remplissez le formulaire en précisant "
+"le titre et en donnant une description. Merci d'être le plus clair "
+"possible afin de faciliter la recherche des données. Vous pouvez "
+"également spécifier une organisation si votre demande est en lien avec "
+"celle-ci."
+
+#: ckanext/datarequests/templates/datarequests/show.html:15
+msgid "Manage"
+msgstr "Gérer"
+
+#: ckanext/datarequests/templates/datarequests/show.html:19
+msgid "Close"
+msgstr "Fermer"
+
+#: ckanext/datarequests/templates/datarequests/show.html:45
+#: ckanext/datarequests/templates/datarequests/snippets/additional_info.html:19
+#: ckanext/datarequests/templates/datarequests/snippets/datarequest_item.html:12
+msgid "Closed"
+msgstr "Cloturé"
+
+#: ckanext/datarequests/templates/datarequests/show.html:50
+#: ckanext/datarequests/templates/datarequests/snippets/datarequest_item.html:16
+msgid "Open"
+msgstr "Ouvert"
+
+#: ckanext/datarequests/templates/datarequests/snippets/additional_info.html:2
+msgid "Additional Info"
+msgstr "Informations supplémentaires"
+
+#: ckanext/datarequests/templates/datarequests/snippets/additional_info.html:7
+msgid "Creator"
+msgstr "Créateur"
+
+#: ckanext/datarequests/templates/datarequests/snippets/additional_info.html:8
+#: ckanext/datarequests/templates/datarequests/snippets/additional_info.html:12
+#: ckanext/datarequests/templates/datarequests/snippets/additional_info.html:29
+msgid "None"
+msgstr "Aucun"
+
+#: ckanext/datarequests/templates/datarequests/snippets/additional_info.html:15
+msgid "Created"
+msgstr "Date de création"
+
+#: ckanext/datarequests/templates/datarequests/snippets/additional_info.html:20
+msgid "Not closed yet"
+msgstr "Non cloturé"
+
+#: ckanext/datarequests/templates/datarequests/snippets/close_datarequest_form.html:11
+msgid "Accep. Dataset"
+msgstr "Accepter le jeu de données"
+
+#: ckanext/datarequests/templates/datarequests/snippets/comment_form.html:22
+msgid "Add a new Comment"
+msgstr "Ajouter un nouveau commentaire"
+
+#: ckanext/datarequests/templates/datarequests/snippets/comment_form.html:23
+#, python-format
+msgid ""
+"You can use <a href=\"#markdown\" title=\"Markdown quick reference\" "
+"data-target=\"popover\" data-content=\"%(markdown_tooltip)s\" data-"
+"html=\"true\">Markdown formatting</a> here. You can refer datasets by "
+"adding their URL."
+msgstr ""
+"Vous pouvez utiliser <a href=\"#markdown\" title=\"Markdown quick "
+"reference\" data-target=\"popover\" data-content=\"%(markdown_tooltip)s\""
+" data-html=\"true\">la mise en forme Markdown</a> ici. Vous pouvez vous "
+"référer à un jeu de données en ajoutant son URL."
+
+#: ckanext/datarequests/templates/datarequests/snippets/comment_form.html:28
+msgid "Cancel"
+msgstr "Annuler"
+
+#: ckanext/datarequests/templates/datarequests/snippets/comment_form.html:29
+msgid "Update Comment"
+msgstr "Mettre à jour le commentaire"
+
+#: ckanext/datarequests/templates/datarequests/snippets/comment_form.html:31
+msgid "Add Comment"
+msgstr "Ajouter un commentaire"
+
+#: ckanext/datarequests/templates/datarequests/snippets/comment_item.html:18
+msgid "Are you sure you want to delete this comment?"
+msgstr "Êtes-vous sûr de vouloir supprimer ce commentaire ?"
+
+#: ckanext/datarequests/templates/datarequests/snippets/comment_item.html:29
+msgid "commented"
+msgstr "commenté"
+
+#: ckanext/datarequests/templates/datarequests/snippets/comments.html:3
+msgid "Current Discussion"
+msgstr "Discussion actuelle"
+
+#: ckanext/datarequests/templates/datarequests/snippets/comments.html:13
+msgid "This data request has not been commented yet"
+msgstr "Cette demande n'a pas encore été commentée"
+
+#: ckanext/datarequests/templates/datarequests/snippets/datarequest_form.html:17
+msgid "eg. Data Request Name"
+msgstr "par ex, nom de la demande de données "
+
+#: ckanext/datarequests/templates/datarequests/snippets/datarequest_form.html:21
+msgid "eg. Data Request description"
+msgstr "par ex, description du jeu de données"
+
+#: ckanext/datarequests/templates/datarequests/snippets/datarequest_form.html:29
+msgid "No organization"
+msgstr "Aucune organisation"
+
+#: ckanext/datarequests/templates/datarequests/snippets/datarequest_form.html:43
+msgid "Are you sure you want to delete this data request?"
+msgstr "Êtes-vous sûr de vouloir supprimer cette demande ?"
+
+#: ckanext/datarequests/templates/datarequests/snippets/datarequest_form.html:44
+msgid "Delete"
+msgstr "Supprimer"
+
+#: ckanext/datarequests/templates/datarequests/snippets/datarequest_list.html:1
+msgid "No Data Requests found"
+msgstr "Aucune demande de données trouvée"
+
+#: ckanext/datarequests/templates/datarequests/snippets/datarequest_list.html:14
+msgid "No Data Requests found with the given criteria"
+msgstr "Aucune demande de données ne correspond aux critères renseignés "
+
+#: ckanext/datarequests/templates/datarequests/snippets/datarequest_list.html:16
+msgid "How about creating one?"
+msgstr "Pourquoi ne pas en créer une ?"
+
+#: ckanext/datarequests/templates/datarequests/snippets/edit_datarequest_form.html:4
+msgid "Update Data Request"
+msgstr "Mettre à jour la demande"
+
+#: ckanext/datarequests/templates/home/snippets/stats.html:5
+msgid "{0} statistics"
+msgstr "{0} statistiques"
+
+#: ckanext/datarequests/templates/home/snippets/stats.html:10
+msgid "dataset"
+msgstr "jeu de données"
+
+#: ckanext/datarequests/templates/home/snippets/stats.html:10
+msgid "datasets"
+msgstr "jeux de données"
+
+#: ckanext/datarequests/templates/home/snippets/stats.html:16
+msgid "organization"
+msgstr "organisation"
+
+#: ckanext/datarequests/templates/home/snippets/stats.html:16
+msgid "organizations"
+msgstr "organisations"
+
+#: ckanext/datarequests/templates/home/snippets/stats.html:22
+msgid "group"
+msgstr "groupe"
+
+#: ckanext/datarequests/templates/home/snippets/stats.html:22
+msgid "groups"
+msgstr "groupes"
+
+#: ckanext/datarequests/templates/home/snippets/stats.html:28
+msgid "related item"
+msgstr "Élément lié"
+
+#: ckanext/datarequests/templates/home/snippets/stats.html:28
+msgid "related items"
+msgstr "Éléments liés"
+
+#: ckanext/datarequests/templates/home/snippets/stats.html:34
+msgid "data request"
+msgstr "demande de données"
+
+#: ckanext/datarequests/templates/home/snippets/stats.html:34
+msgid "data requests"
+msgstr "demandes de données"
+
+#: ckanext/datarequests/templates/organization/read_base.html:5
+#: ckanext/datarequests/templates/user/read_base.html:5
+msgid "Activity Stream"
+msgstr "Flux d'activité"
+
+#: ckanext/datarequests/templates/snippets/custom_search_form.html:6
+msgid "{number} data request found for \"{query}\""
+msgid_plural "{number} data requests found for \"{query}\""
+msgstr[0] "{number} demande trouvée pour \"{query}\""
+msgstr[1] "{number} demandes trouvées pour \"{query}\""
+
+#: ckanext/datarequests/templates/snippets/custom_search_form.html:7
+msgid "No data requests found for \"{query}\""
+msgstr "Aucun jeu de données trouvé pour \"{query}\""
+
+#: ckanext/datarequests/templates/snippets/custom_search_form.html:8
+msgid "{number} data request found"
+msgid_plural "{number} data requests found"
+msgstr[0] "{number} jeu de données trouvé"
+msgstr[1] "{number} jeux de données trouvés"
+
+#: ckanext/datarequests/templates/snippets/custom_search_form.html:9
+msgid "No data requests found"
+msgstr "Aucune demande trouvée"
+

From 852308bd50f01e381752a8d9c3199436812f8197 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Wed, 1 May 2019 13:10:31 +1000
Subject: [PATCH 003/276] Initial commit

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 README.md

diff --git a/README.md b/README.md
new file mode 100644
index 00000000..641e1319
--- /dev/null
+++ b/README.md
@@ -0,0 +1,2 @@
+# ckanext-datarequests
+CKAN extension allowing users to request the creation of additional datasets

From c56ab5c31dd3574d15aa59ba2b0e61b473ed1695 Mon Sep 17 00:00:00 2001
From: Mark Calvert <mark.calvert@salsadigital.com.au>
Date: Wed, 8 May 2019 20:19:15 -0600
Subject: [PATCH 004/276] Added configurable required description Added block
 offering_description to datarequest_form template so other templates can
 override the block

---
 ckanext/datarequests/plugin.py                            | 8 +++++---
 .../templates/datarequests/snippets/datarequest_form.html | 7 +++++--
 ckanext/datarequests/validator.py                         | 6 +++++-
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/ckanext/datarequests/plugin.py b/ckanext/datarequests/plugin.py
index d2c78c3a..52850726 100644
--- a/ckanext/datarequests/plugin.py
+++ b/ckanext/datarequests/plugin.py
@@ -33,7 +33,7 @@
 
 def get_config_bool_value(config_name, default_value=False):
     value = config.get(config_name, default_value)
-    value = value if type(value) == bool else value != 'False'
+    value = tk.asbool(value)
     return value
 
 def is_fontawesome_4():
@@ -66,8 +66,9 @@ class DataRequestsPlugin(p.SingletonPlugin):
 
     def __init__(self, name=None):
         self.comments_enabled = get_config_bool_value('ckan.datarequests.comments', True)
-        self._show_datarequests_badge = get_config_bool_value('ckan.datarequests.show_datarequests_badge')
+        self._show_datarequests_badge = get_config_bool_value('ckan.datarequests.show_datarequests_badge')        
         self.name = 'datarequests'
+        self.is_description_required = get_config_bool_value('ckan.datarequests.description_required', False)
 
     ######################################################################
     ############################## IACTIONS ##############################
@@ -215,7 +216,8 @@ def get_helpers(self):
             'get_open_datarequests_number': helpers.get_open_datarequests_number,
             'get_open_datarequests_badge': partial(helpers.get_open_datarequests_badge, self._show_datarequests_badge),
             'get_plus_icon': get_plus_icon,
-            'is_following_datarequest': helpers.is_following_datarequest
+            'is_following_datarequest': helpers.is_following_datarequest,
+            'is_description_required': self.is_description_required
         }
 
     ######################################################################
diff --git a/ckanext/datarequests/templates/datarequests/snippets/datarequest_form.html b/ckanext/datarequests/templates/datarequests/snippets/datarequest_form.html
index e8e53354..c302d2e8 100644
--- a/ckanext/datarequests/templates/datarequests/snippets/datarequest_form.html
+++ b/ckanext/datarequests/templates/datarequests/snippets/datarequest_form.html
@@ -5,6 +5,7 @@
 {% set organization_id = data.get('organization_id', h.get_request_param('organization')) %}
 {% set organizations_available = h.organizations_available('read') %}
 {% set form_horizontal = 'form-horizontal' if h.ckan_version()[:3] <= '2.7' else '' %}
+{% set description_required = h.is_description_required %}
 
 {# This provides a full page that renders a form for publishing a dataset. It can
 then itself be extended to add/remove blocks of functionality. #}
@@ -18,10 +19,11 @@
     {{ form.input('title', id='field-title', label=_('Title'), placeholder=_('eg. Data Request Name'), value=title, error=errors['Title'], classes=['control-full', 'control-large'], is_required=true) }}
   {% endblock %}
 
-  {% block offering_description %}
-    {{ form.markdown('description', id='field-description', label=_('Description'), placeholder=_('eg. Data Request description'), value=description, error=errors['Description']) }}
+  {% block offering_description %}  
+    {{ form.markdown('description', id='field-description', label=_('Description'), placeholder=_('eg. Data Request description'), value=description, error=errors['Description'], is_required=description_required) }}
   {% endblock %}
 
+  {% block offering_organizations %}
   <div class="control-group form-group">
     <label for="field-organizations" class="control-label">{{ _('Organization') }}</label>
     <div class="controls">
@@ -36,6 +38,7 @@
       </select>
     </div>
   </div>
+  {% endblock %}
 
   {% block form_actions %}
     <div class="form-actions">
diff --git a/ckanext/datarequests/validator.py b/ckanext/datarequests/validator.py
index b195f6b7..4cf37e3e 100644
--- a/ckanext/datarequests/validator.py
+++ b/ckanext/datarequests/validator.py
@@ -20,6 +20,7 @@
 import constants
 import ckan.plugins.toolkit as tk
 import ckanext.datarequests.db as db
+import plugin as datarequests
 
 
 def validate_datarequest(context, request_data):
@@ -39,8 +40,11 @@ def validate_datarequest(context, request_data):
     if 'Title' not in errors and not avoid_existing_title_check:
         if db.DataRequest.datarequest_exists(request_data['title']):
             errors[tk._('Title')] = [tk._('That title is already in use')]
-
+    
     # Check description
+    if datarequests.get_config_bool_value('ckan.datarequests.description_required', False) and not request_data['description']:
+        errors[tk._('Description')] = [tk._('Description cannot be empty')]
+
     if len(request_data['description']) > constants.DESCRIPTION_MAX_LENGTH:
         errors[tk._('Description')] = [tk._('Description must be a maximum of %d characters long') % constants.DESCRIPTION_MAX_LENGTH]
 

From 12ef21766bbb65f5d765727871c9f731f3ccd851 Mon Sep 17 00:00:00 2001
From: Mark Calvert <mark.calvert@salsadigital.com.au>
Date: Mon, 13 May 2019 16:48:58 -0600
Subject: [PATCH 005/276] Updated readme with
 ckan.datarequests.description_required

---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index ce42effb..4668be56 100644
--- a/README.md
+++ b/README.md
@@ -207,6 +207,10 @@ ckan.datarequests.comments = [true|false]
 ```
 ckan.datarequests.show_datarequests_badge = [true|false]
 ```
+* Enable or disable description as a required field on data request forms
+```
+ckan.datarequests.description_required = [true|false]
+```
 * Restart your apache2 reserver
 ```
 sudo service apache2 restart

From 81e201763d142b9924b462db4f35b1a6ee3988ee Mon Sep 17 00:00:00 2001
From: Arnav Garg <arnav.garg@india.nec.com>
Date: Wed, 29 May 2019 13:44:50 +0530
Subject: [PATCH 006/276] Update actions.py

changing the existing datetime method from now -> utcnow
---
 ckanext/datarequests/actions.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ckanext/datarequests/actions.py b/ckanext/datarequests/actions.py
index f251084a..cb996475 100644
--- a/ckanext/datarequests/actions.py
+++ b/ckanext/datarequests/actions.py
@@ -211,7 +211,7 @@ def create_datarequest(context, data_dict):
     data_req = db.DataRequest()
     _undictize_datarequest_basic(data_req, data_dict)
     data_req.user_id = context['auth_user_obj'].id
-    data_req.open_time = datetime.datetime.now()
+    data_req.open_time = datetime.datetime.utcnow()
 
     session.add(data_req)
     session.commit()    
@@ -563,7 +563,7 @@ def close_datarequest(context, data_dict):
 
     data_req.closed = True
     data_req.accepted_dataset_id = data_dict.get('accepted_dataset_id', None)
-    data_req.close_time = datetime.datetime.now()
+    data_req.close_time = datetime.datetime.utcnow()
 
     session.add(data_req)
     session.commit()
@@ -616,7 +616,7 @@ def comment_datarequest(context, data_dict):
     comment = db.Comment()
     _undictize_comment_basic(comment, data_dict)
     comment.user_id = context['auth_user_obj'].id
-    comment.time = datetime.datetime.now()
+    comment.time = datetime.datetime.utcnow()
 
     session.add(comment)
     session.commit()

From 4805bb1a58e3ef1437c3e5a649228e8c287671df Mon Sep 17 00:00:00 2001
From: Arnav Garg <arnav.garg@india.nec.com>
Date: Wed, 29 May 2019 13:53:20 +0530
Subject: [PATCH 007/276] Update test_actions.py

---
 ckanext/datarequests/tests/test_actions.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/ckanext/datarequests/tests/test_actions.py b/ckanext/datarequests/tests/test_actions.py
index a2f58147..22a72bce 100644
--- a/ckanext/datarequests/tests/test_actions.py
+++ b/ckanext/datarequests/tests/test_actions.py
@@ -341,8 +341,8 @@ def test_create_datarequest_invalid(self):
     @patch('ckanext.datarequests.actions._send_mail')
     def test_create_datarequest_valid(self, send_mail_mock):
         # Configure the mocks
-        current_time = self._datetime.datetime.now()
-        actions.datetime.datetime.now = MagicMock(return_value=current_time)
+        current_time = self._datetime.datetime.utcnow()
+        actions.datetime.datetime.utcnow = MagicMock(return_value=current_time)
 
         # Mock actions
         default_user = {'user': 1}
@@ -430,7 +430,7 @@ def test_show_datarequest_found_closed(self, organization_id, accepted_dataset_i
         datarequest = test_data._generate_basic_datarequest()
         datarequest.organization_id = organization_id
         datarequest.accepted_dataset_id = 'example_uuidv4_package'
-        datarequest.close_time = datetime.datetime.now()
+        datarequest.close_time = datetime.datetime.utcnow()
         datarequest.closed = True
 
         org_checked = True if organization_id else False
@@ -693,8 +693,8 @@ def test_close_datarequest_not_found_accepted_ds(self):
     ])
     def test_close_datarequest(self, data, expected_accepted_ds, organization_id):
         # Configure the mock
-        current_time = self._datetime.datetime.now()
-        actions.datetime.datetime.now = MagicMock(return_value=current_time)
+        current_time = self._datetime.datetime.utcnow()
+        actions.datetime.datetime.utcnow = MagicMock(return_value=current_time)
         datarequest = test_data._generate_basic_datarequest()
         datarequest.organization_id = organization_id
         datarequest.accepted_dataset_id = None
@@ -774,9 +774,9 @@ def test_comment_invalid(self, function=actions.comment_datarequest, check_acces
     @patch('ckanext.datarequests.actions._get_datarequest_involved_users')
     def test_comment(self, get_datarequest_involved_users_mock, send_mail_mock):
         # Configure the mocks
-        current_time = self._datetime.datetime.now()
+        current_time = self._datetime.datetime.utcnow()
         datarequest_dict = MagicMock()
-        actions.datetime.datetime.now = MagicMock(return_value=current_time)
+        actions.datetime.datetime.utcnow = MagicMock(return_value=current_time)
         actions.validator.validate_comment.return_value = datarequest_dict
 
         # User

From 83dd024688ecf4cfabcb470aa028bd2d8c8a14f5 Mon Sep 17 00:00:00 2001
From: Arnav Garg <arnav.garg@india.nec.com>
Date: Wed, 29 May 2019 13:54:49 +0530
Subject: [PATCH 008/276] Update test_actions_data.py

---
 ckanext/datarequests/tests/test_actions_data.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ckanext/datarequests/tests/test_actions_data.py b/ckanext/datarequests/tests/test_actions_data.py
index b628b0f3..6012a63b 100644
--- a/ckanext/datarequests/tests/test_actions_data.py
+++ b/ckanext/datarequests/tests/test_actions_data.py
@@ -92,7 +92,7 @@ def _generate_basic_datarequest(id=DATAREQUEST_ID, user_id='example_uuidv4_user'
     datarequest.title = title
     datarequest.description = description
     datarequest.organization_id = organization_id
-    datarequest.open_time = datetime.datetime.now()
+    datarequest.open_time = datetime.datetime.utcnow()
     datarequest.closed = closed
     datarequest.close_time = None
     datarequest.accepted_dataset_id = None
@@ -108,7 +108,7 @@ def _generate_basic_comment(id=COMMENT_ID, user_id='example_uuidv4_user',
     comment.user_id = user_id
     comment.comment = comment
     comment.datarequest_id = datarequest_id
-    comment.time = datetime.datetime.now()
+    comment.time = datetime.datetime.utcnow()
 
     return comment
 

From 89e4418201125d7ff984fbb7782220e3510ba7c8 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Thu, 4 Jul 2019 11:02:48 +1000
Subject: [PATCH 009/276] CHG-4018 (#4)

* Add missing float cast

* Add French translations

* Added configurable required description
Added block offering_description to datarequest_form template so other templates can override the block

* Updated readme with ckan.datarequests.description_required
---
 README.md                                     |   4 +
 .../fr/LC_MESSAGES/ckanext-datarequests.mo    | Bin 0 -> 8685 bytes
 .../fr/LC_MESSAGES/ckanext-datarequests.po    | 505 ++++++++++++++++++
 ckanext/datarequests/plugin.py                |   8 +-
 .../snippets/datarequest_form.html            |   7 +-
 ckanext/datarequests/tests/test_selenium.py   |   2 +-
 ckanext/datarequests/validator.py             |   6 +-
 7 files changed, 525 insertions(+), 7 deletions(-)
 create mode 100644 ckanext/datarequests/i18n/fr/LC_MESSAGES/ckanext-datarequests.mo
 create mode 100644 ckanext/datarequests/i18n/fr/LC_MESSAGES/ckanext-datarequests.po

diff --git a/README.md b/README.md
index ce42effb..4668be56 100644
--- a/README.md
+++ b/README.md
@@ -207,6 +207,10 @@ ckan.datarequests.comments = [true|false]
 ```
 ckan.datarequests.show_datarequests_badge = [true|false]
 ```
+* Enable or disable description as a required field on data request forms
+```
+ckan.datarequests.description_required = [true|false]
+```
 * Restart your apache2 reserver
 ```
 sudo service apache2 restart
diff --git a/ckanext/datarequests/i18n/fr/LC_MESSAGES/ckanext-datarequests.mo b/ckanext/datarequests/i18n/fr/LC_MESSAGES/ckanext-datarequests.mo
new file mode 100644
index 0000000000000000000000000000000000000000..db5bf07d4d2c96ee77436060f0f06ca36c8e9b73
GIT binary patch
literal 8685
zcmc(kZH!!18OIM=5Ehk+yejHpp_Izbu)8hLEZw%-ErptH+qBz?#z5}QoSnVxoqLD-
zGVMa}C4L|ven22-tO;l$tYZA25To*iF~r0KLwq5|Xrg|Sgb!krs4?;PoO|xfz0+M<
z^n*=1|2gM8=bYy}@6Yu27q5F<@n?a5SMhJ`oiZBy*>;{%*D#z0&jmg3y<iJm4|c(e
zzz4t!!6)4OH^BEX{=Qp(39K>xH8=^bdzVstRkwh0?so8EaJQTPILKdh7ax~^i{J+E
zK2U>CfmeVpf*$~X>&AZv&u4rQALHN^U>)2Gz8^dZLZTja_!ubno&w(ueizi>kHIU!
z-+><m-vs6U(F>Hi47>w;4|q3t&N)i8L3wX9lHdP1P~P_tC~|oO+zfsV6uMX3`k%nd
z8NcSn?|@kLT>#2G>p|gvqZ=OuuVvf@Mebh$*MVOLMK4c-vj2HE{{krQdJ&ZO{2Ua%
z{|w5#Z-OHKiy#vHUkZx8C&4lBs2hJC6uPIuOTq7eqR$@qUf%x~P~;;_i~`qz!p~kl
zMDBNja()1c93BL>fG>b@&Kuw^Q1d96Z-8PaUj}~#{tQIK>M4wltJJqadB+bx(dSDb
zDpD_l!r!Z)-1j;te2*Y>k;{5e_FoRl{%hTM(v5e3u%hO`t>CA?dGK-YS>E{?IL`P9
z9wqnv6#O9g3MlsYI>?pkJd9TKcR9$Es)HW}cYz-QJ@6**GvF5RIZ)p58Yq0e0dkf4
z2PpSk$fHn|x&*u$)Zj*N7q|&L25RszQ0{pS6g~VBl=r>~ZU)!El*n}}D0Ig`x#uBJ
z<a-Jfe!uDPhu|3FmqFqCU!d6El^D<U;CApMU<-s*^#HgHIh_JUF26x2B9Fg;a{hT3
zp}b=~DEwRn%6$hxd4Cg>^8!%h@GvO+KMIOnJ_*i(KLNQyosaVie;Sl?=0MT62g<${
zDEFnHocCEb{{SfGJqB7k0<UBI5-9s$2gQE=3JO2#d5qZUI9Lbo0)_62psYXY*1rc{
z!~6dLZe#vjgmx>q3l#Z%nh#i4r$7xp5AFnC1!ur3P|D5VC&7c@Bj6tJkD%DyCNBH8
ztb-!YJ9Yl<1yJPQ1#uPi1yJPvRZ!mbtixY`B8Pv1BJXpq&gFCgC~~+A6#Ksxl>M6>
z?gmBfN5I42S3ot|@mgk7cf8nZo7BX*oh7MWFxm^XAEu^dVl}f6WvQBJG)$+icYCRq
z7&lB!vow+VT|Zschtt@2Z8g(u>e;B>HX+1(myP<6xhFG8KH=%moG6p{sUL-2p!bH0
zk(!B(UXC)IWbVreFHChB>81%_RHsXRq8s`7JI;=}DICN(2RqcP7dA|wW`ig(`Dc|y
zyU<j{6CCOdi4LPwFGg9|U#v_bHkdQo-nM|OiX-&i-FnH(w=WnY@@)iJ(+rN0RlAbE
zag~Kmwh;Kq(rSCM4mS=KlH%HApi<rTPWtVvt)oS~p{W~7XuW~b6CFfhYt;>YSZtUW
z&^vO}j3O#}owai?E*QmXHj85nK=1aGMwTS#S5@fC1Cios5*Q{J$bQY0(-lx5T~iAc
zs@3mFD%>a93xeo`&JqzJrs*ZeF^o7@eY)hO8XJ|9`f4k9>jYj3Wm_+sw66CqT2r?c
zo<wb<la6Wli+&?N$qSoy-NO^)G;blm{v*BUv*0ssqdnop+TGx;X6~xVnBCpLqZ_%(
za?g|H!X4a=%RUG7jh7dM1ID<p1+!KH1b~tkh~St(IMy|Rq!Ifa@#gaPv$n(Anmnqk
z4Rw1QWt~Lbfv`OZM)^a8*(fwS)SMR*#ngUtLSoDQsIob6zPkFfKH;ZJ_Q@^3i%-Hh
z4&i%pN?AaqQ&yR_S|7cS*cLC}KPr2pxaEcZy`B}qez;^3wk6o0OycK(pef8A=$KF)
zC=-_lh5dBBz;9N_5_Q;kabv0a)Ox+H4ySmfniuO!{S-^V2E72qH<!iwFjf|sD+{<x
zlk=F<l%HCST`uyv$Jhfa#HCA%1BDqiZ&|_?#gIuerrk-G-E2SgoFPulM*~AHUpj_I
zI47{aC4Q58(z5oPFl5dnhx9Gfs*Xex7p_p(2LppWkJ&6pj$stz+I=TNh*8`mRpJps
zXsrhiI4)t;Yap49#Avb3>bajForxEEK@trZlhX#aqJ0|+Tnur^O4MVe7%amjp#!m7
zyY&ek>PYBi=~5K?_c9GneJ3w#_%te5tU6huj@S&Mi;U-nl~d#i{V-Iybwi@oUbM_x
zIh9W%;J?M5ex9$Un6um@5_84J+H6@FNVs#PiD*#9XU}Dxb>HTuu212!);(e&IH}&|
z>802#PLE#G_TuBs=tMZ0+wk=0oSV@1WPal~Cb4M9vJL9ECZV{NdNGlDdbAUDqOOVE
zY$Kwa3z^<<eR1I3X%q#i-`SKnnx(WIOpm5<W=6O7FA-nz(iD5%cB8jlFL7607q)Eg
zw%1Aq&<l84v+1&kAL}EB_SKb>F13lUSNK_Fkl2ybl|o{ZiD~7<W>GWh{Zy#xwAqp?
ztCpmR{4-Hyuc{0ZRrnC0zFiq4>b~*&bwUKiJNyR2Fl#TE_<mjH+$EG%*NQx`>SDfe
zC|RsZ>5ds9Js3yFOe3xBZPt!ba*$uAbmO=env-cw7<Azx(c|^a^@))~rW3_!Z7yl~
z&DyT4mDJ{=Df^P0)cP^j5ttT+6H!mp7vqtG2j*+GaO2?GZlcVTo*bXJxi-F~Hn~+#
zY?<0}(+%U3<Kqz44w<em3=HUQsf|z6CN}Gd@u~628^$M~+vg=|Z9ewGgqRh@Q+gMd
zk=qZ%{!&I9)7uuJ1>*%fTW!w|>e$J4_JpmBY(Ayos2J4d=_q7IZ`-$TXW-XS?)H&`
zK^A*KZ4dUDOzE&=hspHhtvdfYeSN66>xoSxb9?7*8%S)TK0Y#=J40=Lxx-B<0=$uu
z%nxt1MK1O?ou!MltphrF1YTCVEo?+$-&1<)f}f7uZbB1FJg)6p=6T+N3G^hw-!h{1
znY^p&JwrdFU7yvI=l8xPGg(Lp)n4EmUg=Alr8}aNB=5AO7bAHeGa1=RH={7@t(Zi8
ztU8u_V>)SXMePZ)le)Q)dS1FPCT5ONC~*k)I0y9n*p#L@)wIcn<vCc&y2c|<<-yZ#
zk$y}<0P0TY$2y&$w<2wwEGDY=P->D|H_BM+{fNY6G=m_*`-L|4+c44S$5`2<cbx66
zlm^3b$)=ew%mO5}$HW}!Kx0S6LuP|0&0-!uTVfwYlwKoU289=;5FU_qrIr>|4N-&}
zJ+znT-U_1BmXcHVZKQc<R)nLgl%5D(D61!W?jR?SwFzwTzV>pPwAOo4a|x~0;EBob
zeW6$kmL^YV_ErE|6x;IIj<5HOC~k;HyCF{!s16foM?U(d?d$KMt-}b#qy}0k8>hq!
z(SHLnYc6&JldwDJ0I}H=??>*tbNiDmeFNXu*JgQIw04>hQQUxdHMLe&tBP_e<p`@&
zQ?jBpRJsbY6(e%%PCB{2s#zlzEWfenju<V?8g81UKBb413;OBH()#L<!%K>XA+cCd
zCRskhe>w;_k-nN=M<hx}oR<iy5BuVL2|2bwp61`Zxw3M0*v=_2nJo*5I2v|nS@Io-
zrwg@Q!r{`Zi>2XPR#Ff*iGbXdNJt{m3{)l-b`08rDf&&zLq|f%z1A3pYz8)xPH#n8
zT=`K)9M~~f@Qs<(Pm6V7#4ju2v^WTHu)>5oT*R7k%b6R<pw>StznCMyFN%1CFBc(g
z18Nd=5YM|Oi%^MZRrFDQ-wt(qZzVRdA~RVrHqeop$r@`oOz|2b@Y*!ogwAo;P9(hx
z&z2t5x-e=E6XUl?4T&B;qi^B%?BPUGT#e~qLW9=TF_ITgm?$wnKbZcNw-)i$K9C>K
zeCb|Mb4({|yBN16xBK!bB_p=otf_2B)S<#+*9<ROy4&7^6lb`Vl){oa@e5~uxl>^p
z`Q1)){iso}&d+hyCyVtWEI7}~1HQ`!Sm6+L+3ZVq4-TilCCL(6bN<9k48K>1t>kIH
z>yvQH>t_zsVsvFQD_9>eGlnJDt~0^mhzF9dGwK;zTv*3!5O2iQ3dV4KY**Y)rgQu3
z`$=8T5j=d#iJWJ4QBg?`%8^(M!9jk4^7sKt0>Pr!AfDNRMXGxjc~~L1<$j&i^-&2+
zE+q6;T3%qJgy_cs7a=MZLkQ|dqUGYjB5}ATcF{z4O@p$6G*WB$b!Cqag<ozJY10$a
z5+`JDLX#w<p%^p}UUG)bT`6TG@HsZ}knJ9(=CCGMbXi#hTq-3_TOCA{w`O?5nV8Bg
zjyDa0l&GSRw{*#GeZ!zO``=HfR(EH(xG&C<oUBOyTRzCD6%F)d{PqNr^EKF9NYL4A
z9$pam|GO_oOq7ArHCQ({x@gpGckbg1y6kIRTMqPA7Hwt{JEb8QE;7WQq;i#5kPzp~
zZ95UQ@V}CQ6?0W*7&=!CmkNsNLz|Oh()oyX)=+t$tkm2~-93D~?e|UI@SCFJcNwT0
zNoZ0YbUh2fg9r78R5XmMZNK~v)u8boy0gfe6@p47Qc#r6DCAe9<l&?{_z55{H~7zl
Myv&hUR?W}<0Yx3mF#rGn

literal 0
HcmV?d00001

diff --git a/ckanext/datarequests/i18n/fr/LC_MESSAGES/ckanext-datarequests.po b/ckanext/datarequests/i18n/fr/LC_MESSAGES/ckanext-datarequests.po
new file mode 100644
index 00000000..70474312
--- /dev/null
+++ b/ckanext/datarequests/i18n/fr/LC_MESSAGES/ckanext-datarequests.po
@@ -0,0 +1,505 @@
+# French translations for ckanext-datarequests.
+# Copyright (C) 2018 SICTIAM
+# This file is distributed under the same license as the
+# ckanext-datarequests project.
+# Benoit Orihuela <bobeal@gmail.com>, 2018.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ckanext-datarequests 0.3.1\n"
+"Report-Msgid-Bugs-To: data@metropolegrenoble.fr\n"
+"POT-Creation-Date: 2016-04-28 14:45+0200\n"
+"PO-Revision-Date: 2017-01-13 10:02+0100\n"
+"Last-Translator: Benoit Orihuela <bobeal@gmail.com>\n"
+"Language: fr\n"
+"Language-Team: fr <LL@li.org>\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.3.4\n"
+
+#: ckanext/datarequests/actions.py:192 ckanext/datarequests/actions.py:244
+#: ckanext/datarequests/actions.py:435 ckanext/datarequests/actions.py:480
+#: ckanext/datarequests/actions.py:536 ckanext/datarequests/actions.py:624
+msgid "Data Request ID has not been included"
+msgstr "L'ID de la demande n'a pas été ajouté"
+
+#: ckanext/datarequests/actions.py:203 ckanext/datarequests/actions.py:255
+#: ckanext/datarequests/actions.py:446 ckanext/datarequests/actions.py:491
+#, python-format
+msgid "Data Request %s not found in the data base"
+msgstr "La demande %s n'a pas été trouvée"
+
+#: ckanext/datarequests/actions.py:500
+msgid "This Data Request is already closed"
+msgstr "Cette demande a été cloturée"
+
+#: ckanext/datarequests/actions.py:578 ckanext/datarequests/actions.py:671
+#: ckanext/datarequests/actions.py:717
+msgid "Comment ID has not been included"
+msgstr "L'ID du commentaire n'a pas été ajouté"
+
+#: ckanext/datarequests/actions.py:589 ckanext/datarequests/actions.py:682
+#: ckanext/datarequests/actions.py:728
+#, python-format
+msgid "Comment %s not found in the data base"
+msgstr "Le commentaire %s n'a pas été trouvé"
+
+#: ckanext/datarequests/templates/datarequests/snippets/datarequest_form.html:17
+#: ckanext/datarequests/validator.py:31 ckanext/datarequests/validator.py:34
+#: ckanext/datarequests/validator.py:41
+msgid "Title"
+msgstr "Titre"
+
+#: ckanext/datarequests/validator.py:31
+#, python-format
+msgid "Title must be a maximum of %d characters long"
+msgstr "Le titre ne doit pas dépasser %d caractères"
+
+#: ckanext/datarequests/validator.py:34
+msgid "Title cannot be empty"
+msgstr "Le titre ne peut pas être vide"
+
+#: ckanext/datarequests/validator.py:41
+msgid "That title is already in use"
+msgstr "Ce titre est déjà utilisé"
+
+#: ckanext/datarequests/templates/datarequests/snippets/datarequest_form.html:21
+#: ckanext/datarequests/validator.py:45
+msgid "Description"
+msgstr "Description"
+
+#: ckanext/datarequests/validator.py:45
+#, python-format
+msgid "Description must be a maximum of %d characters long"
+msgstr "La description ne doit pas dépasser %d caractères"
+
+#: ckanext/datarequests/templates/datarequests/snippets/additional_info.html:11
+#: ckanext/datarequests/templates/datarequests/snippets/datarequest_form.html:25
+#: ckanext/datarequests/validator.py:52
+msgid "Organization"
+msgstr "Organisation"
+
+#: ckanext/datarequests/validator.py:52
+msgid "Organization is not valid"
+msgstr "Cette organisation n'est pas valide"
+
+#: ckanext/datarequests/templates/datarequests/snippets/additional_info.html:24
+#: ckanext/datarequests/validator.py:65
+msgid "Accepted Dataset"
+msgstr "Jeu de données accepté"
+
+#: ckanext/datarequests/validator.py:65
+msgid "Dataset not found"
+msgstr "Jeu de données non trouvé"
+
+#: ckanext/datarequests/templates/datarequests/base.html:17
+#: ckanext/datarequests/templates/datarequests/show.html:25
+#: ckanext/datarequests/validator.py:75
+msgid "Data Request"
+msgstr "Demande de données"
+
+#: ckanext/datarequests/validator.py:75
+msgid "Data Request not found"
+msgstr "Demande de données introuvable"
+
+#: ckanext/datarequests/validator.py:78 ckanext/datarequests/validator.py:81
+msgid "Comment"
+msgstr "Commentaire"
+
+#: ckanext/datarequests/validator.py:78
+msgid "Comments must be a minimum of 1 character long"
+msgstr "Le commentaire doit contenir au moins 1 caractère"
+
+#: ckanext/datarequests/validator.py:81
+#, python-format
+msgid "Comments must be a maximum of %d characters long"
+msgstr "Le commentaire ne doit pas dépasser %d caractères"
+
+#: ckanext/datarequests/controllers/ui_controller.py:129
+msgid "Newest"
+msgstr "Plus récent"
+
+#: ckanext/datarequests/controllers/ui_controller.py:129
+msgid "Oldest"
+msgstr "Plus ancien"
+
+#: ckanext/datarequests/controllers/ui_controller.py:145
+#: ckanext/datarequests/tests/test_ui_controller.py:628
+msgid "State"
+msgstr "État"
+
+#: ckanext/datarequests/controllers/ui_controller.py:150
+#: ckanext/datarequests/templates/header.html:6
+#: ckanext/datarequests/tests/test_ui_controller.py:630
+msgid "Organizations"
+msgstr "Organisations"
+
+#: ckanext/datarequests/controllers/ui_controller.py:156
+msgid "\"page\" parameter must be an integer"
+msgstr "Le paramètre \"page\" doit être un nombre entier"
+
+#: ckanext/datarequests/controllers/ui_controller.py:159
+msgid "Unauthorized to list Data Requests"
+msgstr "Vous n'êtes pas autorisé à voir les demandes de données"
+
+#: ckanext/datarequests/controllers/ui_controller.py:210
+msgid "Unauthorized to create a Data Request"
+msgstr "Vous n'êtes pas autorisé à créer une demande de données"
+
+#: ckanext/datarequests/controllers/ui_controller.py:225
+#: ckanext/datarequests/controllers/ui_controller.py:248
+#: ckanext/datarequests/controllers/ui_controller.py:265
+#: ckanext/datarequests/controllers/ui_controller.py:334
+#: ckanext/datarequests/controllers/ui_controller.py:401
+#, python-format
+msgid "Data Request %s not found"
+msgstr "La demande %s est introuvable"
+
+#: ckanext/datarequests/controllers/ui_controller.py:228
+#, python-format
+msgid "You are not authorized to view the Data Request %s"
+msgstr "Vous n'êtes pas autorisé à voir la demande %s"
+
+#: ckanext/datarequests/controllers/ui_controller.py:251
+#, python-format
+msgid "You are not authorized to update the Data Request %s"
+msgstr "Vous n'êtes pas autorisé à mettre à jour la demande de données %s"
+
+#: ckanext/datarequests/controllers/ui_controller.py:261
+#: ckanext/datarequests/tests/test_ui_controller.py:672
+#, python-format
+msgid "Data Request %s has been deleted"
+msgstr "La demande de données %s a été supprimée"
+
+#: ckanext/datarequests/controllers/ui_controller.py:268
+#, python-format
+msgid "You are not authorized to delete the Data Request %s"
+msgstr "Vous n'êtes pas autorisé à supprimer la demande de données %s"
+
+#: ckanext/datarequests/controllers/ui_controller.py:316
+msgid "This data request is already closed"
+msgstr "Cette demande de données est déjà cloturée"
+
+#: ckanext/datarequests/controllers/ui_controller.py:337
+#, python-format
+msgid "You are not authorized to close the Data Request %s"
+msgstr "Vous n'êtes pas autorisé à cloturer la demande de données %s"
+
+#: ckanext/datarequests/controllers/ui_controller.py:366
+msgid "Comment has been published"
+msgstr "Le commentaire a été publié"
+
+#: ckanext/datarequests/controllers/ui_controller.py:368
+msgid "Comment has been updated"
+msgstr "Le commentaire a été mis à jour"
+
+#: ckanext/datarequests/controllers/ui_controller.py:374
+#, python-format
+msgid "You are not authorized to %s"
+msgstr "Vous n'êtes pas autorisé à %s"
+
+#: ckanext/datarequests/controllers/ui_controller.py:405
+#, python-format
+msgid "You are not authorized to list the comments of the Data Request %s"
+msgstr "Vous n'êtes pas autorisé à voir les commentaires de la demande de données %s"
+
+#: ckanext/datarequests/controllers/ui_controller.py:414
+msgid "Comment has been deleted"
+msgstr "Le commentaire a été supprimé"
+
+#: ckanext/datarequests/controllers/ui_controller.py:419
+#, python-format
+msgid "Comment %s not found"
+msgstr "Le commentaire %s est introuvable"
+
+#: ckanext/datarequests/controllers/ui_controller.py:422
+msgid "You are not authorized to delete this comment"
+msgstr "Vous n'êtes pas autorisé à supprimer ce commentaire"
+
+#: ckanext/datarequests/templates/header.html:5
+#: ckanext/datarequests/templates/organization/read_base.html:4
+#: ckanext/datarequests/templates/user/read_base.html:4
+msgid "Datasets"
+msgstr "Jeux de données"
+
+#: ckanext/datarequests/templates/header.html:7
+msgid "Groups"
+msgstr "Groupes"
+
+#: ckanext/datarequests/templates/datarequests/base.html:8
+#: ckanext/datarequests/templates/datarequests/base.html:11
+#: ckanext/datarequests/templates/datarequests/close.html:6
+#: ckanext/datarequests/templates/datarequests/edit.html:6
+#: ckanext/datarequests/templates/datarequests/new.html:6
+#: ckanext/datarequests/templates/datarequests/show.html:8
+#: ckanext/datarequests/templates/header.html:8
+#: ckanext/datarequests/templates/organization/read_base.html:6
+#: ckanext/datarequests/templates/user/read_base.html:6
+msgid "Data Requests"
+msgstr "Demander une donnée"
+
+#: ckanext/datarequests/templates/header.html:9
+#: ckanext/datarequests/templates/organization/read_base.html:7
+msgid "About"
+msgstr "A propos"
+
+#: ckanext/datarequests/templates/datarequests/base.html:20
+msgid ""
+"Data Requests allow users to ask for data that is not published in the "
+"platform yet. If you want some specific data and you are not able to find"
+" it among all the published datasets, you can create a new data request "
+"specifying the data than you want to get."
+msgstr ""
+"Cette page permet aux utilisateurs de demander un jeu de données qui "
+"n'est pas encore présent sur le portail. Si vous recherchez une donnée "
+"en particulier et que vous n'avez pas réussi à la trouver dans les jeux "
+"de données déjà présents, vous pouvez créer une demande en spécifiant "
+"la donnée recherchée."
+
+#: ckanext/datarequests/templates/datarequests/close.html:3
+#: ckanext/datarequests/templates/datarequests/close.html:8
+#: ckanext/datarequests/templates/datarequests/close.html:12
+#: ckanext/datarequests/templates/datarequests/snippets/close_datarequest_form.html:25
+msgid "Close Data Request"
+msgstr "Fermer la demande"
+
+#: ckanext/datarequests/templates/datarequests/comment.html:5
+#: ckanext/datarequests/templates/datarequests/show.html:28
+msgid "Comments"
+msgstr "Commentaires"
+
+#: ckanext/datarequests/templates/datarequests/edit.html:3
+#: ckanext/datarequests/templates/datarequests/edit.html:8
+#: ckanext/datarequests/templates/datarequests/edit.html:12
+msgid "Edit Data Request"
+msgstr "Modifier la demande"
+
+#: ckanext/datarequests/templates/datarequests/index.html:9
+#: ckanext/datarequests/templates/organization/datarequests.html:10
+msgid "Add Data Request"
+msgstr "Ajouter une demande"
+
+#: ckanext/datarequests/templates/datarequests/index.html:12
+#: ckanext/datarequests/templates/organization/datarequests.html:13
+#: ckanext/datarequests/templates/user/datarequests.html:9
+msgid "Search Data Requests..."
+msgstr "Rechercher une demande de données ..."
+
+#: ckanext/datarequests/templates/datarequests/new.html:3
+#: ckanext/datarequests/templates/datarequests/new.html:7
+#: ckanext/datarequests/templates/datarequests/new.html:11
+#: ckanext/datarequests/templates/datarequests/snippets/datarequest_form.html:47
+#: ckanext/datarequests/templates/datarequests/snippets/new_datarequest_form.html:7
+msgid "Create Data Request"
+msgstr "Créer une demande de données"
+
+#: ckanext/datarequests/templates/datarequests/new.html:16
+msgid ""
+"To create a data request, fill the form and specify a title and a "
+"description for your request. Please, be as clear as you can in order to "
+"ease the task of accomplishing your request. You can also specify an "
+"organization if your data request is closely related with it. "
+msgstr ""
+"Pour créer une demande de donnée, remplissez le formulaire en précisant "
+"le titre et en donnant une description. Merci d'être le plus clair "
+"possible afin de faciliter la recherche des données. Vous pouvez "
+"également spécifier une organisation si votre demande est en lien avec "
+"celle-ci."
+
+#: ckanext/datarequests/templates/datarequests/show.html:15
+msgid "Manage"
+msgstr "Gérer"
+
+#: ckanext/datarequests/templates/datarequests/show.html:19
+msgid "Close"
+msgstr "Fermer"
+
+#: ckanext/datarequests/templates/datarequests/show.html:45
+#: ckanext/datarequests/templates/datarequests/snippets/additional_info.html:19
+#: ckanext/datarequests/templates/datarequests/snippets/datarequest_item.html:12
+msgid "Closed"
+msgstr "Cloturé"
+
+#: ckanext/datarequests/templates/datarequests/show.html:50
+#: ckanext/datarequests/templates/datarequests/snippets/datarequest_item.html:16
+msgid "Open"
+msgstr "Ouvert"
+
+#: ckanext/datarequests/templates/datarequests/snippets/additional_info.html:2
+msgid "Additional Info"
+msgstr "Informations supplémentaires"
+
+#: ckanext/datarequests/templates/datarequests/snippets/additional_info.html:7
+msgid "Creator"
+msgstr "Créateur"
+
+#: ckanext/datarequests/templates/datarequests/snippets/additional_info.html:8
+#: ckanext/datarequests/templates/datarequests/snippets/additional_info.html:12
+#: ckanext/datarequests/templates/datarequests/snippets/additional_info.html:29
+msgid "None"
+msgstr "Aucun"
+
+#: ckanext/datarequests/templates/datarequests/snippets/additional_info.html:15
+msgid "Created"
+msgstr "Date de création"
+
+#: ckanext/datarequests/templates/datarequests/snippets/additional_info.html:20
+msgid "Not closed yet"
+msgstr "Non cloturé"
+
+#: ckanext/datarequests/templates/datarequests/snippets/close_datarequest_form.html:11
+msgid "Accep. Dataset"
+msgstr "Accepter le jeu de données"
+
+#: ckanext/datarequests/templates/datarequests/snippets/comment_form.html:22
+msgid "Add a new Comment"
+msgstr "Ajouter un nouveau commentaire"
+
+#: ckanext/datarequests/templates/datarequests/snippets/comment_form.html:23
+#, python-format
+msgid ""
+"You can use <a href=\"#markdown\" title=\"Markdown quick reference\" "
+"data-target=\"popover\" data-content=\"%(markdown_tooltip)s\" data-"
+"html=\"true\">Markdown formatting</a> here. You can refer datasets by "
+"adding their URL."
+msgstr ""
+"Vous pouvez utiliser <a href=\"#markdown\" title=\"Markdown quick "
+"reference\" data-target=\"popover\" data-content=\"%(markdown_tooltip)s\""
+" data-html=\"true\">la mise en forme Markdown</a> ici. Vous pouvez vous "
+"référer à un jeu de données en ajoutant son URL."
+
+#: ckanext/datarequests/templates/datarequests/snippets/comment_form.html:28
+msgid "Cancel"
+msgstr "Annuler"
+
+#: ckanext/datarequests/templates/datarequests/snippets/comment_form.html:29
+msgid "Update Comment"
+msgstr "Mettre à jour le commentaire"
+
+#: ckanext/datarequests/templates/datarequests/snippets/comment_form.html:31
+msgid "Add Comment"
+msgstr "Ajouter un commentaire"
+
+#: ckanext/datarequests/templates/datarequests/snippets/comment_item.html:18
+msgid "Are you sure you want to delete this comment?"
+msgstr "Êtes-vous sûr de vouloir supprimer ce commentaire ?"
+
+#: ckanext/datarequests/templates/datarequests/snippets/comment_item.html:29
+msgid "commented"
+msgstr "commenté"
+
+#: ckanext/datarequests/templates/datarequests/snippets/comments.html:3
+msgid "Current Discussion"
+msgstr "Discussion actuelle"
+
+#: ckanext/datarequests/templates/datarequests/snippets/comments.html:13
+msgid "This data request has not been commented yet"
+msgstr "Cette demande n'a pas encore été commentée"
+
+#: ckanext/datarequests/templates/datarequests/snippets/datarequest_form.html:17
+msgid "eg. Data Request Name"
+msgstr "par ex, nom de la demande de données "
+
+#: ckanext/datarequests/templates/datarequests/snippets/datarequest_form.html:21
+msgid "eg. Data Request description"
+msgstr "par ex, description du jeu de données"
+
+#: ckanext/datarequests/templates/datarequests/snippets/datarequest_form.html:29
+msgid "No organization"
+msgstr "Aucune organisation"
+
+#: ckanext/datarequests/templates/datarequests/snippets/datarequest_form.html:43
+msgid "Are you sure you want to delete this data request?"
+msgstr "Êtes-vous sûr de vouloir supprimer cette demande ?"
+
+#: ckanext/datarequests/templates/datarequests/snippets/datarequest_form.html:44
+msgid "Delete"
+msgstr "Supprimer"
+
+#: ckanext/datarequests/templates/datarequests/snippets/datarequest_list.html:1
+msgid "No Data Requests found"
+msgstr "Aucune demande de données trouvée"
+
+#: ckanext/datarequests/templates/datarequests/snippets/datarequest_list.html:14
+msgid "No Data Requests found with the given criteria"
+msgstr "Aucune demande de données ne correspond aux critères renseignés "
+
+#: ckanext/datarequests/templates/datarequests/snippets/datarequest_list.html:16
+msgid "How about creating one?"
+msgstr "Pourquoi ne pas en créer une ?"
+
+#: ckanext/datarequests/templates/datarequests/snippets/edit_datarequest_form.html:4
+msgid "Update Data Request"
+msgstr "Mettre à jour la demande"
+
+#: ckanext/datarequests/templates/home/snippets/stats.html:5
+msgid "{0} statistics"
+msgstr "{0} statistiques"
+
+#: ckanext/datarequests/templates/home/snippets/stats.html:10
+msgid "dataset"
+msgstr "jeu de données"
+
+#: ckanext/datarequests/templates/home/snippets/stats.html:10
+msgid "datasets"
+msgstr "jeux de données"
+
+#: ckanext/datarequests/templates/home/snippets/stats.html:16
+msgid "organization"
+msgstr "organisation"
+
+#: ckanext/datarequests/templates/home/snippets/stats.html:16
+msgid "organizations"
+msgstr "organisations"
+
+#: ckanext/datarequests/templates/home/snippets/stats.html:22
+msgid "group"
+msgstr "groupe"
+
+#: ckanext/datarequests/templates/home/snippets/stats.html:22
+msgid "groups"
+msgstr "groupes"
+
+#: ckanext/datarequests/templates/home/snippets/stats.html:28
+msgid "related item"
+msgstr "Élément lié"
+
+#: ckanext/datarequests/templates/home/snippets/stats.html:28
+msgid "related items"
+msgstr "Éléments liés"
+
+#: ckanext/datarequests/templates/home/snippets/stats.html:34
+msgid "data request"
+msgstr "demande de données"
+
+#: ckanext/datarequests/templates/home/snippets/stats.html:34
+msgid "data requests"
+msgstr "demandes de données"
+
+#: ckanext/datarequests/templates/organization/read_base.html:5
+#: ckanext/datarequests/templates/user/read_base.html:5
+msgid "Activity Stream"
+msgstr "Flux d'activité"
+
+#: ckanext/datarequests/templates/snippets/custom_search_form.html:6
+msgid "{number} data request found for \"{query}\""
+msgid_plural "{number} data requests found for \"{query}\""
+msgstr[0] "{number} demande trouvée pour \"{query}\""
+msgstr[1] "{number} demandes trouvées pour \"{query}\""
+
+#: ckanext/datarequests/templates/snippets/custom_search_form.html:7
+msgid "No data requests found for \"{query}\""
+msgstr "Aucun jeu de données trouvé pour \"{query}\""
+
+#: ckanext/datarequests/templates/snippets/custom_search_form.html:8
+msgid "{number} data request found"
+msgid_plural "{number} data requests found"
+msgstr[0] "{number} jeu de données trouvé"
+msgstr[1] "{number} jeux de données trouvés"
+
+#: ckanext/datarequests/templates/snippets/custom_search_form.html:9
+msgid "No data requests found"
+msgstr "Aucune demande trouvée"
+
diff --git a/ckanext/datarequests/plugin.py b/ckanext/datarequests/plugin.py
index d2c78c3a..52850726 100644
--- a/ckanext/datarequests/plugin.py
+++ b/ckanext/datarequests/plugin.py
@@ -33,7 +33,7 @@
 
 def get_config_bool_value(config_name, default_value=False):
     value = config.get(config_name, default_value)
-    value = value if type(value) == bool else value != 'False'
+    value = tk.asbool(value)
     return value
 
 def is_fontawesome_4():
@@ -66,8 +66,9 @@ class DataRequestsPlugin(p.SingletonPlugin):
 
     def __init__(self, name=None):
         self.comments_enabled = get_config_bool_value('ckan.datarequests.comments', True)
-        self._show_datarequests_badge = get_config_bool_value('ckan.datarequests.show_datarequests_badge')
+        self._show_datarequests_badge = get_config_bool_value('ckan.datarequests.show_datarequests_badge')        
         self.name = 'datarequests'
+        self.is_description_required = get_config_bool_value('ckan.datarequests.description_required', False)
 
     ######################################################################
     ############################## IACTIONS ##############################
@@ -215,7 +216,8 @@ def get_helpers(self):
             'get_open_datarequests_number': helpers.get_open_datarequests_number,
             'get_open_datarequests_badge': partial(helpers.get_open_datarequests_badge, self._show_datarequests_badge),
             'get_plus_icon': get_plus_icon,
-            'is_following_datarequest': helpers.is_following_datarequest
+            'is_following_datarequest': helpers.is_following_datarequest,
+            'is_description_required': self.is_description_required
         }
 
     ######################################################################
diff --git a/ckanext/datarequests/templates/datarequests/snippets/datarequest_form.html b/ckanext/datarequests/templates/datarequests/snippets/datarequest_form.html
index e8e53354..c302d2e8 100644
--- a/ckanext/datarequests/templates/datarequests/snippets/datarequest_form.html
+++ b/ckanext/datarequests/templates/datarequests/snippets/datarequest_form.html
@@ -5,6 +5,7 @@
 {% set organization_id = data.get('organization_id', h.get_request_param('organization')) %}
 {% set organizations_available = h.organizations_available('read') %}
 {% set form_horizontal = 'form-horizontal' if h.ckan_version()[:3] <= '2.7' else '' %}
+{% set description_required = h.is_description_required %}
 
 {# This provides a full page that renders a form for publishing a dataset. It can
 then itself be extended to add/remove blocks of functionality. #}
@@ -18,10 +19,11 @@
     {{ form.input('title', id='field-title', label=_('Title'), placeholder=_('eg. Data Request Name'), value=title, error=errors['Title'], classes=['control-full', 'control-large'], is_required=true) }}
   {% endblock %}
 
-  {% block offering_description %}
-    {{ form.markdown('description', id='field-description', label=_('Description'), placeholder=_('eg. Data Request description'), value=description, error=errors['Description']) }}
+  {% block offering_description %}  
+    {{ form.markdown('description', id='field-description', label=_('Description'), placeholder=_('eg. Data Request description'), value=description, error=errors['Description'], is_required=description_required) }}
   {% endblock %}
 
+  {% block offering_organizations %}
   <div class="control-group form-group">
     <label for="field-organizations" class="control-label">{{ _('Organization') }}</label>
     <div class="controls">
@@ -36,6 +38,7 @@
       </select>
     </div>
   </div>
+  {% endblock %}
 
   {% block form_actions %}
     <div class="form-actions">
diff --git a/ckanext/datarequests/tests/test_selenium.py b/ckanext/datarequests/tests/test_selenium.py
index 83f5cd80..370e233b 100644
--- a/ckanext/datarequests/tests/test_selenium.py
+++ b/ckanext/datarequests/tests/test_selenium.py
@@ -467,7 +467,7 @@ def test_close_datarequest(self):
         self.check_datarequest(datarequest_id, datarequest_title,
                                datarequest_description, False, True)
 
-    @unittest.skipIf('.'.join(os.environ.get('CKANVERSION', '2.7').split('.')[:-1]) >= 2.8, 
+    @unittest.skipIf(float('.'.join(os.environ.get('CKANVERSION', '2.7').split('.')[:-1])) >= 2.8, 
                      'This test cannot be run in CKAN >= 2.8 because elements in combo boxes cannot be selected')
     def test_close_datarequest_with_organization_and_accepted_dataset(self):
 
diff --git a/ckanext/datarequests/validator.py b/ckanext/datarequests/validator.py
index b195f6b7..4cf37e3e 100644
--- a/ckanext/datarequests/validator.py
+++ b/ckanext/datarequests/validator.py
@@ -20,6 +20,7 @@
 import constants
 import ckan.plugins.toolkit as tk
 import ckanext.datarequests.db as db
+import plugin as datarequests
 
 
 def validate_datarequest(context, request_data):
@@ -39,8 +40,11 @@ def validate_datarequest(context, request_data):
     if 'Title' not in errors and not avoid_existing_title_check:
         if db.DataRequest.datarequest_exists(request_data['title']):
             errors[tk._('Title')] = [tk._('That title is already in use')]
-
+    
     # Check description
+    if datarequests.get_config_bool_value('ckan.datarequests.description_required', False) and not request_data['description']:
+        errors[tk._('Description')] = [tk._('Description cannot be empty')]
+
     if len(request_data['description']) > constants.DESCRIPTION_MAX_LENGTH:
         errors[tk._('Description')] = [tk._('Description must be a maximum of %d characters long') % constants.DESCRIPTION_MAX_LENGTH]
 

From 21609f547e079477d255508d7bd3cfd6da8d293c Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Tue, 9 Jul 2019 16:05:42 +1000
Subject: [PATCH 010/276] Develop to master (#5)

* Add missing float cast

* Add French translations

* Initial commit

* Added configurable required description
Added block offering_description to datarequest_form template so other templates can override the block

* Updated readme with ckan.datarequests.description_required

* Update actions.py

changing the existing datetime method from now -> utcnow

* Update test_actions.py

* Update test_actions_data.py
---
 ckanext/datarequests/actions.py                 |  6 +++---
 ckanext/datarequests/tests/test_actions.py      | 14 +++++++-------
 ckanext/datarequests/tests/test_actions_data.py |  4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/ckanext/datarequests/actions.py b/ckanext/datarequests/actions.py
index f251084a..cb996475 100644
--- a/ckanext/datarequests/actions.py
+++ b/ckanext/datarequests/actions.py
@@ -211,7 +211,7 @@ def create_datarequest(context, data_dict):
     data_req = db.DataRequest()
     _undictize_datarequest_basic(data_req, data_dict)
     data_req.user_id = context['auth_user_obj'].id
-    data_req.open_time = datetime.datetime.now()
+    data_req.open_time = datetime.datetime.utcnow()
 
     session.add(data_req)
     session.commit()    
@@ -563,7 +563,7 @@ def close_datarequest(context, data_dict):
 
     data_req.closed = True
     data_req.accepted_dataset_id = data_dict.get('accepted_dataset_id', None)
-    data_req.close_time = datetime.datetime.now()
+    data_req.close_time = datetime.datetime.utcnow()
 
     session.add(data_req)
     session.commit()
@@ -616,7 +616,7 @@ def comment_datarequest(context, data_dict):
     comment = db.Comment()
     _undictize_comment_basic(comment, data_dict)
     comment.user_id = context['auth_user_obj'].id
-    comment.time = datetime.datetime.now()
+    comment.time = datetime.datetime.utcnow()
 
     session.add(comment)
     session.commit()
diff --git a/ckanext/datarequests/tests/test_actions.py b/ckanext/datarequests/tests/test_actions.py
index a2f58147..22a72bce 100644
--- a/ckanext/datarequests/tests/test_actions.py
+++ b/ckanext/datarequests/tests/test_actions.py
@@ -341,8 +341,8 @@ def test_create_datarequest_invalid(self):
     @patch('ckanext.datarequests.actions._send_mail')
     def test_create_datarequest_valid(self, send_mail_mock):
         # Configure the mocks
-        current_time = self._datetime.datetime.now()
-        actions.datetime.datetime.now = MagicMock(return_value=current_time)
+        current_time = self._datetime.datetime.utcnow()
+        actions.datetime.datetime.utcnow = MagicMock(return_value=current_time)
 
         # Mock actions
         default_user = {'user': 1}
@@ -430,7 +430,7 @@ def test_show_datarequest_found_closed(self, organization_id, accepted_dataset_i
         datarequest = test_data._generate_basic_datarequest()
         datarequest.organization_id = organization_id
         datarequest.accepted_dataset_id = 'example_uuidv4_package'
-        datarequest.close_time = datetime.datetime.now()
+        datarequest.close_time = datetime.datetime.utcnow()
         datarequest.closed = True
 
         org_checked = True if organization_id else False
@@ -693,8 +693,8 @@ def test_close_datarequest_not_found_accepted_ds(self):
     ])
     def test_close_datarequest(self, data, expected_accepted_ds, organization_id):
         # Configure the mock
-        current_time = self._datetime.datetime.now()
-        actions.datetime.datetime.now = MagicMock(return_value=current_time)
+        current_time = self._datetime.datetime.utcnow()
+        actions.datetime.datetime.utcnow = MagicMock(return_value=current_time)
         datarequest = test_data._generate_basic_datarequest()
         datarequest.organization_id = organization_id
         datarequest.accepted_dataset_id = None
@@ -774,9 +774,9 @@ def test_comment_invalid(self, function=actions.comment_datarequest, check_acces
     @patch('ckanext.datarequests.actions._get_datarequest_involved_users')
     def test_comment(self, get_datarequest_involved_users_mock, send_mail_mock):
         # Configure the mocks
-        current_time = self._datetime.datetime.now()
+        current_time = self._datetime.datetime.utcnow()
         datarequest_dict = MagicMock()
-        actions.datetime.datetime.now = MagicMock(return_value=current_time)
+        actions.datetime.datetime.utcnow = MagicMock(return_value=current_time)
         actions.validator.validate_comment.return_value = datarequest_dict
 
         # User
diff --git a/ckanext/datarequests/tests/test_actions_data.py b/ckanext/datarequests/tests/test_actions_data.py
index b628b0f3..6012a63b 100644
--- a/ckanext/datarequests/tests/test_actions_data.py
+++ b/ckanext/datarequests/tests/test_actions_data.py
@@ -92,7 +92,7 @@ def _generate_basic_datarequest(id=DATAREQUEST_ID, user_id='example_uuidv4_user'
     datarequest.title = title
     datarequest.description = description
     datarequest.organization_id = organization_id
-    datarequest.open_time = datetime.datetime.now()
+    datarequest.open_time = datetime.datetime.utcnow()
     datarequest.closed = closed
     datarequest.close_time = None
     datarequest.accepted_dataset_id = None
@@ -108,7 +108,7 @@ def _generate_basic_comment(id=COMMENT_ID, user_id='example_uuidv4_user',
     comment.user_id = user_id
     comment.comment = comment
     comment.datarequest_id = datarequest_id
-    comment.time = datetime.datetime.now()
+    comment.time = datetime.datetime.utcnow()
 
     return comment
 

From 553cead2e1a1985f1fc26d54278c906a33f158c6 Mon Sep 17 00:00:00 2001
From: Nathan Perry <nathan@salsadigital.com.au>
Date: Tue, 13 Aug 2019 11:26:51 +1200
Subject: [PATCH 011/276] Added CI integration + Docker. (#2) (#10)

---
 .ahoy.yml                                   | 194 ++++++
 .circleci/build.sh                          |  24 +
 .circleci/config.yml                        |  40 ++
 .circleci/process-artifacts.sh              |  13 +
 .circleci/test.sh                           |  14 +
 .docker/Dockerfile.ckan                     |  43 ++
 .docker/Dockerfile.solr                     |   3 +
 .docker/scripts/create-test-data.sh         | 127 ++++
 .docker/scripts/doctor.sh                   | 202 ++++++
 .docker/scripts/init-ext.sh                 |  16 +
 .docker/scripts/init.sh                     |  22 +
 .docker/scripts/serve.sh                    |  10 +
 .docker/test.ini                            | 216 ++++++
 .env                                        |  25 +
 .flake8                                     |  19 +
 .gitattributes                              |   8 +
 .gitignore                                  |  28 +-
 .travis.yml                                 |  27 -
 README.md                                   | 333 ++-------
 bin/travis-build.bash                       |  43 --
 bin/travis-run.sh                           |   3 -
 ckanext/datarequests/plugin.py              |   2 +-
 ckanext/datarequests/tests/test_selenium.py | 721 --------------------
 docker-compose.yml                          | 110 +++
 requirements-dev.txt                        |  12 +
 requirements.txt                            |   0
 setup.cfg                                   |   8 +-
 test.ini                                    |  13 -
 test/features/datarequest.feature           | 144 ++++
 test/features/environment.py                | 106 +++
 test/features/homepage.feature              |   7 +
 test/features/login.feature                 |  20 +
 test/features/steps/steps.py                |  70 ++
 test/fixtures/.gitkeep                      |   0
 34 files changed, 1515 insertions(+), 1108 deletions(-)
 create mode 100644 .ahoy.yml
 create mode 100755 .circleci/build.sh
 create mode 100644 .circleci/config.yml
 create mode 100755 .circleci/process-artifacts.sh
 create mode 100755 .circleci/test.sh
 create mode 100644 .docker/Dockerfile.ckan
 create mode 100644 .docker/Dockerfile.solr
 create mode 100644 .docker/scripts/create-test-data.sh
 create mode 100755 .docker/scripts/doctor.sh
 create mode 100755 .docker/scripts/init-ext.sh
 create mode 100755 .docker/scripts/init.sh
 create mode 100755 .docker/scripts/serve.sh
 create mode 100644 .docker/test.ini
 create mode 100644 .env
 create mode 100644 .flake8
 create mode 100644 .gitattributes
 delete mode 100644 .travis.yml
 delete mode 100644 bin/travis-build.bash
 delete mode 100644 bin/travis-run.sh
 delete mode 100644 ckanext/datarequests/tests/test_selenium.py
 create mode 100644 docker-compose.yml
 create mode 100644 requirements-dev.txt
 create mode 100644 requirements.txt
 delete mode 100644 test.ini
 create mode 100644 test/features/datarequest.feature
 create mode 100644 test/features/environment.py
 create mode 100644 test/features/homepage.feature
 create mode 100644 test/features/login.feature
 create mode 100644 test/features/steps/steps.py
 create mode 100644 test/fixtures/.gitkeep

diff --git a/.ahoy.yml b/.ahoy.yml
new file mode 100644
index 00000000..efee9220
--- /dev/null
+++ b/.ahoy.yml
@@ -0,0 +1,194 @@
+---
+ahoyapi: v2
+
+commands:
+
+  # Docker commands.
+  build:
+    usage: Build or rebuild project.
+    cmd: |
+      ahoy title "Building project"
+      ahoy pre-flight
+      ahoy clean
+      (docker network prune -f > /dev/null && docker network inspect amazeeio-network > /dev/null || docker network create amazeeio-network)
+      ahoy up -- --build --force-recreate
+      ahoy install-dev
+      ahoy install-site
+      # ahoy title "Build complete"
+      ahoy doctor
+      ahoy info 1
+
+  info:
+    usage: Print information about this project.
+    cmd: |
+      ahoy line "Project                  : " ${PROJECT}
+      ahoy line "Site local URL           : " ${LAGOON_LOCALDEV_URL}
+      ahoy line "DB port on host          : " $(docker port $(docker-compose ps -q postgres) 5432 | cut -d : -f 2)
+      ahoy line "Solr port on host        : " $(docker port $(docker-compose ps -q solr) 8983 | cut -d : -f 2)
+      ahoy line "Mailhog URL              : " http://mailhog.docker.amazee.io/
+
+  up:
+    usage: Build and start Docker containers.
+    cmd: |
+      docker-compose up -d "$@"
+      ahoy cli "dockerize -wait tcp://ckan:3000 -timeout 1m"
+      if docker-compose logs | grep -q "\[Error\]"; then docker-compose logs; exit 1; fi
+      if docker-compose logs | grep -q "Exception"; then docker-compose logs; exit 1; fi
+      docker ps -a --filter name=^/${COMPOSE_PROJECT_NAME}_
+      export DOCTOR_CHECK_CLI=0
+
+  down:
+    usage: Stop Docker containers and remove container, images, volumes and networks.
+    cmd: "if [ -f \"docker-compose.yml\" ]; then docker-compose down --volumes; fi"
+
+  start:
+    usage: Start existing Docker containers.
+    cmd: docker-compose start "$@"
+
+  stop:
+    usage: Stop running Docker containers.
+    cmd: docker-compose stop "$@"
+
+  restart:
+    usage: Restart all stopped and running Docker containers.
+    cmd: docker-compose restart
+
+  logs:
+    usage: Show Docker logs.
+    cmd: docker-compose logs "$@"
+
+  pull:
+    usage: Pull latest docker images.
+    cmd: if [ ! -z "$(docker image ls -q)" ]; then docker image ls --format \"{{.Repository}}:{{.Tag}}\" | grep amazeeio/ | grep -v none | xargs -n1 docker pull | cat; fi
+
+  cli:
+    usage: Start a shell inside CLI container or run a command.
+    cmd: if \[ "${#}" -ne 0 \]; then docker exec -i $(docker-compose ps -q ckan) sh -c ". /app/ckan/default/bin/activate; $*"; else docker exec -it $(docker-compose ps -q ckan) sh -c ". /app/ckan/default/bin/activate && sh"; fi
+
+  doctor:
+    usage: Find problems with current project setup.
+    cmd: .docker/scripts/doctor.sh "$@"
+
+
+  install-site:
+    usage: Install a site.
+    cmd: |
+      ahoy title "Installing a fresh site"
+      ahoy cli "/app/scripts/init.sh"
+
+  clean:
+    usage: Remove containers and all build files.
+    cmd: |
+      ahoy down
+      # Remove other directories.
+      # @todo: Add destinations below.
+      rm -rf \
+        ./ckan
+
+  reset:
+    usage: "Reset environment: remove containers, all build, manually created and Drupal-Dev files."
+    cmd: |
+      ahoy clean
+      git ls-files --others -i --exclude-from=.git/info/exclude | xargs chmod 777
+      git ls-files --others -i --exclude-from=.git/info/exclude | xargs rm -Rf
+      find . -type d -not -path "./.git/*" -empty -delete
+
+  install-dev:
+    usage: Install dependencies.
+    cmd: |
+      docker cp -L requirements-dev.txt $(docker-compose ps -q ckan):/app/.
+      docker cp -L .flake8 $(docker-compose ps -q ckan):/app/.
+      docker cp -L test $(docker-compose ps -q ckan):/app/.
+      ahoy cli "pip install -r /app/requirements-dev.txt"
+    hide: true
+
+  flush-redis:
+    usage: Flush Redis cache.
+    cmd: docker exec -i $(docker-compose ps -q redis) redis-cli flushall > /dev/null
+
+  lint:
+    usage: Lint code.
+    cmd: |
+      ahoy cli "flake8 ${@:-/app/ckanext}" || \
+      [ "${ALLOW_LINT_FAIL:-0}" -eq 1 ]
+
+  test-unit:
+    usage: Run unit tests.
+    cmd: |
+      ahoy cli "nosetests" || \
+      [ "${ALLOW_UNIT_FAIL:-0}" -eq 1 ]
+
+  test-bdd:
+    usage: Run BDD tests.
+    cmd: |
+      ahoy start-ckan-job-worker &
+      ahoy start-mailmock &
+      sleep 5 &&
+      ahoy cli "behave ${*:-/app/test/features}" || \
+      [ "${ALLOW_BDD_FAIL:-0}" -eq 1 ]
+      ahoy stop-mailmock
+      ahoy stop-ckan-job-worker     
+
+
+  start-mailmock:
+    usage: Starts email mock server used for email BDD tests
+    cmd: |
+      ahoy title 'Starting mailmock'
+      ahoy cli "cd /app/ckan/default/bin/ && ./mailmock -p 8025 -o /app/test/emails --no-stdout" # for debugging mailmock email output remove --no-stdout
+
+  stop-mailmock:
+    usage: Stops email mock server used for email BDD tests
+    cmd: |
+      ahoy title 'Stopping mailmock'
+      ahoy cli "killall -2 mailmock"
+
+  start-ckan-job-worker:
+    usage: Starts CKAN background job worker
+    cmd: |
+      ahoy title 'Starting CKAN background job worker'
+      ahoy cli "cd /usr/lib/ckan/default/src/ckan && \
+                paster jobs clear --config=/app/ckan/default/production.ini && \
+                paster jobs worker default --config=/app/ckan/default/production.ini"
+
+  stop-ckan-job-worker:
+    usage: Stops CKAN background job worker
+    cmd: |
+      ahoy title 'Stopping CKAN background job worker'
+      ahoy cli "pkill -f 'jobs worker'"
+
+  # Utilities.
+  title:
+    cmd: printf "$(tput -Txterm setaf 4)==> ${1}$(tput -Txterm sgr0)\n"
+    hide: true
+
+  line:
+    cmd: printf "$(tput -Txterm setaf 2)${1}$(tput -Txterm sgr0)${2}\n"
+    hide: true
+
+  getvar:
+    cmd: eval echo "${@}"
+    hide: true
+
+  pre-flight:
+    cmd: |
+      export DOCTOR_CHECK_DB=${DOCTOR_CHECK_DB:-1}
+      export DOCTOR_CHECK_TOOLS=${DOCTOR_CHECK_TOOLS:-1}
+      export DOCTOR_CHECK_PORT=${DOCTOR_CHECK_PORT:-0}
+      export DOCTOR_CHECK_PYGMY=${DOCTOR_CHECK_PYGMY:-1}
+      export DOCTOR_CHECK_CLI=${DOCTOR_CHECK_CLI:-0}
+      export DOCTOR_CHECK_SSH=${DOCTOR_CHECK_SSH:-0}
+      export DOCTOR_CHECK_WEBSERVER=${DOCTOR_CHECK_WEBSERVER:-0}
+      export DOCTOR_CHECK_BOOTSTRAP=${DOCTOR_CHECK_BOOTSTRAP:-0}
+      ahoy doctor
+    hide: true
+
+entrypoint:
+  - bash
+  - "-c"
+  - "-e"
+  - |
+    export LAGOON_LOCALDEV_URL=http://ckanext-datarequests.docker.amazee.io
+    [ -f .env ] && [ -s .env ] && export $(grep -v '^#' .env | xargs) && if [ -f .env.local ] && [ -s .env.local ]; then export $(grep -v '^#' .env.local | xargs); fi
+    bash -e -c "$0" "$@"
+  - '{{cmd}}'
+  - '{{name}}'
diff --git a/.circleci/build.sh b/.circleci/build.sh
new file mode 100755
index 00000000..611dca97
--- /dev/null
+++ b/.circleci/build.sh
@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+##
+# Build site in CI.
+#
+set -e
+
+# Process Docker Compose configuration. This is used to avoid multiple
+# docker-compose.yml files.
+# Remove lines containing '###'.
+sed -i -e "/###/d" docker-compose.yml
+# Uncomment lines containing '##'.
+sed -i -e "s/##//" docker-compose.yml
+
+# Pull the latest images.
+ahoy pull
+
+# Disable checks used on host machine.
+export DOCTOR_CHECK_PYGMY=0
+export DOCTOR_CHECK_PORT=0
+export DOCTOR_CHECK_SSH=0
+export DOCTOR_CHECK_WEBSERVER=0
+export DOCTOR_CHECK_BOOTSTRAP=0
+
+ahoy build
diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 00000000..b70b58fc
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,40 @@
+version: 2
+aliases:
+
+  # Shared configuration applied to each job.
+  - &container_config
+    working_directory: /app
+    docker:
+      #; Using "runner" container where each job will be executed. This container
+      #; has all necessary tools to run dockerized environment.
+      #; @see https://github.com/integratedexperts/ci-builder
+      - image: integratedexperts/ci-builder
+
+  # Step to setup remote docker.
+  - &step_setup_remote_docker
+      setup_remote_docker
+
+jobs:
+  build:
+    <<: *container_config
+    parallelism: 1
+    steps:
+      - attach_workspace:
+          at: /workspace
+      - checkout
+      - *step_setup_remote_docker
+      - run: .circleci/build.sh
+      - run: .circleci/test.sh
+      - run:
+          name: Process artifacts
+          command: .circleci/process-artifacts.sh
+          when: always
+      - store_artifacts:
+          path: /tmp/artifacts
+          when: always
+
+workflows:
+  version: 2
+  main:
+    jobs:
+      - build
diff --git a/.circleci/process-artifacts.sh b/.circleci/process-artifacts.sh
new file mode 100755
index 00000000..8fbc3d20
--- /dev/null
+++ b/.circleci/process-artifacts.sh
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+##
+# Process test artifacts.
+#
+set -e
+
+# Create screenshots directory in case it was not created before. This is to
+# avoid this script to fail when copying artifacts.
+ahoy cli "mkdir -p /app/test/screenshots"
+
+# Copy from the app container to the build host for storage.
+mkdir -p /tmp/artifacts/behave/screenshots
+docker cp "$(docker-compose ps -q ckan)":/app/test/screenshots /tmp/artifacts/behave
diff --git a/.circleci/test.sh b/.circleci/test.sh
new file mode 100755
index 00000000..e96dfb22
--- /dev/null
+++ b/.circleci/test.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+##
+# Run tests in CI.
+#
+set -e
+
+echo "==> Lint code"
+ahoy lint
+
+echo "==> Run Unit tests"
+ahoy test-unit
+
+echo "==> Run BDD tests"
+ahoy test-bdd
diff --git a/.docker/Dockerfile.ckan b/.docker/Dockerfile.ckan
new file mode 100644
index 00000000..260bcd24
--- /dev/null
+++ b/.docker/Dockerfile.ckan
@@ -0,0 +1,43 @@
+FROM amazeeio/python:2.7-ckan-v0.23.1
+
+WORKDIR /app
+
+ARG SITE_URL
+ENV SITE_URL="${SITE_URL}"
+
+ENV DOCKERIZE_VERSION v0.6.1
+RUN wget https://github.com/jwilder/dockerize/releases/download/${DOCKERIZE_VERSION}/dockerize-alpine-linux-amd64-${DOCKERIZE_VERSION}.tar.gz \
+    && tar -C /usr/local/bin -xzvf dockerize-alpine-linux-amd64-${DOCKERIZE_VERSION}.tar.gz \
+    && rm dockerize-alpine-linux-amd64-${DOCKERIZE_VERSION}.tar.gz
+
+# Install CKAN.
+ENV CKAN_VERSION 2.8.3
+RUN . /app/ckan/default/bin/activate \
+    && cd /app/ckan/default \
+    && pip install setuptools==36.1 \
+    && pip install -e "git+https://github.com/ckan/ckan.git@ckan-${CKAN_VERSION}#egg=ckan" \
+    && sed -i "s/psycopg2==2.4.5/psycopg2==2.7.7/g" "/app/ckan/default/src/ckan/requirements.txt" \
+    && pip install -r "/app/ckan/default/src/ckan/requirements.txt" \
+    && ln -s "/app/ckan/default/src/ckan/who.ini" "/app/ckan/default/who.ini" \
+    && deactivate \
+    && ln -s /app/ckan /usr/lib/ckan
+
+COPY .docker/test.ini /app/ckan/default/production.ini
+
+COPY .docker/scripts /app/scripts
+
+RUN fix-permissions /app/ckan \
+    && chmod +x /app/scripts/create-test-data.sh \
+    && chmod +x /app/scripts/init.sh \
+    && chmod +x /app/scripts/init-ext.sh \
+    && chmod +x /app/scripts/serve.sh
+
+# Add current extension and files.
+COPY ckanext /app/ckanext
+COPY requirements.txt requirements-dev.txt setup.cfg setup.py /app/
+
+# Init current extension.
+RUN /app/scripts/init-ext.sh
+
+ENTRYPOINT ["/sbin/tini", "--", "/lagoon/entrypoints.sh"]
+CMD ["/app/scripts/serve.sh"]
diff --git a/.docker/Dockerfile.solr b/.docker/Dockerfile.solr
new file mode 100644
index 00000000..2c0ef416
--- /dev/null
+++ b/.docker/Dockerfile.solr
@@ -0,0 +1,3 @@
+FROM amazeeio/solr:6.6-ckan-v0.23.1
+
+# @todo: Support customisations to solr configuration.
diff --git a/.docker/scripts/create-test-data.sh b/.docker/scripts/create-test-data.sh
new file mode 100644
index 00000000..9ea0ffaa
--- /dev/null
+++ b/.docker/scripts/create-test-data.sh
@@ -0,0 +1,127 @@
+
+#!/usr/bin/env sh
+##
+# Create some example content for extension BDD tests.
+#
+set -e
+
+CKAN_ACTION_URL=http://ckan:3000/api/action
+CKAN_INI_FILE=/app/ckan/default/production.ini
+
+. /app/ckan/default/bin/activate \
+    && cd /app/ckan/default/src/ckan
+
+# We know the "admin" sysadmin account exists, so we'll use her API KEY to create further data
+API_KEY=$(paster --plugin=ckan user admin -c ${CKAN_INI_FILE} | tr -d '\n' | sed -r 's/^(.*)apikey=(\S*)(.*)/\2/')
+
+##
+# BEGIN: Create a test organisation with test users for admin, editor and member
+#
+TEST_ORG_NAME=test
+TEST_ORG_TITLE="Test"
+
+echo "Creating test users for ${TEST_ORG_TITLE} Organisation:"
+
+paster --plugin=ckan user add ckan_user email=ckan_user@localhost password=password -c ${CKAN_INI_FILE}
+paster --plugin=ckan user add test_org_admin email=test_org_admin@localhost password=password -c ${CKAN_INI_FILE}
+paster --plugin=ckan user add test_org_editor email=test_org_editor@localhost password=password -c ${CKAN_INI_FILE}
+paster --plugin=ckan user add test_org_member email=test_org_member@localhost password=password -c ${CKAN_INI_FILE}
+
+echo "Creating ${TEST_ORG_TITLE} Organisation:"
+
+TEST_ORG=$( \
+    wget -O- --header="Authorization: ${API_KEY}" \
+    --post-data "name=${TEST_ORG_NAME}&title=${TEST_ORG_TITLE}" \
+    ${CKAN_ACTION_URL}/organization_create
+)
+
+TEST_ORG_ID=$(echo $TEST_ORG | sed -r 's/^(.*)"id": "(.*)",(.*)/\2/')
+
+echo "Assigning test users to ${TEST_ORG_TITLE} Organisation:"
+
+wget -O- --header="Authorization: ${API_KEY}" \
+    --post-data "id=${TEST_ORG_ID}&object=test_org_admin&object_type=user&capacity=admin" \
+    ${CKAN_ACTION_URL}/member_create
+
+wget -O- --header="Authorization: ${API_KEY}" \
+    --post-data "id=${TEST_ORG_ID}&object=test_org_editor&object_type=user&capacity=editor" \
+    ${CKAN_ACTION_URL}/member_create
+
+wget -O- --header="Authorization: ${API_KEY}" \
+    --post-data "id=${TEST_ORG_ID}&object=test_org_member&object_type=user&capacity=member" \
+    ${CKAN_ACTION_URL}/member_create
+##
+# END.
+#
+
+##
+# BEGIN: Create a Data Request organisation with test users for admin, editor and member and default data requests
+#
+# Data Requests requires a specific organisation to exist in order to create DRs for Data.Qld
+DR_ORG_NAME=open-data-administration-data-requests
+DR_ORG_TITLE="Open Data Administration (data requests)"
+
+echo "Creating test users for ${DR_ORG_TITLE} Organisation:"
+
+paster --plugin=ckan user add dr_admin email=dr_admin@localhost password=password -c ${CKAN_INI_FILE}
+paster --plugin=ckan user add dr_editor email=dr_editor@localhost password=password -c ${CKAN_INI_FILE}
+paster --plugin=ckan user add dr_member email=dr_member@localhost password=password -c ${CKAN_INI_FILE}
+
+echo "Creating ${DR_ORG_TITLE} Organisation:"
+
+DR_ORG=$( \
+    wget -O- --header="Authorization: ${API_KEY}" \
+    --post-data "name=${DR_ORG_NAME}&title=${DR_ORG_TITLE}" \
+    ${CKAN_ACTION_URL}/organization_create
+)
+
+DR_ORG_ID=$(echo $DR_ORG | sed -r 's/^(.*)"id": "(.*)",(.*)/\2/')
+
+echo "Assigning test users to ${DR_ORG_TITLE} Organisation:"
+
+wget -O- --header="Authorization: ${API_KEY}" \
+    --post-data "id=${DR_ORG_ID}&object=dr_admin&object_type=user&capacity=admin" \
+    ${CKAN_ACTION_URL}/member_create
+
+wget -O- --header="Authorization: ${API_KEY}" \
+    --post-data "id=${DR_ORG_ID}&object=dr_editor&object_type=user&capacity=editor" \
+    ${CKAN_ACTION_URL}/member_create
+
+wget -O- --header="Authorization: ${API_KEY}" \
+    --post-data "id=${DR_ORG_ID}&object=dr_member&object_type=user&capacity=member" \
+    ${CKAN_ACTION_URL}/member_create
+
+
+echo "Creating test Data Request:"
+
+wget -O- --header="Authorization: ${API_KEY}" \
+    --post-data "title=Test Request&description=This is an example&organization_id=${DR_ORG_ID}" \
+    ${CKAN_ACTION_URL}/create_datarequest
+
+echo "Creating closed Data Request:"
+
+Closed_DR=$( \
+    wget -O- \
+    --header="Authorization: ${API_KEY}" \
+    --post-data "title=Closed Request&description=This is an example&organization_id=${DR_ORG_ID}" \
+    ${CKAN_ACTION_URL}/create_datarequest \
+)
+
+echo $Closed_DR
+
+# # Get the ID of that newly created Data Request
+CLOSE_DR_ID=$(echo $Closed_DR | tr -d '\n' | sed -r 's/^(.*)}, "id": "([a-z0-9\-]*)",(.*)/\2/')
+echo $CLOSE_DR_ID
+
+echo "Closing Data Request:"
+
+wget -O- --header="Authorization: ${API_KEY}" \
+    --post-data "id=${CLOSE_DR_ID}" \
+    ${CKAN_ACTION_URL}/close_datarequest
+
+##
+# END.
+#
+
+
+deactivate
\ No newline at end of file
diff --git a/.docker/scripts/doctor.sh b/.docker/scripts/doctor.sh
new file mode 100755
index 00000000..5bcf065c
--- /dev/null
+++ b/.docker/scripts/doctor.sh
@@ -0,0 +1,202 @@
+#!/usr/bin/env bash
+#
+# Check Drupal-Dev project requirements.
+#
+set -e
+
+DOCTOR_CHECK_TOOLS="${DOCTOR_CHECK_TOOLS:-1}"
+DOCTOR_CHECK_PORT="${DOCTOR_CHECK_PORT:-0}"
+DOCTOR_CHECK_PYGMY="${DOCTOR_CHECK_PYGMY:-1}"
+DOCTOR_CHECK_CLI="${DOCTOR_CHECK_CLI:-1}"
+DOCTOR_CHECK_SSH="${DOCTOR_CHECK_SSH:-0}"
+DOCTOR_CHECK_WEBSERVER="${DOCTOR_CHECK_WEBSERVER:-1}"
+DOCTOR_CHECK_BOOTSTRAP="${DOCTOR_CHECK_BOOTSTRAP:-1}"
+
+APP_PORT="${APP_PORT:-80}"
+CLI="${CLI:-cli}"
+LAGOON_LOCALDEV_URL="${LAGOON_LOCALDEV_URL:-http://your-site.docker.amazee.io/}"
+SSH_KEY_FILE="${SSH_KEY_FILE:-$HOME/.ssh/id_rsa}"
+DATAROOT="${DATAROOT:-.data}"
+
+#-------------------------------------------------------------------------------
+#                    DO NOT CHANGE ANYTHING BELOW THIS LINE
+#-------------------------------------------------------------------------------
+
+
+#
+# Main entry point.
+#
+main() {
+  status "Checking project requirements"
+
+  if [ "${DOCTOR_CHECK_TOOLS}" == "1" ]; then
+    [ "$(command_exists docker)" == "1" ] && error "Please install Docker (https://www.docker.com/get-started)" && exit 1
+    [ "$(command_exists docker-compose)" == "1" ] && error "Please install docker-compose (https://docs.docker.com/compose/install/)" && exit 1
+    [ "$(command_exists composer)" == "1" ] && error "Please install Composer (https://getcomposer.org/)" && exit 1
+    [ "$(command_exists pygmy)" == "1" ] && error "Please install Pygmy (https://pygmy.readthedocs.io/)" && exit 1
+    [ "$(command_exists ahoy)" == "1" ] && error "Please install Ahoy (https://ahoy-cli.readthedocs.io/)" && exit 1
+    success "All required tools are present"
+  fi
+
+  if [ "${DOCTOR_CHECK_PORT}" == "1" ]; then
+    if ! lsof -i :3000 | grep LISTEN | grep -q om.docke; then
+      error "Port 3000 is occupied by a service other than Docker. Stop this service and run 'pygmy up'"
+    fi
+    success "Port 3000 is available"
+  fi
+
+  if [ "${DOCTOR_CHECK_PYGMY}" == "1" ]; then
+    if ! pygmy status > /dev/null 2>&1; then
+      error "pygmy is not running. Run 'pygmy up' to start pygmy."
+      exit 1
+    fi
+    success "Pygmy is running"
+  fi
+
+  # Check that the stack is running.
+  if [ "${DOCTOR_CHECK_CLI}" == "1" ]; then
+    if ! docker ps -q --no-trunc | grep "$(docker-compose ps -q ckan)" > /dev/null 2>&1; then
+      error "CLI container is not running. Run 'ahoy up'."
+      exit 1
+    fi
+    success "CLI container is running"
+  fi
+
+  if [ "${DOCTOR_CHECK_SSH}" == "1" ]; then
+    # SSH key injection is required to access Lagoon services from within
+    # containers. For example, to connect to production environment to run
+    # drush script.
+    # Pygmy makes this possible in the following way:
+    # 1. Pygmy starts `amazeeio/ssh-agent` container with a volume `/tmp/amazeeio_ssh-agent`
+    # 2. Pygmy adds a default SSH key from the host into this volume.
+    # 3. `docker-compose.yml` should have volume inclusion specified for CLI container:
+    #    ```
+    #    volumes_from:
+    #      - container:amazeeio-ssh-agent
+    #    ```
+    # 4. When CLI container starts, the volume is mounted and an entrypoint script
+    #    adds SHH key into agent.
+    #    @see https://github.com/amazeeio/lagoon/blob/master/images/php/cli/10-ssh-agent.sh
+    #
+    #  Running `ssh-add -L` within CLI container should show that the SSH key
+    #  is correctly loaded.
+    #
+    # As rule of a thumb, one must restart the CLI container after restarting
+    # Pygmy ONLY if SSH key was not loaded in pygmy before the stack starts.
+    # No need to restart CLI container if key was added, but pygmy was
+    # restarted - the volume mount will retain and the key will still be
+    # available in CLI container.
+
+    # Check that the key is injected into pygmy ssh-agent container.
+    if ! pygmy status 2>&1 | grep -q "${SSH_KEY_FILE}"; then
+      error "SSH key is not added to pygmy. Run 'pygmy stop && pygmy start' and then 'ahoy up -- --build'."
+      exit 1
+    fi
+
+    # Check that the volume is mounted into CLI container.
+    if ! docker exec -i "$(docker-compose ps -q ckan)" sh -c "grep \"^/dev\" /etc/mtab|grep -q /tmp/amazeeio_ssh-agent"; then
+      error "SSH key is added to Pygmy, but the volume is not mounted into container. Make sure that your your \"docker-compose.yml\" has the following lines:"
+      error "volumes_from:"
+      error "  - container:amazeeio-ssh-agent"
+      error "After adding these lines, run 'ahoy up -- --build'"
+      exit 1
+    fi
+
+    # Check that ssh key is available in the container.
+    if ! docker exec -i "$(docker-compose ps -q ckan)" bash -c "ssh-add -L | grep -q 'ssh-rsa'" ; then
+      error "SSH key was not added into container. Run 'ahoy up -- --build'."
+      exit 1
+    fi
+
+    success "SSH key is available within CLI container"
+  fi
+
+
+  if [ "${DOCTOR_CHECK_WEBSERVER}" == "1" ]; then
+    host_app_port="$(docker port $(docker-compose ps -q ckan) 3000 | cut -d : -f 2)"
+    if ! curl -L -s -o /dev/null -w "%{http_code}" "${LAGOON_LOCALDEV_URL}:${host_app_port}" | grep -q 200; then
+      error "Web server is not accessible at ${LAGOON_LOCALDEV_URL}:${host_app_port}"
+      exit 1
+    fi
+    success "Web server is running and accessible at ${LAGOON_LOCALDEV_URL}:${host_app_port}"
+  fi
+
+  if [ "${DOCTOR_CHECK_BOOTSTRAP}" == "1" ]; then
+    host_app_port="$(docker port $(docker-compose ps -q ckan) 3000 | cut -d : -f 2)"
+    if ! curl -L -s -N "${LAGOON_LOCALDEV_URL}:${host_app_port}" | grep -q -i "meta name=\"generator\" content=\"ckan"; then
+      error "Website is running, but cannot be bootstrapped. Try pulling latest container images with 'ahoy pull'"
+      exit 1
+    fi
+    success "Successfully bootstrapped website at ${LAGOON_LOCALDEV_URL}:${host_app_port}"
+  fi
+
+  status "All required checks have passed"
+}
+
+#
+# Check that command exists.
+#
+command_exists() {
+  local cmd=$1
+  command -v "${cmd}" | grep -ohq "${cmd}"
+  local res=$?
+
+  # Try homebrew lookup, if brew is available.
+  if command -v "brew" | grep -ohq "brew" && [ "$res" == "1" ] ; then
+    brew --prefix "${cmd}" > /dev/null
+    res=$?
+  fi
+
+  echo ${res}
+}
+
+#
+# Status echo.
+#
+status() {
+  cecho blue "✚ $1";
+}
+
+#
+# Success echo.
+#
+success() {
+  cecho green "  ✓ $1";
+}
+
+#
+# Error echo.
+#
+error() {
+  cecho red "  ✘ $1";
+  exit 1
+}
+
+#
+# Colored echo.
+#
+cecho() {
+  local prefix="\033["
+  local input_color=$1
+  local message="$2"
+
+  local color=""
+  case "$input_color" in
+    black  | bk) color="${prefix}0;30m";;
+    red    |  r) color="${prefix}1;31m";;
+    green  |  g) color="${prefix}1;32m";;
+    yellow |  y) color="${prefix}1;33m";;
+    blue   |  b) color="${prefix}1;34m";;
+    purple |  p) color="${prefix}1;35m";;
+    cyan   |  c) color="${prefix}1;36m";;
+    gray   | gr) color="${prefix}0;37m";;
+    *) message="$1"
+  esac
+
+  # Format message with color codes, but only if a correct color was provided.
+  [ -n "$color" ] && message="${color}${message}${prefix}0m"
+
+  echo -e "$message"
+}
+
+main "$@"
diff --git a/.docker/scripts/init-ext.sh b/.docker/scripts/init-ext.sh
new file mode 100755
index 00000000..8354ddfe
--- /dev/null
+++ b/.docker/scripts/init-ext.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env sh
+##
+# Install current extension.
+#
+set -e
+
+. /app/ckan/default/bin/activate
+
+pip install -r "/app/requirements.txt"
+pip install -r "/app/requirements-dev.txt"
+python setup.py develop
+
+# Validate that the extension was installed correctly.
+if ! pip list | grep ckanext-datarequests > /dev/null; then echo "Unable to find the extension in the list"; exit 1; fi
+
+deactivate
diff --git a/.docker/scripts/init.sh b/.docker/scripts/init.sh
new file mode 100755
index 00000000..4c98dba8
--- /dev/null
+++ b/.docker/scripts/init.sh
@@ -0,0 +1,22 @@
+#!/usr/bin/env sh
+##
+# Initialise CKAN instance.
+#
+set -e
+
+CKAN_USER_NAME="${CKAN_USER_NAME:-admin}"
+CKAN_USER_PASSWORD="${CKAN_USER_PASSWORD:-password}"
+CKAN_USER_EMAIL="${CKAN_USER_EMAIL:-admin@localhost}"
+
+. /app/ckan/default/bin/activate \
+  && cd /app/ckan/default/src/ckan \
+  && paster db clean -c /app/ckan/default/production.ini \
+  && paster db init -c /app/ckan/default/production.ini \
+  && paster --plugin=ckan user add "${CKAN_USER_NAME}" email="${CKAN_USER_EMAIL}" password="${CKAN_USER_PASSWORD}" -c /app/ckan/default/production.ini \
+  && paster --plugin=ckan sysadmin add "${CKAN_USER_NAME}" -c /app/ckan/default/production.ini
+
+# Initialise the Comments database tables
+paster --plugin=ckanext-ytp-comments initdb --config=/app/ckan/default/production.ini
+
+# Create some base test data
+. /app/scripts/create-test-data.sh
\ No newline at end of file
diff --git a/.docker/scripts/serve.sh b/.docker/scripts/serve.sh
new file mode 100755
index 00000000..6880ed6d
--- /dev/null
+++ b/.docker/scripts/serve.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env sh
+set -e
+
+dockerize -wait tcp://postgres:5432 -timeout 1m
+dockerize -wait tcp://solr:8983 -timeout 1m
+
+sed -i "s@SITE_URL@${SITE_URL}@g" /app/ckan/default/production.ini
+
+. /app/ckan/default/bin/activate \
+    && paster serve /app/ckan/default/production.ini
diff --git a/.docker/test.ini b/.docker/test.ini
new file mode 100644
index 00000000..52c60fd6
--- /dev/null
+++ b/.docker/test.ini
@@ -0,0 +1,216 @@
+#
+# CKAN - Pylons configuration
+#
+# These are some of the configuration options available for your CKAN
+# instance. Check the documentation in 'doc/configuration.rst' or at the
+# following URL for a description of what they do and the full list of
+# available options:
+#
+# http://docs.ckan.org/en/latest/maintaining/configuration.html
+#
+# The %(here)s variable will be replaced with the parent directory of this file
+#
+
+[DEFAULT]
+debug = false
+smtp_server = localhost
+error_email_from = paste@localhost
+
+[server:main]
+use = egg:Paste#http
+host = 0.0.0.0
+port = 3000
+
+[app:main]
+use = egg:ckan
+full_stack = true
+cache_dir = /tmp/%(ckan.site_id)s/
+
+# This is the secret token that the beaker library uses to hash the cookie sent
+# to the client. `paster make-config` generates a unique value for this each
+# time it generates a config file.
+beaker.session.secret = bSmgPpaxg2M+ZRes3u1TXwIcE
+
+# `paster make-config` generates a unique value for this each time it generates
+# a config file.
+app_instance_uuid = 6e3daf8e-1c6b-443b-911f-c7ab4c5f9605
+
+who.config_file = %(here)s/who.ini
+who.log_level = warning
+who.log_file = %(cache_dir)s/who_log.ini
+
+## Database Settings
+sqlalchemy.url = postgresql://ckan:ckan@postgres/ckan?sslmode=disable
+
+ckan.datastore.write_url = postgresql://ckan:ckan@postgres-datastore/ckan?sslmode=disable
+ckan.datastore.read_url = postgresql://ckan_datastore:ckan@postgres-datastore/ckan?sslmode=disable
+
+# PostgreSQL' full-text search parameters
+ckan.datastore.default_fts_lang = english
+ckan.datastore.default_fts_index_method = gist
+
+## Site Settings.
+ckan.site_url = http://ckan:3000/
+
+## Authorization Settings
+
+ckan.auth.anon_create_dataset = false
+ckan.auth.create_unowned_dataset = false
+ckan.auth.create_dataset_if_not_in_organization = false
+ckan.auth.user_create_groups = false
+ckan.auth.user_create_organizations = false
+ckan.auth.user_delete_groups = true
+ckan.auth.user_delete_organizations = true
+ckan.auth.create_user_via_api = false
+ckan.auth.create_user_via_web = true
+ckan.auth.roles_that_cascade_to_sub_groups = admin
+
+
+## Search Settings
+
+ckan.site_id = default
+solr_url = http://solr:8983/solr/ckan
+
+
+## Redis Settings
+
+# URL to your Redis instance, including the database to be used.
+ckan.redis.url = redis://redis:6379
+
+
+## CORS Settings
+
+# If cors.origin_allow_all is true, all origins are allowed.
+# If false, the cors.origin_whitelist is used.
+# ckan.cors.origin_allow_all = true
+# cors.origin_whitelist is a space separated list of allowed domains.
+# ckan.cors.origin_whitelist = http://example1.com http://example2.com
+
+
+## Plugins Settings
+
+# Note: Add ``datastore`` to enable the CKAN DataStore
+#       Add ``datapusher`` to enable DataPusher
+#       Add ``resource_proxy`` to enable resorce proxying and get around the
+#       same origin policy
+# @todo:setup Cleanup the list to use only required plugins.
+ckan.plugins = stats text_view image_view recline_view datastore data_qld_theme datarequests data_qld ytp_comments
+
+# Define which views should be created by default
+# (plugins must be loaded in ckan.plugins)
+ckan.views.default_views = image_view text_view recline_view
+
+# Customize which text formats the text_view plugin will show
+#ckan.preview.json_formats = json
+#ckan.preview.xml_formats = xml rdf rdf+xml owl+xml atom rss
+#ckan.preview.text_formats = text plain text/plain
+
+# Customize which image formats the image_view plugin will show
+#ckan.preview.image_formats = png jpeg jpg gif
+
+## Internationalisation Settings
+ckan.locale_default = en
+ckan.locale_order = en pt_BR ja it cs_CZ ca es fr el sv sr sr@latin no sk fi ru de pl nl bg ko_KR hu sa sl lv
+ckan.locales_offered =
+ckan.locales_filtered_out = en_GB
+
+## Feeds Settings
+
+ckan.feeds.authority_name =
+ckan.feeds.date =
+ckan.feeds.author_name =
+ckan.feeds.author_link =
+
+## Storage Settings
+
+ckan.storage_path = /app/filestore
+#ckan.max_resource_size = 10
+#ckan.max_image_size = 2
+
+## Datapusher settings
+
+# Make sure you have set up the DataStore
+
+#ckan.datapusher.formats = csv xls xlsx tsv application/csv application/vnd.ms-excel application/vnd.openxmlformats-officedocument.spreadsheetml.sheet
+#ckan.datapusher.url = http://127.0.0.1:8800/
+#ckan.datapusher.assume_task_stale_after = 3600
+
+# Resource Proxy settings
+# Preview size limit, default: 1MB
+#ckan.resource_proxy.max_file_size = 1048576
+# Size of chunks to read/write.
+#ckan.resource_proxy.chunk_size = 4096
+
+## Activity Streams Settings
+
+#ckan.activity_streams_enabled = true
+#ckan.activity_list_limit = 31
+#ckan.activity_streams_email_notifications = true
+#ckan.email_notifications_since = 2 days
+ckan.hide_activity_from_users = %(ckan.site_id)s
+
+
+## Email settings
+# If 'smtp.test_server' is configured we assume we're running tests,
+# and don't use the smtp.server, starttls, user, password etc. options.
+smtp.test_server = localhost:8025
+smtp.mail_from = info@test.ckan.net
+
+## Harvester settings
+ckan.harvest.mq.type = redis
+ckan.harvest.mq.hostname = redis
+ckan.harvest.mq.port = 6379
+ckan.harvest.mq.redis_db = 0
+
+## ckanext-datarequests settings
+# Enable or disable the comments system by setting up the ckan.datarequests.comments property in the configuration file (by default, the comments system is enabled).
+ckan.datarequests.comments = true
+# Enable or disable a badge to show the number of data requests in the menu by setting up the ckan.datarequests.show_datarequests_badge property in the configuration file (by default, the badge is not shown).
+ckan.datarequests.show_datarequests_badge = true
+# Enable or disable description as a required field on data request forms
+ckan.datarequests.description_required = true
+# Default organisation used for new data requests
+ckan.datarequests.default_organisation = open-data-administration-data-requests
+
+# YTP Comments
+ckan.comments.moderation = False
+ckan.comments.moderation.first_only = False
+ckan.comments.threaded_comments = True
+ckan.comments.users_can_edit = False
+ckan.comments.check_for_profanity = True
+ckan.comments.bad_words_file = /app/ckan/default/src/ckanext-ytp-comments/ckanext/ytp/comments/bad_words.txt
+
+## Logging configuration
+[loggers]
+keys = root, ckan, ckanext
+
+[handlers]
+keys = console
+
+[formatters]
+keys = generic
+
+[logger_root]
+level = WARNING
+handlers = console
+
+[logger_ckan]
+level = INFO
+handlers = console
+qualname = ckan
+propagate = 0
+
+[logger_ckanext]
+level = DEBUG
+handlers = console
+qualname = ckanext
+propagate = 0
+
+[handler_console]
+class = StreamHandler
+args = (sys.stderr,)
+level = NOTSET
+formatter = generic
+
+[formatter_generic]
+format = %(asctime)s %(levelname)-5.5s [%(name)s] %(message)s
diff --git a/.env b/.env
new file mode 100644
index 00000000..a209c7f7
--- /dev/null
+++ b/.env
@@ -0,0 +1,25 @@
+##
+# Project environment variables.
+#
+# It is used by Ahoy and other scripts to read default values.
+#
+# The values must be scalar (cannot be another variable).
+#
+# You may also create .env.local file to override any values locally (it is
+# excluded from git).
+#
+
+# Project name.
+PROJECT="ckanext-datarequests"
+
+# Docker Compose project name. All containers will have this name.
+COMPOSE_PROJECT_NAME="ckanext-datarequests"
+
+# Flag to allow code linting failures.
+ALLOW_LINT_FAIL=1
+
+# Flag to allow unit tests failures.
+ALLOW_UNIT_FAIL=0
+
+# Flag to allow BDD tests failures.
+ALLOW_BDD_FAIL=0
diff --git a/.flake8 b/.flake8
new file mode 100644
index 00000000..f443751e
--- /dev/null
+++ b/.flake8
@@ -0,0 +1,19 @@
+[flake8]
+# @see https://flake8.pycqa.org/en/latest/user/configuration.html?highlight=.flake8
+
+exclude =
+    ckan
+    scripts
+
+# Extended output format.
+format = pylint
+
+# Show the source of errors.
+show_source = True
+
+max-complexity = 10
+
+# List ignore rules one per line.
+ignore =
+    E501
+    C901
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..aee1b377
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,8 @@
+# Ignore files for distribution archives.
+/.ahoy.yml           export-ignore
+/.circleci           export-ignore
+/.docker             export-ignore
+/.env                export-ignore
+/.gitatributes       export-ignore
+/docker-compose.yml  export-ignore
+/test                export-ignore
diff --git a/.gitignore b/.gitignore
index 55c0f302..d093c4b3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,7 @@
+.ropeproject
+node_modules
+bower_components
+
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]
@@ -5,24 +9,13 @@ __pycache__/
 # C extensions
 *.so
 
-### OSX Stuff
-*.DS_Store
-.AppleDouble
-.LSOverride
-
 # Distribution / packaging
 .Python
 env/
 build/
 develop-eggs/
 dist/
-downloads/
-eggs/
-lib/
-lib64/
-parts/
 sdist/
-var/
 *.egg-info/
 .installed.cfg
 *.egg
@@ -45,15 +38,8 @@ htmlcov/
 nosetests.xml
 coverage.xml
 
-# Translations
-*.mo
-*.pot
-
-# Django stuff:
-*.log
-
 # Sphinx documentation
 docs/_build/
-
-# PyBuilder
-target/
+.env.local
+/test/screenshots
+!/test/screenshots/.gitkeep
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index cf7ef23a..00000000
--- a/.travis.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-sudo: required
-language: python
-group: deprecated-2017Q4
-python:
-    - "2.7"
-env:
-    - CKANVERSION=2.5.6 POSTGISVERSION=2
-    - CKANVERSION=2.6.3 POSTGISVERSION=2
-    - CKANVERSION=2.7.0 POSTGISVERSION=2
-    - CKANVERSION=2.8.1 POSTGISVERSION=2
-services:
-    - redis-server
-    - postgresql
-addons:
-    firefox: "46.0"
-install:
-    - bash bin/travis-build.bash
-before_script:
-  - "export DISPLAY=:99.0"
-  - "sh -e /etc/init.d/xvfb start"
-  - sleep 3 # give xvfb some time to start
-script: 
-  - sh bin/travis-run.sh
-after_success: coveralls
-branches:
-  only:
-    - develop
diff --git a/README.md b/README.md
index 4668be56..5c2b5a2d 100644
--- a/README.md
+++ b/README.md
@@ -1,292 +1,81 @@
-# CKAN Data Requests [![Build Status](https://travis-ci.org/conwetlab/ckanext-datarequests.svg?branch=develop)](https://travis-ci.org/conwetlab/ckanext-datarequests) [![Coverage Status](https://coveralls.io/repos/github/conwetlab/ckanext-datarequests/badge.svg?branch=develop)](https://coveralls.io/github/conwetlab/ckanext-datarequests?branch=develop)
+# ckanext-datarequests
+A custom CKAN extension for Data.Qld
 
-CKAN extension that allows users to ask for datasets that are not already published in the CKAN instance. In this way we can set up a Data Market, not only with data supplies but also with data demands.
+[![CircleCI](https://circleci.com/gh/qld-gov-au/ckanext-datarequests/tree/develop.svg?style=shield)](https://circleci.com/gh/qld-gov-au/ckanext-datarequests/tree/develop)
 
-## How it works
+## Local environment setup
+- Make sure that you have latest versions of all required software installed:
+  - [Docker](https://www.docker.com/)
+  - [Pygmy](https://pygmy.readthedocs.io/)
+  - [Ahoy](https://github.com/ahoy-cli/ahoy)
+- Make sure that all local web development services are shut down (Apache/Nginx, Mysql, MAMP etc).
+- Checkout project repository (in one of the [supported Docker directories](https://docs.docker.com/docker-for-mac/osxfs/#access-control)).  
+- `pygmy up`
+- `ahoy build`
 
-You have two ways for creating, updating, deleting, viewing and closing a datarequest: you can use the graphical interface or the programatic API.
+Use `admin`/`password` to login to CKAN.
 
-### User Interface
-If you prefer to use the graphical interface, you should click on the "Data Requests" section that will appear in the header of your CKAN instance. In this section you'll be able to view the current data requests. In addition, there will be a button that will allow you to create a new data request. In the form that will appear, you will have to introduce the following information:
+## Available `ahoy` commands
+Run each command as `ahoy <command>`.
+  ```  
+   build        Build or rebuild project.
+   clean        Remove containers and all build files.
+   cli          Start a shell inside CLI container or run a command.
+   doctor       Find problems with current project setup.
+   down         Stop Docker containers and remove container, images, volumes and networks.
+   flush-redis  Flush Redis cache.
+   info         Print information about this project.
+   install-site Install a site.
+   lint         Lint code.
+   logs         Show Docker logs.
+   pull         Pull latest docker images.
+   reset        Reset environment: remove containers, all build, manually created and Drupal-Dev files.
+   restart      Restart all stopped and running Docker containers.
+   start        Start existing Docker containers.
+   stop         Stop running Docker containers.
+   test-bdd     Run BDD tests.
+   test-unit    Run unit tests.
+   up           Build and start Docker containers.
+  ```
 
-* **Title**: a title for your data request
-* **Description**: a long description for your data request. You should include as much details as you can in order to allow others to understand you needs and upload a dataset that fulfil your requeriments.
-* **Organization**: in some cases, you want to ask specific data to an specific organization. If you are in such situation, you should complete this field.
+## Coding standards
+Python code linting uses [flake8](https://github.com/PyCQA/flake8) with configuration captured in `.flake8` file.   
 
-Once that you have created your data request, you can view it by clicking on the link provided when you created it. When you are the owner of a data request, you will also be able to:
-* **Close the data request** if you consider that there is a new dataset that fulfil your needs
-* **Update the data request** if you can to add/remove some information
-* **Delete the data request** if you do not want it to be available any more
+Set `ALLOW_LINT_FAIL=1` in `.env` to allow lint failures.
 
-### API
-On the other hand, you can also use the API. To access this API, you should POST the following URL (as you do for other actions):
+## Nose tests
+`ahoy test-unit`
 
-``http[s]://[CKAN_HOST]:[CKAN_PORT]/api/action/[ACTION_NAME]``
+Set `ALLOW_UNIT_FAIL=1` in `.env` to allow unit test failures.
 
-Here you have a brief description of all the implemented actions:
+## Behavioral tests
+`ahoy test-bdd`
 
-#### `create_datarequest(context, data_dict)`
-Action to create a new data request. This function checks the access rights of the user before creating the data request. If the user is not allowed, a `NotAuthorized` exception will be risen.
+Set `ALLOW_BDD_FAIL=1` in `.env` to allow BDD test failures.
 
-In addition, you should note that the parameters will be checked and an exception (`ValidationError`) will be risen if some of these parameters are not valid.
+### How it works
+We are using [Behave](https://github.com/behave/behave) BDD _framework_ with additional _step definitions_ provided by [Behaving](https://github.com/ggozad/behaving) library.
 
-##### Parameters (included in `data_dict`):
-* **`title`** (string): the title of the data request
-* **`description`** (string): a brief description for your data request
-* **`organization_id`** (string): The ID of the organization you want to asign the data request (optional).
+Custom steps described in `test/features/steps/steps.py`.
 
-##### Returns:
-A dict with the data request (`id`, `user_id`, `title`, `description`,`organization_id`, `open_time`, `accepted_dataset`, `close_time`, `closed`, `followers`).
+Test scenarios located in `test/features/*.feature` files.
 
+Test environment configuration is located in `test/features/environment.py` and is setup to connect to a remote Chrome
+instance running in a separate Docker container. 
 
-#### `show_datarequest(context, data_dict)`
-Action to retrieve the information of a data request. The only required parameter is the `id` of the data request. A `NotFound` exception will be risen if the `id` is not found.
+During the test, Behaving passes connection information to [Splinter](https://github.com/cobrateam/splinter) which
+instantiates WebDriver object and establishes connection with Chrome instance. All further communications with Chrome 
+are handled through this driver, but in a developer-friendly way.
 
-Access rights will be checked before returning the information and an exception will be risen (`NotAuthorized`) if the user is not authorized.
+For a list of supported step-definitions, see https://github.com/ggozad/behaving#behavingweb-supported-matcherssteps.
 
-##### Parameters (included in `data_dict`):
-* **`id`** (string): the ID of the datarequest to be returned.
+## Automated builds (Continuous Integration)
+In software engineering, continuous integration (CI) is the practice of merging all developer working copies to a shared mainline several times a day. 
+Before feature changes can be merged into a shared mainline, a complete build must run and pass all tests on CI server.
 
-##### Returns:
-A dict with the data request (`id`, `user_id`, `title`, `description`,`organization_id`, `open_time`, `accepted_dataset`, `close_time`, `closed`, `followers`).
+This project uses [Circle CI](https://circleci.com/) as a CI server: it imports production backups into fully built codebase and runs code linting and tests. When tests pass, a deployment process is triggered for nominated branches (usually, `master` and `develop`).
 
+Add `[skip ci]` to the commit subject to skip CI build. Useful for documentation changes.
 
-#### `update_datarequest(context, data_dict)`
-Action to update a data request. The function checks the access rights of the user before updating the data request. If the user is not allowed, a `NotAuthorized` exception will be risen
-
-In addition, you should note that the parameters will be checked and an exception (`ValidationError`) will be risen if some of these parameters are not valid.
-
-##### Parameters (included in `data_dict`):
-* **`id`** (string): the ID of the datarequest to be updated
-* **`title`** (string): the updated title of the data request
-* **`description`** (string): a updated brief description for your data request
-* **`organization_id`** (string): The ID of the organization you want to asign the data request (optional).
-
-##### Returns:
-A dict with the data request (`id`, `user_id`, `title`, `description`,`organization_id`, `open_time`, `accepted_dataset`, `close_time`, `closed`, `followers`).
-
-
-#### `list_datarequests(context, data_dict)`
-Returns a list with the existing data requests. Rights access will be checked before returning the results. If the user is not allowed, a `NotAuthorized` exception will be risen
-
-##### Parameters (included in `data_dict`):
-* **`organization_id`** (string) (optional): to filter the result by organization
-* **`user_id`** (string) (optional): to filter the result by user
-* **`closed`** (string) (optional): to filter the result by state (`True`: Closed, `False`: Open)
-* **`offset`** (int) (optional) (default `0`): the first element to be returned
-* **`limit`** (int) (optional) (default `10`): The max number of data requests to be returned
-* **`q`** (string) (optional): to filter the result using a free-text.
-* **`sort`** (string) (optional) (default `asc`): `desc` to order data requests in a descending way. `asc` to order data requests in an ascending way.
-
-##### Returns:
-A dict with three fields: `result` (a list of data requests), `facets` (a list of the facets that can be used) and `count` (the total number of existing data requests)
-
-
-#### `delete_datarequest(context, data_dict)`
-Action to delete a new data request. The function checks the access rights of the user before deleting the data request. If the user is not allowed, a `NotAuthorized` exception will be risen.
-
-##### Parameters (included in `data_dict`):
-* **`id`** (string): the ID of the datarequest to be deleted
-
-##### Returns:
-A dict with the data request (`id`, `user_id`, `title`, `description`,`organization_id`, `open_time`, `accepted_dataset`, `close_time`, `closed`, `followers`).
-
-
-#### `close_datarequest(context, data_dict)`
-Action to close a data request. Access rights will be checked before closing the data request. If the user is not allowed, a `NotAuthorized` exception will be risen
-
-##### Parameters (included in `data_dict`):
-* **`id`** (string): the ID of the datarequest to be closed
-* **`accepted_dataset`** (string): The ID of the dataset accepted as solution for the data request
-
-##### Returns:
-A dict with the data request (`id`, `user_id`, `title`, `description`,`organization_id`, `open_time`, `accepted_dataset`, `close_time`, `closed`, `followers`).
-
-
-#### `comment_datarequest(context, data_dict)`
-Action to create a comment in a data request. Access rights will be checked before creating the comment and a `NotAuthorized` exception will be risen if the user is not allowed to create the comment
-
-##### Parameters (included in `data_dict`):
-* **`datarequest_id`** (string): the ID of the datarequest to be commented
-* **`comment`** (string): The comment to be added to the data request
-
-##### Returns:
-A dict with the data request comment (`id`, `user_id`, `datarequest_id`, `time` and `comment`)
-
-
-#### `show_datarequest_comment(context, data_dict)`
-Action to retrieve a comment. Access rights will be checked before getting the comment and a `NotAuthorized` exception will be risen if the user is not allowed to get the comment
-
-##### Parameters (included in `data_dict`):
-* **`id`** (string): The ID of the comment to be retrieved
-
-##### Returns:
-A dict with the following fields: `id`, `user_id`, `datarequest_id`, `time` and `comment`
-
-
-#### `list_datarequest_comments(context, data_dict)`
-Action to retrieve all the comments of a data request. Access rights will be checked before getting the comments and a `NotAuthorized` exception will be risen if the user is not allowed to read the comments
-
-##### Parameters (included in `data_dict`):
-* **`datarequest_id`** (string): The ID of the datarequest whose comments want to be retrieved
-* **`sort`** (string) (optional) (default `asc`): `desc` to order comments in a descending way. `asc` to order comments in an ascending way.
-
-##### Returns:
- A list with all the comments of a data request. Every comment is a dict with the following fields: `id`, `user_id`, `datarequest_id`, `time` and `comment`
-
-
-#### `update_datarequest_comment(context, data_dict)`
-Action to update a comment of a data request. Access rights will be checked before updating the comment and a `NotAuthorized` exception will be risen if the user is not allowed to update the comment
-
-##### Parameters (included in `data_dict`):
-* **`id`** (string): The ID of the comment to be updated
-* **`comment`** (string): The new comment
-
-##### Returns:
-A dict with the data request comment (`id`, `user_id`, `datarequest_id`, `time` and `comment`)
-
-
-#### `delete_datarequest_comment(context, data_dict)`
-Action to delete a comment of a data request. Access rights will be checked before deleting the comment and a `NotAuthorized` exception will be risen if the user is not allowed to delete the comment
-
-##### Parameters (included in `data_dict`):
-* **`id`** (string): The ID of the comment to be deleted
-
-##### Returns:
-A dict with the data request comment (`id`, `user_id`, `datarequest_id`, `time` and `comment`)
-
-#### `follow_datarequest(context, data_dict)`
-
-Action to follow a data request. Access rights will be cheked before following a datarequest and a `NotAuthorized` exception will be risen if the user is not allowed to follow the given datarequest. `ValidationError` will be risen if the datarequest ID is not included or if the user is already following the datarequest. `ObjectNotFound` will be risen if the given datarequest does not exist.
-
-##### Parameters (included in `data_dict`):
-* **`id`** (string): The ID of the datarequest to be followed
-
-##### Returns:
-`True`
-
-#### `unfollow_datarequest(context, data_dict)`
-
-Action to unfollow a data request. Access rights will be cheked before unfollowing a datarequest and a NotAuthorized exception will be risen if the user is not allowed to unfollow the given datarequest. `ValidationError` will be risen if the datarequest ID is not included in the request. `ObjectNotFound` will be risen if the user is not following the given datarequest.
-
-##### Parameters (included in `data_dict`):
-* **`id`** (string): The ID of the datarequest to be unfollowed
-
-##### Returns:
-`True`
-
-
-## Installation
-
-Install this extension in your CKAN instance is as easy as install any other CKAN extension.
-
-* Activate your virtual environment
-```
-. /usr/lib/ckan/default/bin/activate
-```
-* Install the extension
-```
-pip install ckanext-datarequests
-```
-> **Note**: If you prefer, you can also download the source code and install the extension manually. To do so, execute the following commands:
-> ```
-> $ git clone https://github.com/conwetlab/ckanext-datarequests.git
-> $ cd ckanext-datarequests
-> $ python setup.py install
-> ```
-
-* Modify your configuration file (generally in `/etc/ckan/default/production.ini`) and add `datarequests` in the `ckan.plugins` property.
-```
-ckan.plugins = datarequests <OTHER_PLUGINS>
-```
-* Enable or disable the comments system by setting up the `ckan.datarequests.comments` property in the configuration file (by default, the comments system is enabled).
-```
-ckan.datarequests.comments = [true|false]
-```
-* Enable or disable a badge to show the number of data requests in the menu by setting up the `ckan.datarequests.show_datarequests_badge` property in the configuration file (by default, the badge is not shown).
-```
-ckan.datarequests.show_datarequests_badge = [true|false]
-```
-* Enable or disable description as a required field on data request forms
-```
-ckan.datarequests.description_required = [true|false]
-```
-* Restart your apache2 reserver
-```
-sudo service apache2 restart
-```
-* That's All!
-
-## Translations
-
-Help us to translate this extension so everyone can create data requests. Currently, the extension is translated to English, Spanish, German and Brazilian Portuguese. If you want to contribute with your translation, the first step is to clone this repo and move to the `develop` branch. Then, create the locale for your translation by executing:
-
-```
-python setup.py init_catalog -l <YOUR_LOCALE>
-```
-
-This will generate a file called `i18n/YOUR_LOCALE/LC_MESSAGES/ckanext-datarequests.po`. This file contains all the untranslated strings. You can manually add a translation for it by editing the `msgstr` section:
-
-```
-msgid "This is an untranslated string"
-msgstr "This is a itranslated string"
-```
-
-Once the translation files (`po`) have been updated, compile them by running:
-
-```
-python setup.py compile_catalog
-```
-
-This will generate the required `mo` file. Once this file has been generated, commit your changes and create a Pull Request (to the `develop` branch). 
-
-## Tests
-
-This sofware contains a set of test to detect errors and failures. You can run this tests by running the following command (this command will generate coverage reports):
-```
-python setup.py nosetests
-```
-**Note:** The `test.ini` file contains a link to the CKAN `test-core.ini` file. You will need to change that link to the real path of the file in your system (generally `/usr/lib/ckan/default/src/ckan/test-core.ini`).
-
-**Note 2:** When creating a PR that includes code changes, please, ensure your new code is tested. No PR will be merged until the Travis CI system marks it as valid.
-
-## Changelog
-
-### v1.1.0
-
-* New: Compatibility with CKAN 2.8.0
-* New: Somali translation (thanks to @SimuliChina)
-
-### v1.0.0
-
-* New: Option to follow data requests.
-* New: Email notifications:
-  * An email will be sent to organization staff when a data request is created in a organization.
-  * An email will be sent to followers, people that commented, datarequest creator and organization staff when a comment in a datarequest is created.
-  * An email will be sent to followers, people that commented, datarequest creator and organization staff when a data request is closed.
-* New: Major API changes:
-  * `datarequest_create` :arrow_right: `create_datarequest`
-  * `datarequest_show` :arrow_right: `show_datarequest`
-  * `datarequest_update` :arrow_right: `update_datarequest`
-  * `datarequest_index` :arrow_right: `list_datarequests`
-  * `datarequest_delete` :arrow_right: `delete_datarequest`
-  * `datarequest_close` :arrow_right: `close_datarequest`
-  * `datarequest_comment` :arrow_right: `comment_datarequest`
-  * `datarequest_comment_show` :arrow_right: `show_datarequest_comment`
-  * `datarequest_comment_list` :arrow_right: `list_datarequest_comments`
-  * `datarequest_comment_update` :arrow_right: `update_datarequest_comment`
-  * `datarequest_comment_delete` :arrow_right: `delete_datarequest_comment`
-
-### v0.4.1
-
-* New: Brazilian Portuguese translation (thanks to @allysonbarros)
-
-### v0.4.0
-
-* New: Move CI to Travis
-* New: Compatibility with CKAN 2.7 (controller adapted by @owl17)
-
-### v0.3.3
-
-* New: German Translation (thanks to @kvlahrosch)
-
+### SSH
+Circle CI supports shell access to the build for 120 minutes after the build is finished when the build is started with SSH support. Use "Rerun job with SSH" button in Circle CI UI to start build with SSH support.
diff --git a/bin/travis-build.bash b/bin/travis-build.bash
deleted file mode 100644
index c4325520..00000000
--- a/bin/travis-build.bash
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash
-set -e
-
-echo "This is travis-build.bash..."
-
-echo "Installing the packages that CKAN requires..."
-sudo apt-get update -qq
-sudo apt-get install solr-jetty
-
-echo "Installing CKAN and its Python dependencies..."
-git clone https://github.com/ckan/ckan
-cd ckan
-git checkout ckan-$CKANVERSION
-python setup.py develop
-pip install -r requirements.txt --allow-all-external
-pip install -r dev-requirements.txt --allow-all-external
-cd -
-
-echo "Setting up Solr..."
-# solr is multicore for tests on ckan master now, but it's easier to run tests
-# on Travis single-core still.
-# see https://github.com/ckan/ckan/issues/2972
-sed -i -e 's/solr_url.*/solr_url = http:\/\/127.0.0.1:8983\/solr/' ckan/test-core.ini
-printf "NO_START=0\nJETTY_HOST=127.0.0.1\nJETTY_PORT=8983\nJAVA_HOME=$JAVA_HOME" | sudo tee /etc/default/jetty
-sudo cp ckan/ckan/config/solr/schema.xml /etc/solr/conf/schema.xml
-sudo service jetty restart
-
-echo "Creating the PostgreSQL user and database..."
-sudo -u postgres psql -c "CREATE USER ckan_default WITH PASSWORD 'pass';"
-sudo -u postgres psql -c "CREATE USER datastore_default WITH PASSWORD 'pass';"
-sudo -u postgres psql -c "CREATE DATABASE ckan_test WITH OWNER ckan_default;"
-sudo -u postgres psql -c "CREATE DATABASE datastore_test WITH OWNER ckan_default;"
-
-
-echo "Initialising the database..."
-cd ckan
-paster db init -c test-core.ini
-cd -
-
-echo "Installing ckanext-datarequests and its requirements..."
-python setup.py develop
-
-echo "travis-build.bash is done."
\ No newline at end of file
diff --git a/bin/travis-run.sh b/bin/travis-run.sh
deleted file mode 100644
index 8bc0c729..00000000
--- a/bin/travis-run.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh -e
-
-python setup.py nosetests
diff --git a/ckanext/datarequests/plugin.py b/ckanext/datarequests/plugin.py
index 52850726..68986fe7 100644
--- a/ckanext/datarequests/plugin.py
+++ b/ckanext/datarequests/plugin.py
@@ -33,7 +33,7 @@
 
 def get_config_bool_value(config_name, default_value=False):
     value = config.get(config_name, default_value)
-    value = tk.asbool(value)
+    value = value if type(value) == bool else value != 'False'
     return value
 
 def is_fontawesome_4():
diff --git a/ckanext/datarequests/tests/test_selenium.py b/ckanext/datarequests/tests/test_selenium.py
deleted file mode 100644
index 370e233b..00000000
--- a/ckanext/datarequests/tests/test_selenium.py
+++ /dev/null
@@ -1,721 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Copyright (c) 2016 CoNWeT Lab., Universidad Politécnica de Madrid
-
-# This file is part of CKAN Data Requests Extension.
-
-# CKAN Data Requests Extension is free software: you can redistribute it and/or
-# modify it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-
-# CKAN Data Requests Extension is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-
-# You should have received a copy of the GNU Affero General Public License
-# along with CKAN Data Requests Extension.  If not, see <http://www.gnu.org/licenses/>.
-
-from nose_parameterized import parameterized
-from selenium import webdriver
-from selenium.webdriver.common.by import By
-from selenium.common.exceptions import NoSuchElementException
-from selenium.webdriver.support.ui import Select
-from subprocess import Popen
-
-import ckan.lib.search.index as search_index
-import ckan.model as model
-import ckanext.datarequests.db as db
-import os
-import random
-import string
-import unittest
-
-
-def _generate_random_string(length):
-    return ''.join(random.choice(string.ascii_lowercase) for _ in xrange(length))
-
-
-class TestSelenium(unittest.TestCase):
-
-    @classmethod
-    def setUpClass(cls):
-        env = os.environ.copy()
-        env['DEBUG'] = 'True'
-        env['OAUTHLIB_INSECURE_TRANSPORT'] = 'True'
-        cls._process = Popen(['paster', 'serve', 'test.ini'], env=env)
-
-    @classmethod
-    def tearDownClass(cls):
-        cls._process.terminate()
-
-    def clearBBDD(self):
-        # Clean Solr
-        search_index.clear_index()
-
-        # Clean the database
-        model.repo.rebuild_db()
-
-        # Delete previous users
-        db.init_db(model)
-        datarequests = db.DataRequest.get()
-        for datarequest in datarequests:
-            model.Session.delete(datarequest)
-
-        comments = db.Comment.get()
-        for comment in comments:
-            model.Session.delete(comment)
-
-        model.Session.commit()
-
-    def setUp(self):
-        self.clearBBDD()
-
-        if 'WEB_DRIVER_URL' in os.environ and 'CKAN_SERVER_URL' in os.environ:
-            self.driver = webdriver.Remote(os.environ['WEB_DRIVER_URL'], webdriver.DesiredCapabilities.FIREFOX.copy())
-            self.base_url = os.environ['CKAN_SERVER_URL']
-        else:
-            self.driver = webdriver.Firefox()
-            self.base_url = 'http://127.0.0.1:5000/'
-
-        self.driver.implicitly_wait(5)
-        self.driver.set_window_size(1024, 768)
-
-    def tearDown(self):
-        self.clearBBDD()
-        self.driver.quit()
-
-    def assert_fields_disabled(self, fields):
-        for field in fields:
-            self.assertFalse(self.driver.find_element_by_id(field).is_enabled())
-
-    def is_element_present(self, how, what):
-        try:
-            self.driver.find_element(by=how, value=what)
-        except NoSuchElementException:
-            return False
-        return True
-
-    def logout(self):
-        self.driver.delete_all_cookies()
-        self.driver.get(self.base_url)
-
-    def register(self, username, fullname, mail, password):
-        driver = self.driver
-        driver.get(self.base_url)
-        driver.find_element_by_link_text('Register').click()
-        driver.find_element_by_id('field-username').clear()
-        driver.find_element_by_id('field-username').send_keys(username)
-        driver.find_element_by_id('field-fullname').clear()
-        driver.find_element_by_id('field-fullname').send_keys(fullname)
-        driver.find_element_by_id('field-email').clear()
-        driver.find_element_by_id('field-email').send_keys(mail)
-        driver.find_element_by_id('field-password').clear()
-        driver.find_element_by_id('field-password').send_keys(password)
-        driver.find_element_by_id('field-confirm-password').clear()
-        driver.find_element_by_id('field-confirm-password').send_keys(password)
-        driver.find_element_by_name('save').click()
-        self.logout()
-
-    def default_register(self, user):
-        pwd = user.ljust(8, '0')
-        self.register(user, user, '%s@conwet.com' % user, pwd)
-        return pwd
-
-    def login(self, username, password):
-        driver = self.driver
-        driver.get(self.base_url)
-        driver.find_element_by_link_text('Log in').click()
-        driver.find_element_by_id('field-login').clear()
-        driver.find_element_by_id('field-login').send_keys(username)
-        driver.find_element_by_id('field-password').clear()
-        driver.find_element_by_id('field-password').send_keys(password)
-        driver.find_element_by_id('field-remember').click()
-        driver.find_element_by_css_selector('button.btn.btn-primary').click()
-
-    def create_organization(self, name, description):
-        driver = self.driver
-        driver.get(self.base_url)
-        driver.find_element_by_link_text('Organizations').click()
-        driver.find_element_by_link_text('Add Organization').click()
-        driver.find_element_by_id('field-name').clear()
-        driver.find_element_by_id('field-name').send_keys(name)
-        driver.find_element_by_id('field-description').clear()
-        driver.find_element_by_id('field-description').send_keys(description)
-        driver.find_element_by_name('save').click()
-
-    def create_dataset(self, name, description, resource_url, resource_name, resource_description, resource_format):
-        driver = self.driver
-        driver.get(self.base_url)
-        driver.find_element_by_link_text('Datasets').click()
-        driver.find_element_by_link_text('Add Dataset').click()
-
-        # FIRST PAGE: Dataset properties
-        driver.find_element_by_id('field-title').clear()
-        driver.find_element_by_id('field-title').send_keys(name)
-        driver.find_element_by_id('field-notes').clear()
-        driver.find_element_by_id('field-notes').send_keys(description)
-
-        driver.find_element_by_name('save').click()
-
-        # SECOND PAGE: Add Resources
-        try:
-            # The link button is only clicked if it's present
-            driver.find_element_by_link_text('Link').click()
-        except Exception:
-            pass
-
-        driver.find_element_by_id('field-image-url').clear()
-        driver.find_element_by_id('field-image-url').send_keys(resource_url)
-        driver.find_element_by_id('field-name').clear()
-        driver.find_element_by_id('field-name').send_keys(resource_name)
-        driver.find_element_by_id('field-description').clear()
-        driver.find_element_by_id('field-description').send_keys(resource_description)
-        driver.find_element_by_id('s2id_autogen1').clear()
-        driver.find_element_by_id('s2id_autogen1').send_keys(resource_format + '\n')
-        driver.find_element_by_css_selector('button.btn.btn-primary').click()
-
-    def complete_datarequest_form(self, title, description, organization_name=None):
-        driver = self.driver
-
-        driver.find_element_by_id('field-title').clear()
-        driver.find_element_by_id('field-title').send_keys(title)
-        driver.find_element_by_id('field-description').clear()
-        driver.find_element_by_id('field-description').send_keys(description)
-
-        if organization_name:
-            Select(driver.find_element_by_xpath('//*[@id="field-organizations"]')).select_by_visible_text(organization_name)
-
-        driver.find_element_by_name('save').click()
-
-    def create_datarequest(self, title, description, organization_name=None):
-        driver = self.driver
-
-        driver.get(self.base_url)
-        driver.find_element_by_xpath('//a[contains(@href, \'/datarequest\')]').click()
-        driver.find_element_by_link_text('Add Data Request').click()
-
-        self.complete_datarequest_form(title, description, organization_name)
-
-        return driver.current_url.split('/')[-1]
-
-    def edit_datarequest(self, datarequest_id, title, description):
-        driver = self.driver
-        driver.get(self.base_url + 'datarequest/' + datarequest_id)
-        driver.find_element_by_link_text('Manage').click()
-        self.complete_datarequest_form(title, description)
-
-    def delete_datarequest(self, datarequest_id):
-        driver = self.driver
-        driver.get(self.base_url + 'datarequest/' + datarequest_id)
-
-        driver.find_element_by_link_text('Manage').click()
-        driver.find_element_by_link_text('Delete').click()
-        driver.find_element_by_css_selector('div.modal-footer > button.btn.btn-primary').click()
-
-    def close_datarequest(self, datarequest_id, dataset_name=None):
-        driver = self.driver
-        driver.get(self.base_url + 'datarequest/' + datarequest_id)
-
-        driver.find_element_by_link_text('Close').click()
-
-        if dataset_name:
-            Select(driver.find_element_by_xpath('//*[@id="field-accepted_dataset_id"]')).select_by_visible_text(dataset_name)
-
-        driver.find_element_by_name('close').click()
-
-    def comment_datarequest(self, datarequest_id, comment):
-        driver = self.driver
-        driver.get(self.base_url + 'datarequest/comment/' + datarequest_id)
-
-        new_comment_form = driver.find_elements_by_name('comment')[-1]
-        new_comment_form.clear()
-        new_comment_form.send_keys(comment)
-
-        driver.find_element_by_name('add').click()
-
-    def edit_comment(self, datarequest_id, comment_pos, updated_comment):
-        driver = self.driver
-        driver.get(self.base_url + 'datarequest/comment/' + datarequest_id)
-
-        driver.find_elements(by=By.CSS_SELECTOR, value='i.fa-pencil')[comment_pos].click()
-        driver.find_element_by_name('comment').clear()
-        driver.find_element_by_name('comment').send_keys(updated_comment)
-        driver.find_element_by_name('update').click()
-
-    def check_datarequests_counter(self, n_datarequests, search=None):
-
-        text = None
-
-        if n_datarequests == 0:
-            text = 'No data requests found'
-        elif n_datarequests == 1:
-            text = '1 data request found'
-        else:
-            text = '%d data requests found' % n_datarequests
-
-        if search:
-            text += ' for "%s"' % search
-
-        self.assertEqual(text, self.driver.find_element_by_css_selector(".primary h2").text)
-
-    def check_n_datarequests(self, expected_number):
-        self.assertEqual(len(self.driver.find_elements_by_xpath(
-                         '//li[@class=\'dataset-item\']')), expected_number)
-
-    def check_datarequest(self, datarequest_id, title, description, open, owner, 
-                          organization='None', accepted_dataset='None'):
-        driver = self.driver
-        driver.get(self.base_url + 'datarequest/' + datarequest_id)
-
-        self.assertEqual(title, driver.find_element_by_css_selector('h1.page-heading').text)
-        self.assertEqual(description, driver.find_element_by_css_selector('p').text)
-
-        self.assertEqual('OPEN' if open else 'CLOSED',
-                         driver.find_element_by_xpath('//div[@id=\'content\']/div[3]/div/article/div/span').text)
-
-        if open:
-            self.assertEqual(owner, self.is_element_present(By.LINK_TEXT, 'Close'))
-
-        self.assertEqual(organization, driver.find_element_by_xpath(
-                         '//div[@id=\'content\']/div[3]/div/article/div/section/table/tbody/tr[2]/td').text)
-
-        if not open:
-            self.assertEqual(accepted_dataset, driver.find_element_by_xpath(
-                             '//div[@id=\'content\']/div[3]/div/article/div/section/table/tbody/tr[5]/td').text)
-
-        self.assertEqual(owner, self.is_element_present(By.LINK_TEXT, 'Manage'))
-
-    def check_form_error(self, expected_message):
-        self.assertEqual(expected_message, self.driver.find_element_by_xpath(
-                         '//div[@id=\'content\']/div[3]/div/article/div/form/div/ul/li').text)
-
-    def check_first_comment_text(self, expected_text):
-        self.assertEqual(self.driver.find_element_by_xpath(
-                         '//div[@class=\'comment-content \']').text,
-                         expected_text)
-
-    def check_element_optically_displayed(self, element):
-        driver = self.driver
-        scroll_top = driver.execute_script('return $(window).scrollTop()')
-        scroll_bottom = driver.execute_script('return $(window).scrollTop() + $(window).height()')
-
-        return element.location['y'] >= scroll_top and element.location['y'] <= scroll_bottom
-
-    def test_create_datarequest_and_check_permissions(self):
-
-        users = ['user1', 'user2']
-        pwds = []
-
-        # Create users
-        for user in users:
-            pwds.append(self.default_register(user))
-
-        # The first user creates a data request and they are able to
-        # close/modify it
-        self.login(users[0], pwds[0])
-        datarequest_title = 'Data Request 1'
-        datarequest_description = 'Example Description'
-        datarequest_id = self.create_datarequest(datarequest_title,
-                                                 datarequest_description)
-        self.check_datarequest(datarequest_id, datarequest_title,
-                               datarequest_description, True, True)
-
-        # Second user can access the data request but they are not able to
-        # close/modify it
-        self.logout()
-        self.login(users[1], pwds[1])
-        self.check_datarequest(datarequest_id, datarequest_title,
-                               datarequest_description, True, False)
-
-        # Get user profile and check that user1 has one attached datarequest
-        self.driver.get(self.base_url + 'user/datarequest/' + users[0])
-        self.check_n_datarequests(1)
-        self.check_datarequests_counter(1)
-        self.driver.get(self.base_url + 'user/datarequest/' + users[1])
-        self.check_n_datarequests(0)
-
-    @parameterized.expand([
-        ('', 0, 'Title: Title cannot be empty'),
-        ('Title', 1001, 'Description: Description must be a maximum of 1000 characters long')
-    ])
-    def test_create_invalid_datarequest(self, title, description_length, expected_error):
-
-        user = 'user1'
-
-        pwd = self.default_register(user)
-        self.login(user, pwd)
-
-        # Create the description
-        description = _generate_random_string(description_length)
-
-        # Check the returned error message
-        self.create_datarequest(title, description)
-        self.check_form_error(expected_error)
-
-    def test_create_datarequest_same_name(self):
-
-        user = 'user1'
-
-        pwd = self.default_register(user)
-        self.login(user, pwd)
-
-        # Create the comment
-        title = 'Data Request'
-        comment = 'Example description'
-
-        # Create the datarequest
-        self.create_datarequest(title, comment)
-
-        # Create another data request with the same name (it should fail)
-        self.create_datarequest(title, comment)
-        self.check_form_error('Title: That title is already in use')
-
-    @parameterized.expand([
-        ('Cool DR', 10),
-        ('', 10, 'Title: Title cannot be empty'),
-        ('Updated Title', 1001, 'Description: Description must be a maximum of 1000 characters long')
-    ])
-    def test_update_datarequest(self, new_title, new_description_length, expected_error=None):
-
-        user = 'user1'
-
-        pwd = self.default_register(user)
-        self.login(user, pwd)
-
-        # Create the data request
-        datarequest_title = 'Data Request 1'
-        datarequest_description = 'Example Description'
-        datarequest_id = self.create_datarequest(datarequest_title,
-                                                 datarequest_description)
-
-        new_description = _generate_random_string(new_description_length)
-
-        # Update the data request
-        self.edit_datarequest(datarequest_id, new_title, new_description)
-
-        # If the data request is updated, we have to check the new status
-        # Otherwise, we have to check if the error is arised
-        if not expected_error:
-            self.check_datarequest(datarequest_id, new_title, new_description, True, True)
-        else:
-            self.check_form_error(expected_error)
-
-    def test_update_datarequest_same_name(self):
-
-        user = 'user1'
-
-        pwd = self.default_register(user)
-        self.login(user, pwd)
-
-        # Create the comment
-        title = 'Data Request'
-        comment = 'Example description'
-
-        # Create the first data request
-        self.create_datarequest(title, comment)
-
-        # Create the second data request
-        second_dr_id = self.create_datarequest(title + 'a', comment)
-
-        # Create another data request with the same name (it should fail)
-        self.edit_datarequest(second_dr_id, title, comment)
-        self.check_form_error('Title: That title is already in use')
-
-    def test_delete_datarequest(self):
-
-        user = 'user1'
-
-        pwd = self.default_register(user)
-        self.login(user, pwd)
-
-        # Create the data request
-        datarequest_title = 'Data Request 1'
-        datarequest_description = 'Example Description'
-        datarequest_id = self.create_datarequest(datarequest_title,
-                                                 datarequest_description)
-
-        # Delete the data request
-        self.delete_datarequest(datarequest_id)
-
-        # Check that there are not more data requests in the system
-        self.assertTrue('No Data Requests found with the given criteria.'
-                        in self.driver.find_element_by_css_selector('.primary p.empty').text)
-
-        # Check flash message
-        self.assertTrue('Data Request ' + datarequest_title + ' has been deleted'
-                        in self.driver.find_element_by_xpath('//div[@id=\'content\']/div/div').text)
-
-    def test_close_datarequest(self):
-
-        user = 'user1'
-
-        pwd = self.default_register(user)
-        self.login(user, pwd)
-
-        # Create data request
-        datarequest_title = 'Data Request 1'
-        datarequest_description = 'Example Description'
-        datarequest_id = self.create_datarequest(datarequest_title,
-                                                 datarequest_description)
-
-        # Close data request
-        self.close_datarequest(datarequest_id)
-
-        # Check data request status
-        self.check_datarequest(datarequest_id, datarequest_title,
-                               datarequest_description, False, True)
-
-    @unittest.skipIf(float('.'.join(os.environ.get('CKANVERSION', '2.7').split('.')[:-1])) >= 2.8, 
-                     'This test cannot be run in CKAN >= 2.8 because elements in combo boxes cannot be selected')
-    def test_close_datarequest_with_organization_and_accepted_dataset(self):
-
-        user = 'user1'
-
-        pwd = self.default_register(user)
-        self.login(user, pwd)
-
-        organization_1_name = 'conwet'
-        organization_2_name = 'upm'
-        dataset_name = 'example'
-
-        self.create_organization(organization_1_name, 'example description')
-        self.create_organization(organization_2_name, 'example description')
-        self.create_dataset(dataset_name, 'description', 'http://fiware.org',
-                            'resource_name', 'resource_description', 'html')
-
-        datarequest_title = 'Data Request 1'
-        datarequest_description = 'Example Description'
-        datarequest_id = self.create_datarequest(datarequest_title,
-                                                 datarequest_description,
-                                                 organization_1_name)
-
-        self.close_datarequest(datarequest_id, dataset_name)
-
-        self.check_datarequest(datarequest_id, datarequest_title,
-                               datarequest_description, False, True,
-                               organization_1_name, dataset_name)
-
-        self.driver.get(self.base_url + 'datarequest')
-        self.check_datarequests_counter(1)
-
-        # Get organization and check that organization 1 has one attached datarequest
-        self.driver.get(self.base_url + 'organization/datarequest/' + organization_1_name)
-        self.check_n_datarequests(1)
-        self.check_datarequests_counter(1)
-        self.driver.get(self.base_url + 'organization/datarequest/' + organization_2_name)
-        self.check_n_datarequests(0)
-        self.check_datarequests_counter(0)
-
-    def test_search_datarequests(self):
-
-        def _check_pages(last_available):
-
-            for i in range(1, last_available + 1):
-                self.assertTrue(self.is_element_present(
-                                By.LINK_TEXT, '{0}'.format(i)))
-
-            self.assertFalse(self.is_element_present(
-                             By.LINK_TEXT, '{0}'.format(last_available + 1)))
-
-        user = 'user1'
-        n_datarequests = 11
-        base_name = 'Data Request'
-
-        pwd = self.default_register(user)
-        self.login(user, pwd)
-
-        for i in range(n_datarequests):
-            datarequest_title = '{0} {1}'.format(base_name, i)
-            datarequest_description = 'Example Description'
-            datarequest_id = self.create_datarequest(datarequest_title,
-                                                     datarequest_description)
-
-            if i % 2 == 0:
-                self.close_datarequest(datarequest_id)
-
-        # If ordered in ascending way, the first data request should be present
-        # in the first page
-        self.driver.get(self.base_url + 'datarequest')
-        Select(self.driver.find_element_by_id('field-order-by')).select_by_visible_text('Oldest')
-        self.assertTrue(self.is_element_present(By.LINK_TEXT, '{0} {1}'.format(base_name, 0)))
-        self.check_datarequests_counter(n_datarequests)
-
-        # There must be two pages (10 + 1). One page contains 10 items as a
-        # maximum.
-        _check_pages(2)
-        self.check_n_datarequests(10)
-
-        # The latest data request is in the second page
-        self.driver.find_element_by_link_text('2').click()
-        self.assertTrue(self.is_element_present(By.LINK_TEXT, '{0} {1}'.format(base_name, n_datarequests - 1)))
-        self.check_n_datarequests(1)
-
-        for i in range(n_datarequests):
-            datarequest_title = 'test {0}'.format(i)
-            datarequest_description = 'Example Description'
-            datarequest_id = self.create_datarequest(datarequest_title,
-                                                     datarequest_description)
-
-        self.driver.get(self.base_url + 'datarequest')
-
-        # There must be three pages (10 + 10 + 2). One page contains 10 items
-        # as a maximum.
-        _check_pages(3)
-        self.check_n_datarequests(10)
-        self.check_datarequests_counter(n_datarequests * 2)
-
-        # Search by base name
-        self.driver.find_element_by_xpath('(//input[@name=\'q\'])[2]').clear()
-        self.driver.find_element_by_xpath('(//input[@name=\'q\'])[2]').send_keys(base_name)
-        self.driver.find_element_by_xpath('//button[@value=\'search\']').click()
-
-        # There should be two pages
-        _check_pages(2)
-        self.check_n_datarequests(10)
-        self.check_datarequests_counter(n_datarequests, base_name)
-
-        # Filter by open (there should be 5 data requests open with the given
-        # base name)
-        self.driver.find_element_by_partial_link_text('Open').click()
-        self.check_n_datarequests(5)
-        self.check_datarequests_counter(5, base_name)
-
-        # Pages selector is not available when there are less than 10 items
-        self.assertFalse(self.is_element_present(By.LINK_TEXT, '1'))
-
-    def test_create_comment_and_check_permissions(self):
-
-        def _check_is_editable(editable):
-            self.assertEqual(editable, self.is_element_present(By.CSS_SELECTOR, 'i.fa-pencil'))
-            self.assertEqual(editable, self.is_element_present(By.CSS_SELECTOR, 'i.fa-times'))
-
-        users = ['user1', 'user2']
-        pwds = []
-
-        # Create users
-        for user in users:
-            pwds.append(self.default_register(user))
-
-        # First user creates the data request
-        self.login(users[0], pwds[0])
-        datarequest_title = 'Data Request 1'
-        datarequest_description = 'Example Description'
-        datarequest_id = self.create_datarequest(datarequest_title,
-                                                 datarequest_description)
-
-        # Second user creates the comment so they are able to modify it
-        self.logout()
-        self.login(users[1], pwds[1])
-
-        comment = 'this is a sample comment'
-        self.comment_datarequest(datarequest_id, comment)
-
-        _check_is_editable(True)
-        self.check_first_comment_text(comment)
-
-        # First user is not able to modify the comment
-        self.logout()
-        self.login(users[0], pwds[0])
-
-        self.driver.get(self.base_url + 'datarequest/comment/' +
-                        datarequest_id)
-
-        _check_is_editable(False)
-        self.check_first_comment_text(comment)
-
-    @parameterized.expand([
-        (),
-        (1001, 'Comment: Comments must be a maximum of 1000 characters long')
-    ])
-    def test_update_comment(self, comment_length=10, expected_error=None):
-
-        user = 'user1'
-
-        pwd = self.default_register(user)
-        self.login(user, pwd)
-
-        datarequest_title = 'Data Request 1'
-        datarequest_description = 'Example Description'
-        datarequest_id = self.create_datarequest(datarequest_title,
-                                                 datarequest_description)
-
-        comment = 'this is a sample comment'
-        self.comment_datarequest(datarequest_id, comment)
-
-        updated_comment = _generate_random_string(comment_length)
-        self.edit_comment(datarequest_id, 0, updated_comment)
-
-        if not expected_error:
-            # Check that the comment has been updated appropriately
-            self.check_first_comment_text(updated_comment)
-        else:
-            # Check the error
-            self.assertEqual(expected_error, self.driver.find_element_by_xpath(
-                             '//div[@id=\'content\']/div[3]/div/article/div/div/div/form/div/ul/li').text)
-
-    def test_delete_comment(self):
-
-        user = 'user1'
-
-        pwd = self.default_register(user)
-        self.login(user, pwd)
-
-        datarequest_title = 'Data Request 1'
-        datarequest_description = 'Example Description'
-        datarequest_id = self.create_datarequest(datarequest_title,
-                                                 datarequest_description)
-
-        self.comment_datarequest(datarequest_id, 'sample comment')
-
-        # Delete the comment
-        self.driver.find_element_by_css_selector('i.fa-times').click()
-        self.driver.find_element_by_css_selector('.modal-footer > button.btn.btn-primary').click()
-
-        # Check that the comment has been deleted
-        self.assertEqual('This data request has not been commented yet',
-                         self.driver.find_element_by_css_selector('p.empty').text)
-        self.assertTrue('Comment has been deleted' in self.driver.find_element_by_xpath(
-                        '//div[@id=\'content\']/div/div').text)
-
-    def test_new_comments_always_visible(self):
-
-        user = 'user1'
-
-        pwd = self.default_register(user)
-        self.login(user, pwd)
-
-        datarequest_title = 'Data Request 1'
-        datarequest_description = 'Example Description'
-        datarequest_id = self.create_datarequest(datarequest_title,
-                                                 datarequest_description)
-
-        for i in range(10):
-            self.comment_datarequest(datarequest_id, 'comment {0}'.format(i))
-
-            # Last comment should be always visible
-            comments = self.driver.find_elements_by_xpath('//div[@class=\'comment-content \']')
-            self.assertTrue(self.check_element_optically_displayed(comments[-1]))
-
-        # After creating ten comments, the first one should not be visible
-        self.assertFalse(self.check_element_optically_displayed(comments[0]))
-
-    def test_create_invalid_comment(self):
-
-        user = 'user1'
-
-        pwd = self.default_register(user)
-        self.login(user, pwd)
-
-        # Create Data Request
-        datarequest_title = 'Data Request 1'
-        datarequest_description = 'Example Description'
-        datarequest_id = self.create_datarequest(datarequest_title,
-                                                 datarequest_description)
-
-        # Check that an error is raised
-        comment = _generate_random_string(1001)
-        self.comment_datarequest(datarequest_id, comment)
-        self.assertEqual('Comment: Comments must be a maximum of 1000 characters long',
-                         self.driver.find_element_by_xpath('//form[@id=\'comment-form\']/div[2]/ul/li').text)
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 00000000..1f00400f
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,110 @@
+version: '2.3'
+
+x-project:
+  &project ckanext-datarequests
+
+x-volumes:
+  &default-volumes
+  volumes:
+    - /app/ckan ### Local overrides to mount host filesystem. Automatically removed in CI and PROD.
+    - ./ckanext:/app/ckanext:${VOLUME_FLAGS:-delegated} ### Local overrides to mount host filesystem. Automatically removed in CI and PROD.
+    - ./test:/app/test:${VOLUME_FLAGS:-delegated} ### Local overrides to mount host filesystem. Automatically removed in CI and PROD.
+    ##- /app/filestore # Override for environment without host mounts. Automatically uncommented in CI.
+
+x-environment:
+  &default-environment
+  AMAZEEIO: AMAZEEIO
+
+x-user:
+  &default-user
+  # The default user under which the containers should run.
+  # Change this if you are on linux and run with another user than id `1000`.
+  user: '1000'
+
+services:
+
+  ckan:
+    build:
+      context: .
+      dockerfile: .docker/Dockerfile.ckan
+      args:
+        SITE_URL: http://ckanext-datarequests.docker.amazee.io
+    depends_on:
+      - postgres
+      - solr
+    networks:
+      - amazeeio-network
+      - default
+    ports:
+      - "3000"
+    image: *project
+    <<: *default-volumes
+    environment:
+      <<: *default-environment
+      AMAZEEIO_HTTP_PORT: 3000
+      LAGOON_LOCALDEV_URL: http://ckanext-datarequests.docker.amazee.io
+      AMAZEEIO_URL: ckanext-datarequests.docker.amazee.io
+
+  postgres:
+    image: amazeeio/postgres-ckan
+    ports:
+      - "5432"
+    networks:
+      - amazeeio-network
+      - default
+    <<: *default-user
+    environment:
+      <<: *default-environment
+
+  postgres-datastore:
+    image: amazeeio/postgres-ckan
+    ports:
+      - "5432"
+    <<: *default-user
+    networks:
+      - amazeeio-network
+      - default
+    environment:
+      <<: *default-environment
+
+  redis:
+    image: amazeeio/redis
+    <<: *default-user
+    environment:
+      <<: *default-environment
+    networks:
+      - amazeeio-network
+      - default
+
+  solr:
+    build:
+      context: .
+      dockerfile: .docker/Dockerfile.solr
+    user: '8983'
+    ports:
+      - "8983"
+    environment:
+      <<: *default-environment
+    networks:
+      - amazeeio-network
+      - default
+
+  chrome:
+    image: selenium/standalone-chrome:3.141.59-oxygen
+    shm_size: '1gb'
+    depends_on:
+      - ckan
+    <<: *default-volumes
+    <<: *default-user
+    environment:
+      <<: *default-environment
+    networks:
+      - amazeeio-network
+      - default
+
+volumes:
+  solr-data: {}
+
+networks:
+  amazeeio-network:
+    external: true
diff --git a/requirements-dev.txt b/requirements-dev.txt
new file mode 100644
index 00000000..1f56ac4f
--- /dev/null
+++ b/requirements-dev.txt
@@ -0,0 +1,12 @@
+beautifulsoup4==4.5.1
+behave==1.2.6
+behaving==1.5.6
+flake8==3.7.7
+nose==1.3.7
+mock
+nose_parameterized==0.3.3
+profanityfilter
+lxml==3.4.2
+-e git+https://github.com/qld-gov-au/ckanext-data-qld@develop#egg=ckanext-data_qld
+-e git+https://github.com/qld-gov-au/ckanext-data-qld-theme@develop#egg=ckanext-data_qld_theme
+-e git+https://github.com/qld-gov-au/ckanext-ytp-comments@develop#egg=ckanext-ytp-comments
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 00000000..e69de29b
diff --git a/setup.cfg b/setup.cfg
index 014bab28..5f705932 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,13 +3,7 @@ description-file = README.md
 
 [nosetests]
 ckan=1
-with-pylons=test.ini
-with-xunit=1
-with-coverage=1
-cover-package=ckanext.datarequests
-cover-inclusive=1
-cover-erase=1
-cover-xml=1
+with-pylons=/app/ckan/default/production.ini
 
 [extract_messages]
 keywords = translate isPlural
diff --git a/test.ini b/test.ini
deleted file mode 100644
index ee60279f..00000000
--- a/test.ini
+++ /dev/null
@@ -1,13 +0,0 @@
-[server:main]
-use = egg:Paste#http
-host = 0.0.0.0
-port = 5000
-
-[app:main]
-use = config:./ckan/test-core.ini
-
-ckan.plugins = datarequests
-
-## Site Settings
-
-ckan.site_url = http://127.0.0.1:5000/
\ No newline at end of file
diff --git a/test/features/datarequest.feature b/test/features/datarequest.feature
new file mode 100644
index 00000000..a3fb0951
--- /dev/null
+++ b/test/features/datarequest.feature
@@ -0,0 +1,144 @@
+@data-requests
+Feature: Datarequest
+
+    Scenario: Data Requests are accessible via the /datarequest URL
+        When I go to datarequest page
+        Then the browser's URL should contain "/datarequest"
+
+
+    Scenario: When visiting the datarequests page as a non-logged in user, the button at the top of the page reads Login to create a data request
+        When I go to datarequest page
+        Then I should see an element with xpath "//a[contains(string(), 'Login to create data request')]"
+
+
+    Scenario: After logging in, the user is redirected to the datarequests page and the "Add Data Request" button is visible
+        Given "SysAdmin" as the persona
+        When I go to datarequest page
+        And I click the link with text "Login to create data request"
+        And I enter my credentials and login
+        Then I should see an element with xpath "//a[contains(string(), 'Add data request')]"
+
+    Scenario: Data requests submitted without a description will produce an error message
+        Given "SysAdmin" as the persona
+        When I log in and go to datarequest page
+        And I click the link with text that contains "Add data request"
+        And I fill in "title" with "Test data request"
+        And I press the element with xpath "//button[contains(string(), 'Create data request')]"
+        Then I should see an element with the css selector "div.error-explanation.alert.alert-error" within 2 seconds
+        And I should see "The form contains invalid entries" within 1 seconds    
+        And I should see an element with the css selector "span.error-block" within 1 seconds
+        And I should see "Description cannot be empty" within 1 seconds
+
+
+    Scenario Outline: Sysadmin or Admin users of the assigned organisation for a data request can see a "Re-open" button on the data request detail page for closed data requests
+        Given "<User>" as the persona
+        When I log in and go to datarequest page
+        And I press "Closed Request"
+        Then I should see an element with xpath "//a[@class='btn btn-success' and contains(string(), ' Re-open')]"
+
+        Examples: Users  
+        | User                  |
+        | SysAdmin              |
+        | DataRequestOrgAdmin   |
+
+    Scenario Outline: Non-admin users should not see "Re-open" button on the data request detail page for closed data requests
+        Given "<User>" as the persona
+        When I log in and go to datarequest page
+        And I press "Closed Request"
+        Then I should not see an element with xpath "//a[@class='btn btn-success' and contains(string(), ' Re-open')]"
+
+        Examples: Users  
+        | User                  |
+        | CKANUser              |
+        | DataRequestOrgEditor  |
+        | DataRequestOrgMember  |
+        | TestOrgAdmin          |
+        | TestOrgEditor         |
+        | TestOrgMember         |
+
+
+    Scenario Outline: Data request creator, Sysadmin and Admin users of the assigned organisation for a data request can see a "Close" button on the data request detail page for opened data requests
+        Given "<User>" as the persona
+        When I log in and go to datarequest page
+        And I press "Test Request"
+        Then I should see an element with xpath "//a[contains(string(), 'Close')]"
+
+        Examples: Users  
+        | User                  |
+        | SysAdmin              |
+        | DataRequestOrgAdmin   |
+
+    Scenario Outline: Non admin users cannot not see a "Close" button on the data request detail page for opened data requests
+        Given "<User>" as the persona
+        When I log in and go to datarequest page
+        And I press "Test Request"
+        Then I should not see an element with xpath "//a[contains(string(), 'Close')]"
+
+        Examples: Users  
+        | User                  |
+        | CKANUser              |
+        | DataRequestOrgEditor  |
+        | DataRequestOrgMember  |
+        | TestOrgAdmin          |
+        | TestOrgEditor         |
+        | TestOrgMember         |
+
+    Scenario: Creating a new data request will email the Admin users of the organisation
+        Given "TestOrgEditor" as the persona
+        When I log in and go to datarequest page
+        And I click the link with text that contains "Add data request"
+        And I fill in title with random text
+        And I fill in "description" with "Test description"
+        And I press the element with xpath "//button[contains(string(), 'Create data request')]"
+        When I wait for 3 seconds
+        Then I should receive an email at "dr_admin@localhost" with subject "Queensland Government Open Data - Data Request"
+        And I should receive a base64 email at "dr_admin@localhost" containing "A new data request has been added and assigned to your organisation."
+        And I should receive an email at "admin@localhost" with subject "Queensland Government Open Data - Data Request"
+        And I should receive a base64 email at "admin@localhost" containing "A new data request has been added and assigned to your organisation."
+
+    Scenario: Closing a data request will email the creator
+        Given "DataRequestOrgAdmin" as the persona
+        When I log in and go to datarequest page
+        And I click the link with text that contains "Add data request"
+        And I fill in title with random text
+        And I fill in "description" with "Test description"
+        And I press the element with xpath "//button[contains(string(), 'Create data request')]"
+        And I press the element with xpath "//a[contains(string(), 'Close')]"
+        And I press the element with xpath "//button[contains(string(), 'Close data request')]"
+        When I wait for 3 seconds
+        Then I should receive an email at "dr_admin@localhost" with subject "Queensland Government Open Data - Data Request"
+        And I should receive a base64 email at "dr_admin@localhost" containing "Your data request has been closed."
+
+    Scenario: Re-Opening a data request will email the Admin users of the organisation and creator
+        Given "DataRequestOrgAdmin" as the persona
+        When I log in and go to datarequest page
+        And I click the link with text that contains "Add data request"
+        And I fill in title with random text
+        And I fill in "description" with "Test description"
+        And I press the element with xpath "//button[contains(string(), 'Create data request')]"
+        And I press the element with xpath "//a[contains(string(), 'Close')]"
+        And I press the element with xpath "//button[contains(string(), 'Close data request')]"
+        And I press the element with xpath "//a[@class='btn btn-success' and contains(string(), ' Re-open')]"
+        When I wait for 3 seconds
+        Then I should receive an email at "dr_admin@localhost" with subject "Queensland Government Open Data - Data Request"
+        And I should receive a base64 email at "dr_admin@localhost" containing "Your data request has been re-opened."
+        And I should receive an email at "admin@localhost" with subject "Queensland Government Open Data - Data Request"
+        And I should receive a base64 email at "admin@localhost" containing "A data request assigned to your organisation has been re-opened."
+
+     Scenario: Re-assigning a data request will email the Admin users of the assigned organisation and un-assigned organisation
+        Given "DataRequestOrgAdmin" as the persona
+        When I log in and go to datarequest page
+        And I click the link with text that contains "Add data request"
+        And I fill in title with random text
+        And I fill in "description" with "Test description"
+        And I press the element with xpath "//button[contains(string(), 'Create data request')]"
+        And I press the element with xpath "//a[contains(string(), 'Manage')]"
+        When I wait for 3 seconds
+        # Have to use JS to change the selected value as the behaving framework does not work with autocomplete dropdown
+        Then I execute the script "document.getElementById('field-organizations').value = document.getElementById('field-organizations').options[1].value"
+        And I press the element with xpath "//button[contains(string(), 'Update data request')]"
+        When I wait for 3 seconds
+        Then I should receive an email at "admin@localhost" with subject "Queensland Government Open Data - Data Request"
+        And I should receive a base64 email at "admin@localhost" containing "A data request that was assigned to your organisation has been re-assigned to another organisation."
+        And I should receive an email at "test_org_admin@localhost" with subject "Queensland Government Open Data - Data Request"
+        And I should receive a base64 email at "test_org_admin@localhost" containing "A new data request has been added and assigned to your organisation."
\ No newline at end of file
diff --git a/test/features/environment.py b/test/features/environment.py
new file mode 100644
index 00000000..7bbf8d55
--- /dev/null
+++ b/test/features/environment.py
@@ -0,0 +1,106 @@
+import os
+from behaving import environment as benv
+
+from behaving.web.steps.browser import named_browser
+
+# Path to the root of the project.
+ROOT_PATH = os.path.realpath(os.path.join(os.path.dirname(os.path.realpath(__file__)), '../../'))
+
+# Base URL for relative paths resolution.
+BASE_URL = 'http://ckan:3000/'
+
+# URL of remote Chrome instance.
+REMOTE_CHROME_URL = 'http://chrome:4444/wd/hub'
+
+# @see .docker/scripts/init.sh for credentials.
+PERSONAS = {
+    'SysAdmin': dict(
+        name=u'admin',
+        email=u'admin@localhost',
+        password=u'password'
+    ),
+    'Unathenticated': dict(
+        name=u'',
+        email=u'',
+        password=u''
+    ),
+    # This user will not be assigned to any organisations
+    'CKANUser': dict(
+        name=u'ckan_user',
+        email=u'ckan_user@localhost',
+        password=u'password'
+    ),
+    'TestOrgAdmin': dict(
+        name=u'test_org_admin',
+        email=u'test_org_admin@localhost',
+        password=u'password'
+    ),
+    'TestOrgEditor': dict(
+        name=u'test_org_editor',
+        email=u'test_org_editor@localhost',
+        password=u'password'
+    ),
+    'TestOrgMember': dict(
+        name=u'test_org_member',
+        email=u'test_org_member@localhost',
+        password=u'password'
+    ),
+    'DataRequestOrgAdmin': dict(
+        name=u'dr_admin',
+        email=u'dr_admin@localhost',
+        password=u'password'
+    ),
+    'DataRequestOrgEditor': dict(
+        name=u'dr_editor',
+        email=u'dr_editor@localhost',
+        password=u'password'
+    ),
+    'DataRequestOrgMember': dict(
+        name=u'dr_member',
+        email=u'dr_member@localhost',
+        password=u'password'
+    )
+}
+
+
+def before_all(context):
+    # The path where screenshots will be saved.
+    context.screenshots_dir = os.path.join(ROOT_PATH, 'test/screenshots')
+    # The path where file attachments can be found.
+    context.attachment_dir = os.path.join(ROOT_PATH, 'test/fixtures')
+    # The path where emails can be found.
+    context.mail_path = os.path.join(ROOT_PATH, 'test/emails')
+    # Set base url for all relative links.
+    context.base_url = BASE_URL
+
+    # Always use remote web driver.
+    context.remote_webdriver = 1
+    context.default_browser = 'chrome'
+    context.browser_args = {'url': REMOTE_CHROME_URL}
+
+    # Set the rest of the settings to default Behaving's settings.
+    benv.before_all(context)
+
+
+def after_all(context):
+    benv.after_all(context)
+
+
+def before_feature(context, feature):
+    benv.before_feature(context, feature)
+
+
+def after_feature(context, feature):
+    benv.after_feature(context, feature)
+
+
+def before_scenario(context, scenario):
+    benv.before_scenario(context, scenario)
+    # Always use remote browser.
+    named_browser(context, 'remote')
+    # Set personas.
+    context.personas = PERSONAS
+
+
+def after_scenario(context, scenario):
+    benv.after_scenario(context, scenario)
diff --git a/test/features/homepage.feature b/test/features/homepage.feature
new file mode 100644
index 00000000..b7b1f37a
--- /dev/null
+++ b/test/features/homepage.feature
@@ -0,0 +1,7 @@
+@smoke
+Feature: Homepage
+
+    @homepage
+    Scenario: Smoke test to ensure Homepage is accessible
+        When I go to homepage
+        Then I take a screenshot
diff --git a/test/features/login.feature b/test/features/login.feature
new file mode 100644
index 00000000..99c0b555
--- /dev/null
+++ b/test/features/login.feature
@@ -0,0 +1,20 @@
+@smoke @login
+Feature: Login
+
+    Scenario: Smoke test to ensure Login process works
+        Given "SysAdmin" as the persona
+        When I go to homepage
+        And I click the link with text that contains "Log in"
+        And I fill in "login" with "$name"
+        And I fill in "password" with "$password"
+        # Login is a button without "name" or "id".
+        And I press the element with xpath "//button[contains(string(), 'Login')]"
+        And I take a screenshot
+        Then I should see an element with xpath "//a[contains(string(), 'Log out')]"
+
+    Scenario: Smoke test to ensure Login step works
+        Given "SysAdmin" as the persona
+        When I go to homepage
+        And I click the link with text that contains "Log in"
+        And I log in
+        Then I take a screenshot
diff --git a/test/features/steps/steps.py b/test/features/steps/steps.py
new file mode 100644
index 00000000..f95925b4
--- /dev/null
+++ b/test/features/steps/steps.py
@@ -0,0 +1,70 @@
+from behave import step
+from behaving.web.steps import *  # noqa: F401, F403
+from behaving.personas.steps import *  # noqa: F401, F403
+from behaving.web.steps.url import when_i_visit_url
+from behaving.mail.steps import *
+import random
+import email
+import quopri
+
+@step('I go to homepage')
+def go_to_home(context):
+    when_i_visit_url(context, '/')
+
+@step('I log in')
+def log_in(context):
+
+    assert context.persona
+    context.execute_steps(u"""
+        When I go to homepage
+        And I click the link with text that contains "Log in"
+        And I enter my credentials and login
+        Then I should see an element with xpath "//a[contains(string(), 'Log out')]"
+    """)
+
+@step('I enter my credentials and login')
+def log_in(context):
+
+    assert context.persona
+    context.execute_steps(u"""
+        When I fill in "login" with "$name"
+        And I fill in "password" with "$password"
+        And I press the element with xpath "//button[contains(string(), 'Login')]"
+    """)
+
+@step('I log in and go to datarequest page')
+def log_in_go_to_datarequest(context):
+
+    assert context.persona
+    context.execute_steps(u"""
+        When I go to homepage
+        And I click the link with text that contains "Log in"
+        And I log in
+        And I go to datarequest page
+    """)
+
+@step('I go to datarequest page')
+def go_to_datarequest(context):
+    when_i_visit_url(context, '/datarequest')
+
+@step('I fill in title with random text')
+def title_random_text(context):
+
+    assert context.persona
+    context.execute_steps(u"""
+        When I fill in "title" with "Test Title {0}"
+    """.format(random.randrange(1000)) )
+
+# The default behaving step does not convert base64 emails
+# Modifed the default step to decode the payload from base64
+@step(u'I should receive a base64 email at "{address}" containing "{text}"')
+def should_receive_base64_email_containing_text(context, address, text):
+    def filter_contents(mail):
+        mail = email.message_from_string(mail)
+        payload = mail.get_payload()
+        payload += "=" * ((4 - len(payload) % 4) % 4) # do fix the padding error issue
+        decoded_payload = quopri.decodestring(payload).decode('base64')
+        print ('decoded_payload: ', decoded_payload)
+        return text in decoded_payload
+
+    assert context.mail.user_messages(address, filter_contents)
diff --git a/test/fixtures/.gitkeep b/test/fixtures/.gitkeep
new file mode 100644
index 00000000..e69de29b

From bcb390f338637d5a8b80fdd99db378e8e36a8a49 Mon Sep 17 00:00:00 2001
From: William Dutton <william.dutton@qld.gov.au>
Date: Sun, 1 Sep 2019 22:25:43 +1000
Subject: [PATCH 012/276] Make build work again,

missing extension ckanext-scheming and its dependancies for the theme
---
 requirements-dev.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/requirements-dev.txt b/requirements-dev.txt
index 1f56ac4f..8ce445ec 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -8,5 +8,8 @@ nose_parameterized==0.3.3
 profanityfilter
 lxml==3.4.2
 -e git+https://github.com/qld-gov-au/ckanext-data-qld@develop#egg=ckanext-data_qld
+-e git+https://github.com/ckan/ckantoolkit@release-0.0.4#egg=ckantoolkit
+-e git+https://github.com/ckan/ckanapi@ckanapi-4.3#egg=ckanapi
+-e git+https://github.com/ckan/ckanext-scheming@release-1.2.0#egg=ckanext-scheming
 -e git+https://github.com/qld-gov-au/ckanext-data-qld-theme@develop#egg=ckanext-data_qld_theme
 -e git+https://github.com/qld-gov-au/ckanext-ytp-comments@develop#egg=ckanext-ytp-comments

From c2a6d495dfad4b1360311ab084464af4c7fffb79 Mon Sep 17 00:00:00 2001
From: William Dutton <william.dutton@qld.gov.au>
Date: Sun, 1 Sep 2019 22:25:43 +1000
Subject: [PATCH 013/276] Make build work again,

missing extension ckanext-scheming and its dependancies for the theme
---
 requirements-dev.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/requirements-dev.txt b/requirements-dev.txt
index 1f56ac4f..8ce445ec 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -8,5 +8,8 @@ nose_parameterized==0.3.3
 profanityfilter
 lxml==3.4.2
 -e git+https://github.com/qld-gov-au/ckanext-data-qld@develop#egg=ckanext-data_qld
+-e git+https://github.com/ckan/ckantoolkit@release-0.0.4#egg=ckantoolkit
+-e git+https://github.com/ckan/ckanapi@ckanapi-4.3#egg=ckanapi
+-e git+https://github.com/ckan/ckanext-scheming@release-1.2.0#egg=ckanext-scheming
 -e git+https://github.com/qld-gov-au/ckanext-data-qld-theme@develop#egg=ckanext-data_qld_theme
 -e git+https://github.com/qld-gov-au/ckanext-ytp-comments@develop#egg=ckanext-ytp-comments

From 0f229b4bd9c8b4b5a553928406791e37a2d2fb1a Mon Sep 17 00:00:00 2001
From: William Dutton <william.dutton@qld.gov.au>
Date: Wed, 23 Oct 2019 16:55:35 +1000
Subject: [PATCH 014/276] update for proxy

---
 .docker/Dockerfile.ckan             |  2 +-
 .docker/scripts/create-test-data.sh | 48 ++++++++++++++---------------
 docker-compose.yml                  |  1 +
 3 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/.docker/Dockerfile.ckan b/.docker/Dockerfile.ckan
index 260bcd24..e95d8f7a 100644
--- a/.docker/Dockerfile.ckan
+++ b/.docker/Dockerfile.ckan
@@ -6,7 +6,7 @@ ARG SITE_URL
 ENV SITE_URL="${SITE_URL}"
 
 ENV DOCKERIZE_VERSION v0.6.1
-RUN wget https://github.com/jwilder/dockerize/releases/download/${DOCKERIZE_VERSION}/dockerize-alpine-linux-amd64-${DOCKERIZE_VERSION}.tar.gz \
+RUN apk add --no-cache curl && curl -s -L -O https://github.com/jwilder/dockerize/releases/download/${DOCKERIZE_VERSION}/dockerize-alpine-linux-amd64-${DOCKERIZE_VERSION}.tar.gz \
     && tar -C /usr/local/bin -xzvf dockerize-alpine-linux-amd64-${DOCKERIZE_VERSION}.tar.gz \
     && rm dockerize-alpine-linux-amd64-${DOCKERIZE_VERSION}.tar.gz
 
diff --git a/.docker/scripts/create-test-data.sh b/.docker/scripts/create-test-data.sh
index 9ea0ffaa..8e375be1 100644
--- a/.docker/scripts/create-test-data.sh
+++ b/.docker/scripts/create-test-data.sh
@@ -30,8 +30,8 @@ paster --plugin=ckan user add test_org_member email=test_org_member@localhost pa
 echo "Creating ${TEST_ORG_TITLE} Organisation:"
 
 TEST_ORG=$( \
-    wget -O- --header="Authorization: ${API_KEY}" \
-    --post-data "name=${TEST_ORG_NAME}&title=${TEST_ORG_TITLE}" \
+    curl -L -s -O- ---header "Authorization: ${API_KEY}" \
+    --data "name=${TEST_ORG_NAME}&title=${TEST_ORG_TITLE}" \
     ${CKAN_ACTION_URL}/organization_create
 )
 
@@ -39,16 +39,16 @@ TEST_ORG_ID=$(echo $TEST_ORG | sed -r 's/^(.*)"id": "(.*)",(.*)/\2/')
 
 echo "Assigning test users to ${TEST_ORG_TITLE} Organisation:"
 
-wget -O- --header="Authorization: ${API_KEY}" \
-    --post-data "id=${TEST_ORG_ID}&object=test_org_admin&object_type=user&capacity=admin" \
+curl -L -s -O- ---header "Authorization: ${API_KEY}" \
+    --data "id=${TEST_ORG_ID}&object=test_org_admin&object_type=user&capacity=admin" \
     ${CKAN_ACTION_URL}/member_create
 
-wget -O- --header="Authorization: ${API_KEY}" \
-    --post-data "id=${TEST_ORG_ID}&object=test_org_editor&object_type=user&capacity=editor" \
+curl -L -s -O- ---header "Authorization: ${API_KEY}" \
+    --data "id=${TEST_ORG_ID}&object=test_org_editor&object_type=user&capacity=editor" \
     ${CKAN_ACTION_URL}/member_create
 
-wget -O- --header="Authorization: ${API_KEY}" \
-    --post-data "id=${TEST_ORG_ID}&object=test_org_member&object_type=user&capacity=member" \
+curl -L -s -O- ---header "Authorization: ${API_KEY}" \
+    --data "id=${TEST_ORG_ID}&object=test_org_member&object_type=user&capacity=member" \
     ${CKAN_ACTION_URL}/member_create
 ##
 # END.
@@ -70,8 +70,8 @@ paster --plugin=ckan user add dr_member email=dr_member@localhost password=passw
 echo "Creating ${DR_ORG_TITLE} Organisation:"
 
 DR_ORG=$( \
-    wget -O- --header="Authorization: ${API_KEY}" \
-    --post-data "name=${DR_ORG_NAME}&title=${DR_ORG_TITLE}" \
+    curl -L -s -O- ---header "Authorization: ${API_KEY}" \
+    --data "name=${DR_ORG_NAME}&title=${DR_ORG_TITLE}" \
     ${CKAN_ACTION_URL}/organization_create
 )
 
@@ -79,31 +79,31 @@ DR_ORG_ID=$(echo $DR_ORG | sed -r 's/^(.*)"id": "(.*)",(.*)/\2/')
 
 echo "Assigning test users to ${DR_ORG_TITLE} Organisation:"
 
-wget -O- --header="Authorization: ${API_KEY}" \
-    --post-data "id=${DR_ORG_ID}&object=dr_admin&object_type=user&capacity=admin" \
+curl -L -s -O- ---header "Authorization: ${API_KEY}" \
+    --data "id=${DR_ORG_ID}&object=dr_admin&object_type=user&capacity=admin" \
     ${CKAN_ACTION_URL}/member_create
 
-wget -O- --header="Authorization: ${API_KEY}" \
-    --post-data "id=${DR_ORG_ID}&object=dr_editor&object_type=user&capacity=editor" \
+curl -L -s -O- ---header "Authorization: ${API_KEY}" \
+    --data "id=${DR_ORG_ID}&object=dr_editor&object_type=user&capacity=editor" \
     ${CKAN_ACTION_URL}/member_create
 
-wget -O- --header="Authorization: ${API_KEY}" \
-    --post-data "id=${DR_ORG_ID}&object=dr_member&object_type=user&capacity=member" \
+curl -L -s -O- ---header "Authorization: ${API_KEY}" \
+    --data "id=${DR_ORG_ID}&object=dr_member&object_type=user&capacity=member" \
     ${CKAN_ACTION_URL}/member_create
 
 
 echo "Creating test Data Request:"
 
-wget -O- --header="Authorization: ${API_KEY}" \
-    --post-data "title=Test Request&description=This is an example&organization_id=${DR_ORG_ID}" \
+curl -L -s -O- ---header "Authorization: ${API_KEY}" \
+    --data "title=Test Request&description=This is an example&organization_id=${DR_ORG_ID}" \
     ${CKAN_ACTION_URL}/create_datarequest
 
 echo "Creating closed Data Request:"
 
 Closed_DR=$( \
-    wget -O- \
-    --header="Authorization: ${API_KEY}" \
-    --post-data "title=Closed Request&description=This is an example&organization_id=${DR_ORG_ID}" \
+    curl -L -s -O- \
+    ---header "Authorization: ${API_KEY}" \
+    --data "title=Closed Request&description=This is an example&organization_id=${DR_ORG_ID}" \
     ${CKAN_ACTION_URL}/create_datarequest \
 )
 
@@ -115,8 +115,8 @@ echo $CLOSE_DR_ID
 
 echo "Closing Data Request:"
 
-wget -O- --header="Authorization: ${API_KEY}" \
-    --post-data "id=${CLOSE_DR_ID}" \
+curl -L -s -O- ---header "Authorization: ${API_KEY}" \
+    --data "id=${CLOSE_DR_ID}" \
     ${CKAN_ACTION_URL}/close_datarequest
 
 ##
@@ -124,4 +124,4 @@ wget -O- --header="Authorization: ${API_KEY}" \
 #
 
 
-deactivate
\ No newline at end of file
+deactivate
diff --git a/docker-compose.yml b/docker-compose.yml
index 1f00400f..44824d17 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -14,6 +14,7 @@ x-volumes:
 x-environment:
   &default-environment
   AMAZEEIO: AMAZEEIO
+  no_proxy: "ckan,postgres,postgres-datastore,redis,solr,chrome,mailhog.docker.amazee.io"
 
 x-user:
   &default-user

From b19a624d05522e624321f7664df11f511dba9bb5 Mon Sep 17 00:00:00 2001
From: William Dutton <william.dutton@qld.gov.au>
Date: Thu, 24 Oct 2019 17:04:40 +1000
Subject: [PATCH 015/276] typo

---
 .docker/scripts/create-test-data.sh | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/.docker/scripts/create-test-data.sh b/.docker/scripts/create-test-data.sh
index 8e375be1..f20e5463 100644
--- a/.docker/scripts/create-test-data.sh
+++ b/.docker/scripts/create-test-data.sh
@@ -30,7 +30,7 @@ paster --plugin=ckan user add test_org_member email=test_org_member@localhost pa
 echo "Creating ${TEST_ORG_TITLE} Organisation:"
 
 TEST_ORG=$( \
-    curl -L -s -O- ---header "Authorization: ${API_KEY}" \
+    curl -L -s ---header "Authorization: ${API_KEY}" \
     --data "name=${TEST_ORG_NAME}&title=${TEST_ORG_TITLE}" \
     ${CKAN_ACTION_URL}/organization_create
 )
@@ -39,15 +39,15 @@ TEST_ORG_ID=$(echo $TEST_ORG | sed -r 's/^(.*)"id": "(.*)",(.*)/\2/')
 
 echo "Assigning test users to ${TEST_ORG_TITLE} Organisation:"
 
-curl -L -s -O- ---header "Authorization: ${API_KEY}" \
+curl -L -s ---header "Authorization: ${API_KEY}" \
     --data "id=${TEST_ORG_ID}&object=test_org_admin&object_type=user&capacity=admin" \
     ${CKAN_ACTION_URL}/member_create
 
-curl -L -s -O- ---header "Authorization: ${API_KEY}" \
+curl -L -s ---header "Authorization: ${API_KEY}" \
     --data "id=${TEST_ORG_ID}&object=test_org_editor&object_type=user&capacity=editor" \
     ${CKAN_ACTION_URL}/member_create
 
-curl -L -s -O- ---header "Authorization: ${API_KEY}" \
+curl -L -s ---header "Authorization: ${API_KEY}" \
     --data "id=${TEST_ORG_ID}&object=test_org_member&object_type=user&capacity=member" \
     ${CKAN_ACTION_URL}/member_create
 ##
@@ -70,7 +70,7 @@ paster --plugin=ckan user add dr_member email=dr_member@localhost password=passw
 echo "Creating ${DR_ORG_TITLE} Organisation:"
 
 DR_ORG=$( \
-    curl -L -s -O- ---header "Authorization: ${API_KEY}" \
+    curl -L -s ---header "Authorization: ${API_KEY}" \
     --data "name=${DR_ORG_NAME}&title=${DR_ORG_TITLE}" \
     ${CKAN_ACTION_URL}/organization_create
 )
@@ -79,29 +79,29 @@ DR_ORG_ID=$(echo $DR_ORG | sed -r 's/^(.*)"id": "(.*)",(.*)/\2/')
 
 echo "Assigning test users to ${DR_ORG_TITLE} Organisation:"
 
-curl -L -s -O- ---header "Authorization: ${API_KEY}" \
+curl -L -s ---header "Authorization: ${API_KEY}" \
     --data "id=${DR_ORG_ID}&object=dr_admin&object_type=user&capacity=admin" \
     ${CKAN_ACTION_URL}/member_create
 
-curl -L -s -O- ---header "Authorization: ${API_KEY}" \
+curl -L -s ---header "Authorization: ${API_KEY}" \
     --data "id=${DR_ORG_ID}&object=dr_editor&object_type=user&capacity=editor" \
     ${CKAN_ACTION_URL}/member_create
 
-curl -L -s -O- ---header "Authorization: ${API_KEY}" \
+curl -L -s ---header "Authorization: ${API_KEY}" \
     --data "id=${DR_ORG_ID}&object=dr_member&object_type=user&capacity=member" \
     ${CKAN_ACTION_URL}/member_create
 
 
 echo "Creating test Data Request:"
 
-curl -L -s -O- ---header "Authorization: ${API_KEY}" \
+curl -L -s ---header "Authorization: ${API_KEY}" \
     --data "title=Test Request&description=This is an example&organization_id=${DR_ORG_ID}" \
     ${CKAN_ACTION_URL}/create_datarequest
 
 echo "Creating closed Data Request:"
 
 Closed_DR=$( \
-    curl -L -s -O- \
+    curl -L -s \
     ---header "Authorization: ${API_KEY}" \
     --data "title=Closed Request&description=This is an example&organization_id=${DR_ORG_ID}" \
     ${CKAN_ACTION_URL}/create_datarequest \
@@ -115,7 +115,7 @@ echo $CLOSE_DR_ID
 
 echo "Closing Data Request:"
 
-curl -L -s -O- ---header "Authorization: ${API_KEY}" \
+curl -L -s ---header "Authorization: ${API_KEY}" \
     --data "id=${CLOSE_DR_ID}" \
     ${CKAN_ACTION_URL}/close_datarequest
 

From d706fab62c5867e86be372eac2af017f2cb53070 Mon Sep 17 00:00:00 2001
From: William Dutton <william.dutton@qld.gov.au>
Date: Fri, 25 Oct 2019 07:25:18 +1000
Subject: [PATCH 016/276] typo

---
 .docker/scripts/create-test-data.sh | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/.docker/scripts/create-test-data.sh b/.docker/scripts/create-test-data.sh
index f20e5463..8c29bb9f 100644
--- a/.docker/scripts/create-test-data.sh
+++ b/.docker/scripts/create-test-data.sh
@@ -30,7 +30,7 @@ paster --plugin=ckan user add test_org_member email=test_org_member@localhost pa
 echo "Creating ${TEST_ORG_TITLE} Organisation:"
 
 TEST_ORG=$( \
-    curl -L -s ---header "Authorization: ${API_KEY}" \
+    curl -L -s --header "Authorization: ${API_KEY}" \
     --data "name=${TEST_ORG_NAME}&title=${TEST_ORG_TITLE}" \
     ${CKAN_ACTION_URL}/organization_create
 )
@@ -39,15 +39,15 @@ TEST_ORG_ID=$(echo $TEST_ORG | sed -r 's/^(.*)"id": "(.*)",(.*)/\2/')
 
 echo "Assigning test users to ${TEST_ORG_TITLE} Organisation:"
 
-curl -L -s ---header "Authorization: ${API_KEY}" \
+curl -L -s --header "Authorization: ${API_KEY}" \
     --data "id=${TEST_ORG_ID}&object=test_org_admin&object_type=user&capacity=admin" \
     ${CKAN_ACTION_URL}/member_create
 
-curl -L -s ---header "Authorization: ${API_KEY}" \
+curl -L -s --header "Authorization: ${API_KEY}" \
     --data "id=${TEST_ORG_ID}&object=test_org_editor&object_type=user&capacity=editor" \
     ${CKAN_ACTION_URL}/member_create
 
-curl -L -s ---header "Authorization: ${API_KEY}" \
+curl -L -s --header "Authorization: ${API_KEY}" \
     --data "id=${TEST_ORG_ID}&object=test_org_member&object_type=user&capacity=member" \
     ${CKAN_ACTION_URL}/member_create
 ##
@@ -70,7 +70,7 @@ paster --plugin=ckan user add dr_member email=dr_member@localhost password=passw
 echo "Creating ${DR_ORG_TITLE} Organisation:"
 
 DR_ORG=$( \
-    curl -L -s ---header "Authorization: ${API_KEY}" \
+    curl -L -s --header "Authorization: ${API_KEY}" \
     --data "name=${DR_ORG_NAME}&title=${DR_ORG_TITLE}" \
     ${CKAN_ACTION_URL}/organization_create
 )
@@ -79,22 +79,22 @@ DR_ORG_ID=$(echo $DR_ORG | sed -r 's/^(.*)"id": "(.*)",(.*)/\2/')
 
 echo "Assigning test users to ${DR_ORG_TITLE} Organisation:"
 
-curl -L -s ---header "Authorization: ${API_KEY}" \
+curl -L -s --header "Authorization: ${API_KEY}" \
     --data "id=${DR_ORG_ID}&object=dr_admin&object_type=user&capacity=admin" \
     ${CKAN_ACTION_URL}/member_create
 
-curl -L -s ---header "Authorization: ${API_KEY}" \
+curl -L -s --header "Authorization: ${API_KEY}" \
     --data "id=${DR_ORG_ID}&object=dr_editor&object_type=user&capacity=editor" \
     ${CKAN_ACTION_URL}/member_create
 
-curl -L -s ---header "Authorization: ${API_KEY}" \
+curl -L -s --header "Authorization: ${API_KEY}" \
     --data "id=${DR_ORG_ID}&object=dr_member&object_type=user&capacity=member" \
     ${CKAN_ACTION_URL}/member_create
 
 
 echo "Creating test Data Request:"
 
-curl -L -s ---header "Authorization: ${API_KEY}" \
+curl -L -s --header "Authorization: ${API_KEY}" \
     --data "title=Test Request&description=This is an example&organization_id=${DR_ORG_ID}" \
     ${CKAN_ACTION_URL}/create_datarequest
 
@@ -102,7 +102,7 @@ echo "Creating closed Data Request:"
 
 Closed_DR=$( \
     curl -L -s \
-    ---header "Authorization: ${API_KEY}" \
+    --header "Authorization: ${API_KEY}" \
     --data "title=Closed Request&description=This is an example&organization_id=${DR_ORG_ID}" \
     ${CKAN_ACTION_URL}/create_datarequest \
 )
@@ -115,7 +115,7 @@ echo $CLOSE_DR_ID
 
 echo "Closing Data Request:"
 
-curl -L -s ---header "Authorization: ${API_KEY}" \
+curl -L -s --header "Authorization: ${API_KEY}" \
     --data "id=${CLOSE_DR_ID}" \
     ${CKAN_ACTION_URL}/close_datarequest
 

From b7829ea2c954a5cbd6ed8a8510f4b431f7f567d5 Mon Sep 17 00:00:00 2001
From: Mark Calvert <mark.calvert@salsadigital.com.au>
Date: Wed, 30 Oct 2019 12:59:32 -0700
Subject: [PATCH 017/276] Added configurable description is mandatory feature

---
 README.md                                                     | 4 ++++
 ckanext/datarequests/plugin.py                                | 4 +++-
 .../templates/datarequests/snippets/datarequest_form.html     | 3 ++-
 ckanext/datarequests/validator.py                             | 4 ++++
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index ce42effb..4668be56 100644
--- a/README.md
+++ b/README.md
@@ -207,6 +207,10 @@ ckan.datarequests.comments = [true|false]
 ```
 ckan.datarequests.show_datarequests_badge = [true|false]
 ```
+* Enable or disable description as a required field on data request forms
+```
+ckan.datarequests.description_required = [true|false]
+```
 * Restart your apache2 reserver
 ```
 sudo service apache2 restart
diff --git a/ckanext/datarequests/plugin.py b/ckanext/datarequests/plugin.py
index d2c78c3a..07e918f5 100644
--- a/ckanext/datarequests/plugin.py
+++ b/ckanext/datarequests/plugin.py
@@ -68,6 +68,7 @@ def __init__(self, name=None):
         self.comments_enabled = get_config_bool_value('ckan.datarequests.comments', True)
         self._show_datarequests_badge = get_config_bool_value('ckan.datarequests.show_datarequests_badge')
         self.name = 'datarequests'
+        self.is_description_required = get_config_bool_value('ckan.datarequests.description_required', False)
 
     ######################################################################
     ############################## IACTIONS ##############################
@@ -215,7 +216,8 @@ def get_helpers(self):
             'get_open_datarequests_number': helpers.get_open_datarequests_number,
             'get_open_datarequests_badge': partial(helpers.get_open_datarequests_badge, self._show_datarequests_badge),
             'get_plus_icon': get_plus_icon,
-            'is_following_datarequest': helpers.is_following_datarequest
+            'is_following_datarequest': helpers.is_following_datarequest,
+            'is_description_required': self.is_description_required
         }
 
     ######################################################################
diff --git a/ckanext/datarequests/templates/datarequests/snippets/datarequest_form.html b/ckanext/datarequests/templates/datarequests/snippets/datarequest_form.html
index e8e53354..08fa8ea4 100644
--- a/ckanext/datarequests/templates/datarequests/snippets/datarequest_form.html
+++ b/ckanext/datarequests/templates/datarequests/snippets/datarequest_form.html
@@ -5,6 +5,7 @@
 {% set organization_id = data.get('organization_id', h.get_request_param('organization')) %}
 {% set organizations_available = h.organizations_available('read') %}
 {% set form_horizontal = 'form-horizontal' if h.ckan_version()[:3] <= '2.7' else '' %}
+{% set description_required = h.is_description_required %}
 
 {# This provides a full page that renders a form for publishing a dataset. It can
 then itself be extended to add/remove blocks of functionality. #}
@@ -19,7 +20,7 @@
   {% endblock %}
 
   {% block offering_description %}
-    {{ form.markdown('description', id='field-description', label=_('Description'), placeholder=_('eg. Data Request description'), value=description, error=errors['Description']) }}
+  {{ form.markdown('description', id='field-description', label=_('Description'), placeholder=_('eg. Data Request description'), value=description, error=errors['Description'], is_required=description_required) }}
   {% endblock %}
 
   <div class="control-group form-group">
diff --git a/ckanext/datarequests/validator.py b/ckanext/datarequests/validator.py
index b195f6b7..1302ccab 100644
--- a/ckanext/datarequests/validator.py
+++ b/ckanext/datarequests/validator.py
@@ -20,6 +20,7 @@
 import constants
 import ckan.plugins.toolkit as tk
 import ckanext.datarequests.db as db
+import plugin as datarequests
 
 
 def validate_datarequest(context, request_data):
@@ -41,6 +42,9 @@ def validate_datarequest(context, request_data):
             errors[tk._('Title')] = [tk._('That title is already in use')]
 
     # Check description
+    if datarequests.get_config_bool_value('ckan.datarequests.description_required', False) and not request_data['description']:
+        errors[tk._('Description')] = [tk._('Description cannot be empty')]
+
     if len(request_data['description']) > constants.DESCRIPTION_MAX_LENGTH:
         errors[tk._('Description')] = [tk._('Description must be a maximum of %d characters long') % constants.DESCRIPTION_MAX_LENGTH]
 

From b1beb05afd5d03f99d565225800bb3f0523b5a29 Mon Sep 17 00:00:00 2001
From: Mark Calvert <mark.calvert@salsadigital.com.au>
Date: Wed, 30 Oct 2019 13:42:06 -0700
Subject: [PATCH 018/276] Update readme with default value for
 description_required

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 4668be56..a242abad 100644
--- a/README.md
+++ b/README.md
@@ -207,9 +207,9 @@ ckan.datarequests.comments = [true|false]
 ```
 ckan.datarequests.show_datarequests_badge = [true|false]
 ```
-* Enable or disable description as a required field on data request forms
+* Enable or disable description as a required field on data request forms. False by default
 ```
-ckan.datarequests.description_required = [true|false]
+ckan.datarequests.description_required = [True|False]
 ```
 * Restart your apache2 reserver
 ```

From 657e01a9779501b297aab26e78bdcf5c95386984 Mon Sep 17 00:00:00 2001
From: Costin Bleotu <costi.bleotu@gmail.com>
Date: Sat, 14 Dec 2019 15:51:08 +0200
Subject: [PATCH 019/276] Added .eggs

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 55c0f302..e92db84a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,6 +26,7 @@ var/
 *.egg-info/
 .installed.cfg
 *.egg
+*.eggs
 
 # PyInstaller
 #  Usually these files are written by a python script from a template

From c62d086e08999827b8c711e17e1e1f54991829da Mon Sep 17 00:00:00 2001
From: Costin Bleotu <costi.bleotu@gmail.com>
Date: Sat, 14 Dec 2019 15:51:19 +0200
Subject: [PATCH 020/276] Added RO

---
 .../ro/LC_MESSAGES/ckanext-datarequests.po    | 508 ++++++++++++++++++
 1 file changed, 508 insertions(+)
 create mode 100644 ckanext/datarequests/i18n/ro/LC_MESSAGES/ckanext-datarequests.po

diff --git a/ckanext/datarequests/i18n/ro/LC_MESSAGES/ckanext-datarequests.po b/ckanext/datarequests/i18n/ro/LC_MESSAGES/ckanext-datarequests.po
new file mode 100644
index 00000000..a096cb16
--- /dev/null
+++ b/ckanext/datarequests/i18n/ro/LC_MESSAGES/ckanext-datarequests.po
@@ -0,0 +1,508 @@
+# Romanian translations for ckanext-datarequests.
+# Copyright (C) 2016 ORGANIZATION
+# This file is distributed under the same license as the
+# ckanext-datarequests
+# project.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2016.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ckanext-datarequests 0.3.1\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2016-04-28 14:45+0200\n"
+"PO-Revision-Date: 2019-12-14 15:49+0200\n"
+"Language: ro\n"
+"Language-Team: ro <LL@li.org>\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 "
+"< 20)) ? 1 : 2);\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.3.4\n"
+"Last-Translator: \n"
+"X-Generator: Poedit 2.2.4\n"
+
+#: ckanext/datarequests/actions.py:192 ckanext/datarequests/actions.py:244
+#: ckanext/datarequests/actions.py:435 ckanext/datarequests/actions.py:480
+#: ckanext/datarequests/actions.py:536 ckanext/datarequests/actions.py:624
+msgid "Data Request ID has not been included"
+msgstr "ID-ul cererii nu a fost inclus"
+
+#: ckanext/datarequests/actions.py:203 ckanext/datarequests/actions.py:255
+#: ckanext/datarequests/actions.py:446 ckanext/datarequests/actions.py:491
+#, python-format
+msgid "Data Request %s not found in the data base"
+msgstr "Cererea %s nu a fost găsită in baza de date"
+
+#: ckanext/datarequests/actions.py:500
+msgid "This Data Request is already closed"
+msgstr "Această cerere a fost deja închisă"
+
+#: ckanext/datarequests/actions.py:578 ckanext/datarequests/actions.py:671
+#: ckanext/datarequests/actions.py:717
+msgid "Comment ID has not been included"
+msgstr "ID-ul comentariului nu a fost inclus"
+
+#: ckanext/datarequests/actions.py:589 ckanext/datarequests/actions.py:682
+#: ckanext/datarequests/actions.py:728
+#, python-format
+msgid "Comment %s not found in the data base"
+msgstr "Comentariul %s nu a fost găsit in baza de date"
+
+#: ckanext/datarequests/templates/datarequests/snippets/datarequest_form.html:17
+#: ckanext/datarequests/validator.py:31 ckanext/datarequests/validator.py:34
+#: ckanext/datarequests/validator.py:41
+msgid "Title"
+msgstr "Titlu"
+
+#: ckanext/datarequests/validator.py:31
+#, python-format
+msgid "Title must be a maximum of %d characters long"
+msgstr "Titlul trebuie sa aibe maxim %d caracterre"
+
+#: ckanext/datarequests/validator.py:34
+msgid "Title cannot be empty"
+msgstr "Titlu nu poate fi nul"
+
+#: ckanext/datarequests/validator.py:41
+msgid "That title is already in use"
+msgstr "Aceest titlu este deja folosit"
+
+#: ckanext/datarequests/templates/datarequests/snippets/datarequest_form.html:21
+#: ckanext/datarequests/validator.py:45
+msgid "Description"
+msgstr "Descriere"
+
+#: ckanext/datarequests/validator.py:45
+#, python-format
+msgid "Description must be a maximum of %d characters long"
+msgstr "Descrierea trebuie sa aibe maxim %d caractere"
+
+#: ckanext/datarequests/templates/datarequests/snippets/additional_info.html:11
+#: ckanext/datarequests/templates/datarequests/snippets/datarequest_form.html:25
+#: ckanext/datarequests/validator.py:52
+msgid "Organization"
+msgstr "Organizație"
+
+#: ckanext/datarequests/validator.py:52
+msgid "Organization is not valid"
+msgstr "Organizația un este validă"
+
+#: ckanext/datarequests/templates/datarequests/snippets/additional_info.html:24
+#: ckanext/datarequests/validator.py:65
+msgid "Accepted Dataset"
+msgstr "Set de date acceptat"
+
+#: ckanext/datarequests/validator.py:65
+msgid "Dataset not found"
+msgstr "Setul de date nu a fost găsit"
+
+#: ckanext/datarequests/templates/datarequests/base.html:17
+#: ckanext/datarequests/templates/datarequests/show.html:25
+#: ckanext/datarequests/validator.py:75
+msgid "Data Request"
+msgstr "Cerere de Date"
+
+#: ckanext/datarequests/validator.py:75
+msgid "Data Request not found"
+msgstr "Cererea de date nu a fost găsită"
+
+#: ckanext/datarequests/validator.py:78 ckanext/datarequests/validator.py:81
+msgid "Comment"
+msgstr "Comentariu"
+
+#: ckanext/datarequests/validator.py:78
+msgid "Comments must be a minimum of 1 character long"
+msgstr "Comentariile trebuie să aibe minim un caracter"
+
+#: ckanext/datarequests/validator.py:81
+#, python-format
+msgid "Comments must be a maximum of %d characters long"
+msgstr "Comentariile trebuie sa aibe maxim %d caractere"
+
+#: ckanext/datarequests/controllers/ui_controller.py:129
+msgid "Newest"
+msgstr "Cele mai recente"
+
+#: ckanext/datarequests/controllers/ui_controller.py:129
+msgid "Oldest"
+msgstr "Cele mai vechi"
+
+#: ckanext/datarequests/controllers/ui_controller.py:145
+#: ckanext/datarequests/tests/test_ui_controller.py:628
+msgid "State"
+msgstr "Stare"
+
+#: ckanext/datarequests/controllers/ui_controller.py:150
+#: ckanext/datarequests/templates/header.html:6
+#: ckanext/datarequests/tests/test_ui_controller.py:630
+msgid "Organizations"
+msgstr "Organizații"
+
+#: ckanext/datarequests/controllers/ui_controller.py:156
+msgid "\"page\" parameter must be an integer"
+msgstr "parametrul “page” trebuie sa fie de tip integer"
+
+#: ckanext/datarequests/controllers/ui_controller.py:159
+msgid "Unauthorized to list Data Requests"
+msgstr "Neautorizat pentru listarea de cereri de date"
+
+#: ckanext/datarequests/controllers/ui_controller.py:210
+msgid "Unauthorized to create a Data Request"
+msgstr "Neautorizat pentru crearea de cereri de date"
+
+#: ckanext/datarequests/controllers/ui_controller.py:225
+#: ckanext/datarequests/controllers/ui_controller.py:248
+#: ckanext/datarequests/controllers/ui_controller.py:265
+#: ckanext/datarequests/controllers/ui_controller.py:334
+#: ckanext/datarequests/controllers/ui_controller.py:401
+#, python-format
+msgid "Data Request %s not found"
+msgstr "Cererea de date %s nu a fost  găsită"
+
+#: ckanext/datarequests/controllers/ui_controller.py:228
+#, python-format
+msgid "You are not authorized to view the Data Request %s"
+msgstr "Nu ești autorizat să vizualizezi cererea de date %s"
+
+#: ckanext/datarequests/controllers/ui_controller.py:251
+#, python-format
+msgid "You are not authorized to update the Data Request %s"
+msgstr "Nu ești autorizat să actualizezi cererea de date %s"
+
+#: ckanext/datarequests/controllers/ui_controller.py:261
+#: ckanext/datarequests/tests/test_ui_controller.py:672
+#, python-format
+msgid "Data Request %s has been deleted"
+msgstr "Cererea de date %s a fost ștearsă"
+
+#: ckanext/datarequests/controllers/ui_controller.py:268
+#, python-format
+msgid "You are not authorized to delete the Data Request %s"
+msgstr "Nu ești autorizat să ștergi cererea de date %s"
+
+#: ckanext/datarequests/controllers/ui_controller.py:316
+msgid "This data request is already closed"
+msgstr "Cererea este deja închisă"
+
+#: ckanext/datarequests/controllers/ui_controller.py:337
+#, python-format
+msgid "You are not authorized to close the Data Request %s"
+msgstr "Nu ești autorizat sa închizi cererea de date %s"
+
+#: ckanext/datarequests/controllers/ui_controller.py:366
+msgid "Comment has been published"
+msgstr "Comentariul a fost publicat"
+
+#: ckanext/datarequests/controllers/ui_controller.py:368
+msgid "Comment has been updated"
+msgstr "Comentariul a fost actualizat"
+
+#: ckanext/datarequests/controllers/ui_controller.py:374
+#, python-format
+msgid "You are not authorized to %s"
+msgstr "Nu ești autorizat să %s"
+
+#: ckanext/datarequests/controllers/ui_controller.py:405
+#, python-format
+msgid "You are not authorized to list the comments of the Data Request %s"
+msgstr "Nu ești autorizat să listezi comentariile pentru cererea %s"
+
+#: ckanext/datarequests/controllers/ui_controller.py:414
+msgid "Comment has been deleted"
+msgstr "Comentariul a fost șters"
+
+#: ckanext/datarequests/controllers/ui_controller.py:419
+#, python-format
+msgid "Comment %s not found"
+msgstr "Comentariul %s nu a fost găsit"
+
+#: ckanext/datarequests/controllers/ui_controller.py:422
+msgid "You are not authorized to delete this comment"
+msgstr "Nu ești autorizat să ștergi acest comentariu"
+
+#: ckanext/datarequests/templates/header.html:5
+#: ckanext/datarequests/templates/organization/read_base.html:4
+#: ckanext/datarequests/templates/user/read_base.html:4
+msgid "Datasets"
+msgstr "Seturi de date"
+
+#: ckanext/datarequests/templates/header.html:7
+msgid "Groups"
+msgstr "Grupuri"
+
+#: ckanext/datarequests/templates/datarequests/base.html:8
+#: ckanext/datarequests/templates/datarequests/base.html:11
+#: ckanext/datarequests/templates/datarequests/close.html:6
+#: ckanext/datarequests/templates/datarequests/edit.html:6
+#: ckanext/datarequests/templates/datarequests/new.html:6
+#: ckanext/datarequests/templates/datarequests/show.html:8
+#: ckanext/datarequests/templates/header.html:8
+#: ckanext/datarequests/templates/organization/read_base.html:6
+#: ckanext/datarequests/templates/user/read_base.html:6
+msgid "Data Requests"
+msgstr "Cereri de date"
+
+#: ckanext/datarequests/templates/header.html:9
+#: ckanext/datarequests/templates/organization/read_base.html:7
+msgid "About"
+msgstr "Despree"
+
+#: ckanext/datarequests/templates/datarequests/base.html:20
+msgid ""
+"Data Requests allow users to ask for data that is not published in the "
+"platform yet. If you want some specific data and you are not able to find "
+"it among all the published datasets, you can create a new data request "
+"specifying the data than you want to get."
+msgstr ""
+"Cererile de date permit utilizatorilor să ceara date care încă nu au fost "
+"publicate pe acest portal încă. Dacă dorești un set de date pe care nu ai "
+"reușit să îl găsești, poți crea o nouă cerere specificând datele pe care "
+"le dorești."
+
+#: ckanext/datarequests/templates/datarequests/close.html:3
+#: ckanext/datarequests/templates/datarequests/close.html:8
+#: ckanext/datarequests/templates/datarequests/close.html:12
+#: ckanext/datarequests/templates/datarequests/snippets/close_datarequest_form.html:25
+msgid "Close Data Request"
+msgstr "Închide cererea de date"
+
+#: ckanext/datarequests/templates/datarequests/comment.html:5
+#: ckanext/datarequests/templates/datarequests/show.html:28
+msgid "Comments"
+msgstr "Comentarii"
+
+#: ckanext/datarequests/templates/datarequests/edit.html:3
+#: ckanext/datarequests/templates/datarequests/edit.html:8
+#: ckanext/datarequests/templates/datarequests/edit.html:12
+msgid "Edit Data Request"
+msgstr "Editează cererea"
+
+#: ckanext/datarequests/templates/datarequests/index.html:9
+#: ckanext/datarequests/templates/organization/datarequests.html:10
+msgid "Add Data Request"
+msgstr "Adaugă cerere"
+
+#: ckanext/datarequests/templates/datarequests/index.html:12
+#: ckanext/datarequests/templates/organization/datarequests.html:13
+#: ckanext/datarequests/templates/user/datarequests.html:9
+msgid "Search Data Requests..."
+msgstr "Caută cereri..."
+
+#: ckanext/datarequests/templates/datarequests/new.html:3
+#: ckanext/datarequests/templates/datarequests/new.html:7
+#: ckanext/datarequests/templates/datarequests/new.html:11
+#: ckanext/datarequests/templates/datarequests/snippets/datarequest_form.html:47
+#: ckanext/datarequests/templates/datarequests/snippets/new_datarequest_form.html:7
+msgid "Create Data Request"
+msgstr "Crează cerere"
+
+#: ckanext/datarequests/templates/datarequests/new.html:16
+msgid ""
+"To create a data request, fill the form and specify a title and a "
+"description for your request. Please, be as clear as you can in order to "
+"ease the task of accomplishing your request. You can also specify an "
+"organization if your data request is closely related with it. "
+msgstr ""
+"Pentru a crea o nouă cerere te rugăm sa completezi formularul, "
+"specificând un titlu și o descriere a datelor pe care le dorești. Te "
+"rugăm sa fii cât mai explicit, pentru a putea să ușurăm procesul de "
+"obținere a datelor. De asemenea, poți selecta organizația care consideri "
+"că este în măsura să ofere respectivele date. "
+
+#: ckanext/datarequests/templates/datarequests/show.html:15
+msgid "Manage"
+msgstr "Administrează"
+
+#: ckanext/datarequests/templates/datarequests/show.html:19
+msgid "Close"
+msgstr "Închide"
+
+#: ckanext/datarequests/templates/datarequests/show.html:45
+#: ckanext/datarequests/templates/datarequests/snippets/additional_info.html:19
+#: ckanext/datarequests/templates/datarequests/snippets/datarequest_item.html:12
+msgid "Closed"
+msgstr "Închis"
+
+#: ckanext/datarequests/templates/datarequests/show.html:50
+#: ckanext/datarequests/templates/datarequests/snippets/datarequest_item.html:16
+msgid "Open"
+msgstr "Deschis"
+
+#: ckanext/datarequests/templates/datarequests/snippets/additional_info.html:2
+msgid "Additional Info"
+msgstr "Informații suplimentare"
+
+#: ckanext/datarequests/templates/datarequests/snippets/additional_info.html:7
+msgid "Creator"
+msgstr "Creator"
+
+#: ckanext/datarequests/templates/datarequests/snippets/additional_info.html:8
+#: ckanext/datarequests/templates/datarequests/snippets/additional_info.html:12
+#: ckanext/datarequests/templates/datarequests/snippets/additional_info.html:29
+msgid "None"
+msgstr "Gol"
+
+#: ckanext/datarequests/templates/datarequests/snippets/additional_info.html:15
+msgid "Created"
+msgstr "Creat"
+
+#: ckanext/datarequests/templates/datarequests/snippets/additional_info.html:20
+msgid "Not closed yet"
+msgstr "Neînchis încă"
+
+#: ckanext/datarequests/templates/datarequests/snippets/close_datarequest_form.html:11
+msgid "Accep. Dataset"
+msgstr "Acceptă. Set de date"
+
+#: ckanext/datarequests/templates/datarequests/snippets/comment_form.html:22
+msgid "Add a new Comment"
+msgstr "Adaugă comentariu nou"
+
+#: ckanext/datarequests/templates/datarequests/snippets/comment_form.html:23
+#, python-format
+msgid ""
+"You can use <a href=\"#markdown\" title=\"Markdown quick reference\" data-"
+"target=\"popover\" data-content=\"%(markdown_tooltip)s\" data-html=\"true"
+"\">Markdown formatting</a> here. You can refer datasets by adding their "
+"URL."
+msgstr ""
+"Poți folosi <a href=“#markdown” title=“Markdown quick reference” data-"
+"target=“popover” data-content=“%(markdown_tooltip)s” data-"
+"html=“true”>formatarea Markdown</a> aici. Poți refenția seturi de date "
+"adăugând URL-ul lor."
+
+#: ckanext/datarequests/templates/datarequests/snippets/comment_form.html:28
+msgid "Cancel"
+msgstr "Întrerupe"
+
+#: ckanext/datarequests/templates/datarequests/snippets/comment_form.html:29
+msgid "Update Comment"
+msgstr "Actualizează comentariu"
+
+#: ckanext/datarequests/templates/datarequests/snippets/comment_form.html:31
+msgid "Add Comment"
+msgstr "Adaugă comentariu"
+
+#: ckanext/datarequests/templates/datarequests/snippets/comment_item.html:18
+msgid "Are you sure you want to delete this comment?"
+msgstr "Sigur dorești să ștergi acest comentariu?"
+
+#: ckanext/datarequests/templates/datarequests/snippets/comment_item.html:29
+msgid "commented"
+msgstr "comentat"
+
+#: ckanext/datarequests/templates/datarequests/snippets/comments.html:3
+msgid "Current Discussion"
+msgstr "Discuția curentă"
+
+#: ckanext/datarequests/templates/datarequests/snippets/comments.html:13
+msgid "This data request has not been commented yet"
+msgstr "Această cerere nu are niciun comentariu"
+
+#: ckanext/datarequests/templates/datarequests/snippets/datarequest_form.html:17
+msgid "eg. Data Request Name"
+msgstr "ex: Numele cererii de date"
+
+#: ckanext/datarequests/templates/datarequests/snippets/datarequest_form.html:21
+msgid "eg. Data Request description"
+msgstr "ex: Descrierea cererii de date"
+
+#: ckanext/datarequests/templates/datarequests/snippets/datarequest_form.html:29
+msgid "No organization"
+msgstr "Nicio organizație"
+
+#: ckanext/datarequests/templates/datarequests/snippets/datarequest_form.html:43
+msgid "Are you sure you want to delete this data request?"
+msgstr "Ești sigur că dorești să ștergi această cerere?"
+
+#: ckanext/datarequests/templates/datarequests/snippets/datarequest_form.html:44
+msgid "Delete"
+msgstr "Șterge"
+
+#: ckanext/datarequests/templates/datarequests/snippets/datarequest_list.html:1
+msgid "No Data Requests found"
+msgstr "Nicio cerere găsită"
+
+#: ckanext/datarequests/templates/datarequests/snippets/datarequest_list.html:14
+msgid "No Data Requests found with the given criteria"
+msgstr "Nicio cerere nu a fost găsită pentru acest criteriu"
+
+#: ckanext/datarequests/templates/datarequests/snippets/datarequest_list.html:16
+msgid "How about creating one?"
+msgstr "Vrei sa creezi una?"
+
+#: ckanext/datarequests/templates/datarequests/snippets/edit_datarequest_form.html:4
+msgid "Update Data Request"
+msgstr "Actualizează cererea de date"
+
+#: ckanext/datarequests/templates/home/snippets/stats.html:5
+msgid "{0} statistics"
+msgstr "{0} statistici"
+
+#: ckanext/datarequests/templates/home/snippets/stats.html:10
+msgid "dataset"
+msgstr "set de date"
+
+#: ckanext/datarequests/templates/home/snippets/stats.html:10
+msgid "datasets"
+msgstr "seturi de date"
+
+#: ckanext/datarequests/templates/home/snippets/stats.html:16
+msgid "organization"
+msgstr "organizație"
+
+#: ckanext/datarequests/templates/home/snippets/stats.html:16
+msgid "organizations"
+msgstr "organizații"
+
+#: ckanext/datarequests/templates/home/snippets/stats.html:22
+msgid "group"
+msgstr "grup"
+
+#: ckanext/datarequests/templates/home/snippets/stats.html:22
+msgid "groups"
+msgstr "grupuri"
+
+#: ckanext/datarequests/templates/home/snippets/stats.html:28
+msgid "related item"
+msgstr "item asemănător"
+
+#: ckanext/datarequests/templates/home/snippets/stats.html:28
+msgid "related items"
+msgstr "itemi asemănători"
+
+#: ckanext/datarequests/templates/home/snippets/stats.html:34
+msgid "data request"
+msgstr "cerere de date"
+
+#: ckanext/datarequests/templates/home/snippets/stats.html:34
+msgid "data requests"
+msgstr "cereri de date"
+
+#: ckanext/datarequests/templates/organization/read_base.html:5
+#: ckanext/datarequests/templates/user/read_base.html:5
+msgid "Activity Stream"
+msgstr "Flux de activitate"
+
+#: ckanext/datarequests/templates/snippets/custom_search_form.html:6
+msgid "{number} data request found for \"{query}\""
+msgid_plural "{number} data requests found for \"{query}\""
+msgstr[0] "{number} cerere găsită pentru “{query}”"
+msgstr[1] "{number} cereri găsite pentru “{query}”"
+msgstr[2] "{number} cereri găsite pentru “{query}”"
+
+#: ckanext/datarequests/templates/snippets/custom_search_form.html:7
+msgid "No data requests found for \"{query}\""
+msgstr "Nicio cerere nu a fost găsită pentru “{query}”"
+
+#: ckanext/datarequests/templates/snippets/custom_search_form.html:8
+msgid "{number} data request found"
+msgid_plural "{number} data requests found"
+msgstr[0] "{number} cereri găsită"
+msgstr[1] "{number} cereri găsite"
+msgstr[2] "{number} cereri găsite"
+
+#: ckanext/datarequests/templates/snippets/custom_search_form.html:9
+msgid "No data requests found"
+msgstr "Nicio cere nu a fost găsită"

From 92f14fd99ef250b4985ee2c4f20ef0c0ed35c84d Mon Sep 17 00:00:00 2001
From: antuarc <carl.antuar@smartservice.qld.gov.au>
Date: Mon, 3 Feb 2020 11:23:43 +1000
Subject: [PATCH 021/276] [QOL-6375] update browser arguments for new Splinter

- also ensure that we use newer Splinter since the new argument name won't work with an old one
---
 requirements-dev.txt         | 1 +
 test/features/environment.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/requirements-dev.txt b/requirements-dev.txt
index 8ce445ec..60486b07 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -7,6 +7,7 @@ mock
 nose_parameterized==0.3.3
 profanityfilter
 lxml==3.4.2
+splinter>=0.13.0
 -e git+https://github.com/qld-gov-au/ckanext-data-qld@develop#egg=ckanext-data_qld
 -e git+https://github.com/ckan/ckantoolkit@release-0.0.4#egg=ckantoolkit
 -e git+https://github.com/ckan/ckanapi@ckanapi-4.3#egg=ckanapi
diff --git a/test/features/environment.py b/test/features/environment.py
index 7bbf8d55..4f824347 100644
--- a/test/features/environment.py
+++ b/test/features/environment.py
@@ -76,7 +76,7 @@ def before_all(context):
     # Always use remote web driver.
     context.remote_webdriver = 1
     context.default_browser = 'chrome'
-    context.browser_args = {'url': REMOTE_CHROME_URL}
+    context.browser_args = {'command_executor': REMOTE_CHROME_URL}
 
     # Set the rest of the settings to default Behaving's settings.
     benv.before_all(context)

From 3f5edcf0791e093592f2dca9b4ed6703f8d40ef4 Mon Sep 17 00:00:00 2001
From: William Dutton <william.dutton@qld.gov.au>
Date: Mon, 3 Feb 2020 11:40:18 +1000
Subject: [PATCH 022/276]  update argument name for Splinter 0.12.0+

---
 requirements-dev.txt         | 1 +
 test/features/environment.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/requirements-dev.txt b/requirements-dev.txt
index 8ce445ec..60486b07 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -7,6 +7,7 @@ mock
 nose_parameterized==0.3.3
 profanityfilter
 lxml==3.4.2
+splinter>=0.13.0
 -e git+https://github.com/qld-gov-au/ckanext-data-qld@develop#egg=ckanext-data_qld
 -e git+https://github.com/ckan/ckantoolkit@release-0.0.4#egg=ckantoolkit
 -e git+https://github.com/ckan/ckanapi@ckanapi-4.3#egg=ckanapi
diff --git a/test/features/environment.py b/test/features/environment.py
index 7bbf8d55..4f824347 100644
--- a/test/features/environment.py
+++ b/test/features/environment.py
@@ -76,7 +76,7 @@ def before_all(context):
     # Always use remote web driver.
     context.remote_webdriver = 1
     context.default_browser = 'chrome'
-    context.browser_args = {'url': REMOTE_CHROME_URL}
+    context.browser_args = {'command_executor': REMOTE_CHROME_URL}
 
     # Set the rest of the settings to default Behaving's settings.
     benv.before_all(context)

From e2e72ca8e24e6a31909e2cdfea28ac8a92599949 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aitor=20Mag=C3=A1n=20Garc=C3=ADa?=
 <aitormagan@users.noreply.github.com>
Date: Wed, 26 Feb 2020 09:20:32 +0100
Subject: [PATCH 023/276] Fix travis

---
 bin/travis-build.bash | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/travis-build.bash b/bin/travis-build.bash
index c4325520..f3dd53f8 100644
--- a/bin/travis-build.bash
+++ b/bin/travis-build.bash
@@ -12,8 +12,8 @@ git clone https://github.com/ckan/ckan
 cd ckan
 git checkout ckan-$CKANVERSION
 python setup.py develop
-pip install -r requirements.txt --allow-all-external
-pip install -r dev-requirements.txt --allow-all-external
+pip install -r requirements.txt
+pip install -r dev-requirements.txt
 cd -
 
 echo "Setting up Solr..."
@@ -40,4 +40,4 @@ cd -
 echo "Installing ckanext-datarequests and its requirements..."
 python setup.py develop
 
-echo "travis-build.bash is done."
\ No newline at end of file
+echo "travis-build.bash is done."

From 5cd1e2bc679a1ca9c28d804b85fb2fbb28712d34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aitor=20Mag=C3=A1n=20Garc=C3=ADa?=
 <aitormagan@users.noreply.github.com>
Date: Wed, 26 Feb 2020 09:30:38 +0100
Subject: [PATCH 024/276] Update .travis.yml

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index cf7ef23a..aa57583f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,7 @@ env:
     - CKANVERSION=2.5.6 POSTGISVERSION=2
     - CKANVERSION=2.6.3 POSTGISVERSION=2
     - CKANVERSION=2.7.0 POSTGISVERSION=2
-    - CKANVERSION=2.8.1 POSTGISVERSION=2
+    - CKANVERSION=2.8.2 POSTGISVERSION=2
 services:
     - redis-server
     - postgresql

From f6a40ae77f681475c51264dce6ba3247bff7dec5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aitor=20Mag=C3=A1n=20Garc=C3=ADa?=
 <aitormagan@users.noreply.github.com>
Date: Wed, 26 Feb 2020 09:34:02 +0100
Subject: [PATCH 025/276] Bump to CKAN 2.8.3

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index aa57583f..88a06201 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,7 @@ env:
     - CKANVERSION=2.5.6 POSTGISVERSION=2
     - CKANVERSION=2.6.3 POSTGISVERSION=2
     - CKANVERSION=2.7.0 POSTGISVERSION=2
-    - CKANVERSION=2.8.2 POSTGISVERSION=2
+    - CKANVERSION=2.8.3 POSTGISVERSION=2
 services:
     - redis-server
     - postgresql

From 19e4f3a03c5dd340f421139e2ab4eadfa385e447 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aitor=20Mag=C3=A1n=20Garc=C3=ADa?=
 <aitormagan@users.noreply.github.com>
Date: Wed, 26 Feb 2020 09:40:09 +0100
Subject: [PATCH 026/276] Avoid dev-requirements

---
 bin/travis-build.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/travis-build.bash b/bin/travis-build.bash
index f3dd53f8..952aac80 100644
--- a/bin/travis-build.bash
+++ b/bin/travis-build.bash
@@ -13,7 +13,7 @@ cd ckan
 git checkout ckan-$CKANVERSION
 python setup.py develop
 pip install -r requirements.txt
-pip install -r dev-requirements.txt
+# pip install -r dev-requirements.txt
 cd -
 
 echo "Setting up Solr..."

From a51bce3f8b188a2bf19b5a1fdb7f0490ef578be1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aitor=20Mag=C3=A1n=20Garc=C3=ADa?=
 <aitormagan@users.noreply.github.com>
Date: Wed, 26 Feb 2020 10:03:55 +0100
Subject: [PATCH 027/276] Update service name

---
 bin/travis-build.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/travis-build.bash b/bin/travis-build.bash
index 952aac80..c7247c4a 100644
--- a/bin/travis-build.bash
+++ b/bin/travis-build.bash
@@ -23,7 +23,7 @@ echo "Setting up Solr..."
 sed -i -e 's/solr_url.*/solr_url = http:\/\/127.0.0.1:8983\/solr/' ckan/test-core.ini
 printf "NO_START=0\nJETTY_HOST=127.0.0.1\nJETTY_PORT=8983\nJAVA_HOME=$JAVA_HOME" | sudo tee /etc/default/jetty
 sudo cp ckan/ckan/config/solr/schema.xml /etc/solr/conf/schema.xml
-sudo service jetty restart
+sudo service jetty8 restart
 
 echo "Creating the PostgreSQL user and database..."
 sudo -u postgres psql -c "CREATE USER ckan_default WITH PASSWORD 'pass';"

From c814b87b0a9a7f194720156a11785c717dfebfe6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aitor=20Mag=C3=A1n=20Garc=C3=ADa?=
 <aitormagan@users.noreply.github.com>
Date: Wed, 26 Feb 2020 10:08:17 +0100
Subject: [PATCH 028/276] Recover dev-requirements

---
 bin/travis-build.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/travis-build.bash b/bin/travis-build.bash
index c7247c4a..1dfc5d8a 100644
--- a/bin/travis-build.bash
+++ b/bin/travis-build.bash
@@ -13,7 +13,7 @@ cd ckan
 git checkout ckan-$CKANVERSION
 python setup.py develop
 pip install -r requirements.txt
-# pip install -r dev-requirements.txt
+pip install -r dev-requirements.txt
 cd -
 
 echo "Setting up Solr..."

From 1e1ec30f8475c108987cf0c1ae908b7ceb7c7839 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aitor=20Mag=C3=A1n=20Garc=C3=ADa?=
 <aitormagan@users.noreply.github.com>
Date: Wed, 26 Feb 2020 10:13:24 +0100
Subject: [PATCH 029/276] xvfb as service

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 88a06201..ae69279b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,13 +11,13 @@ env:
 services:
     - redis-server
     - postgresql
+    - xvfb
 addons:
     firefox: "46.0"
 install:
     - bash bin/travis-build.bash
 before_script:
   - "export DISPLAY=:99.0"
-  - "sh -e /etc/init.d/xvfb start"
   - sleep 3 # give xvfb some time to start
 script: 
   - sh bin/travis-run.sh

From b5620c28bbf5a88b04a69dfef426416c928a0342 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aitor=20Mag=C3=A1n=20Garc=C3=ADa?=
 <aitormagan@users.noreply.github.com>
Date: Wed, 26 Feb 2020 10:18:14 +0100
Subject: [PATCH 030/276] Update jetty config file

---
 bin/travis-build.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/travis-build.bash b/bin/travis-build.bash
index 1dfc5d8a..fdbc3548 100644
--- a/bin/travis-build.bash
+++ b/bin/travis-build.bash
@@ -21,7 +21,7 @@ echo "Setting up Solr..."
 # on Travis single-core still.
 # see https://github.com/ckan/ckan/issues/2972
 sed -i -e 's/solr_url.*/solr_url = http:\/\/127.0.0.1:8983\/solr/' ckan/test-core.ini
-printf "NO_START=0\nJETTY_HOST=127.0.0.1\nJETTY_PORT=8983\nJAVA_HOME=$JAVA_HOME" | sudo tee /etc/default/jetty
+printf "NO_START=0\nJETTY_HOST=127.0.0.1\nJETTY_PORT=8983\nJAVA_HOME=$JAVA_HOME" | sudo tee /etc/default/jetty8
 sudo cp ckan/ckan/config/solr/schema.xml /etc/solr/conf/schema.xml
 sudo service jetty8 restart
 

From 981efe10fe6581385a889e5250c096a6c8062709 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 27 Feb 2020 16:45:03 +1000
Subject: [PATCH 031/276] Bump beautifulsoup4 from 4.5.1 to 4.8.2 (#20)

Bumps [beautifulsoup4](http://www.crummy.com/software/BeautifulSoup/bs4/) from 4.5.1 to 4.8.2.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 requirements-dev.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements-dev.txt b/requirements-dev.txt
index 60486b07..dd15bac6 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,4 +1,4 @@
-beautifulsoup4==4.5.1
+beautifulsoup4==4.8.2
 behave==1.2.6
 behaving==1.5.6
 flake8==3.7.7

From e838ef068aa820db2cc3f89f3eb47c41769333b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aitor=20Mag=C3=A1n=20Garc=C3=ADa?=
 <aitormagan@users.noreply.github.com>
Date: Thu, 27 Feb 2020 09:08:07 +0100
Subject: [PATCH 032/276] Remove .mo from gitignore

---
 .gitignore | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 55c0f302..e5be15c2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,7 +46,6 @@ nosetests.xml
 coverage.xml
 
 # Translations
-*.mo
 *.pot
 
 # Django stuff:

From 24d8e38d38d72141f2adb9b088e0bfb492b637c2 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 27 Feb 2020 06:46:22 +0000
Subject: [PATCH 033/276] Bump lxml from 3.4.2 to 4.5.0

Bumps [lxml](https://github.com/lxml/lxml) from 3.4.2 to 4.5.0.
- [Release notes](https://github.com/lxml/lxml/releases)
- [Changelog](https://github.com/lxml/lxml/blob/master/CHANGES.txt)
- [Commits](https://github.com/lxml/lxml/compare/lxml-3.4.2...lxml-4.5.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 requirements-dev.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements-dev.txt b/requirements-dev.txt
index dd15bac6..f77f59fc 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -6,7 +6,7 @@ nose==1.3.7
 mock
 nose_parameterized==0.3.3
 profanityfilter
-lxml==3.4.2
+lxml==4.5.0
 splinter>=0.13.0
 -e git+https://github.com/qld-gov-au/ckanext-data-qld@develop#egg=ckanext-data_qld
 -e git+https://github.com/ckan/ckantoolkit@release-0.0.4#egg=ckantoolkit

From 22771b0a1a6b26eed6d4cbae0808d7daa771978c Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 17 Feb 2020 19:30:38 +0000
Subject: [PATCH 034/276] Bump coveralls from 1.1 to 1.11.1

Bumps [coveralls](https://github.com/coveralls-clients/coveralls-python) from 1.1 to 1.11.1.
- [Release notes](https://github.com/coveralls-clients/coveralls-python/releases)
- [Changelog](https://github.com/coveralls-clients/coveralls-python/blob/master/CHANGELOG.md)
- [Commits](https://github.com/coveralls-clients/coveralls-python/compare/1.1...1.11.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 42ce27d5..024f7dae 100644
--- a/setup.py
+++ b/setup.py
@@ -48,7 +48,7 @@
     tests_require=[
         'nose_parameterized==0.3.3',
         'selenium==2.53',
-        'coveralls==1.1'
+        'coveralls==1.11.1'
     ],
     test_suite='nosetests',
     entry_points='''

From ff115eb335145324f4ec840e3711a80cf2f2a307 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 27 Feb 2020 06:46:17 +0000
Subject: [PATCH 035/276] Bump flake8 from 3.7.7 to 3.7.9

Bumps [flake8](https://gitlab.com/pycqa/flake8) from 3.7.7 to 3.7.9.
- [Release notes](https://gitlab.com/pycqa/flake8/tags)
- [Commits](https://gitlab.com/pycqa/flake8/compare/3.7.7...3.7.9)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 requirements-dev.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements-dev.txt b/requirements-dev.txt
index f77f59fc..c168bfd9 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,7 +1,7 @@
 beautifulsoup4==4.8.2
 behave==1.2.6
 behaving==1.5.6
-flake8==3.7.7
+flake8==3.7.9
 nose==1.3.7
 mock
 nose_parameterized==0.3.3

From cc9bc97e999efd221cd171ecbc8172d8df31caf6 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 27 Feb 2020 10:13:53 +0000
Subject: [PATCH 036/276] Bump selenium from 2.53 to 3.141.0

Bumps [selenium](https://github.com/SeleniumHQ/selenium) from 2.53 to 3.141.0.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases)
- [Commits](https://github.com/SeleniumHQ/selenium/compare/selenium-2.53.0...selenium-3.141.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 024f7dae..8076433a 100644
--- a/setup.py
+++ b/setup.py
@@ -47,7 +47,7 @@
     ],
     tests_require=[
         'nose_parameterized==0.3.3',
-        'selenium==2.53',
+        'selenium==3.141.0',
         'coveralls==1.11.1'
     ],
     test_suite='nosetests',

From ca40fad99831e7bae8f4f2351d1e330d4ab1549a Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 27 Feb 2020 13:17:29 +0000
Subject: [PATCH 037/276] Bump nose-parameterized from 0.3.3 to 0.6.0

Bumps [nose-parameterized](https://github.com/wolever/parameterized) from 0.3.3 to 0.6.0.
- [Release notes](https://github.com/wolever/parameterized/releases)
- [Changelog](https://github.com/wolever/parameterized/blob/master/CHANGELOG.txt)
- [Commits](https://github.com/wolever/parameterized/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 requirements-dev.txt | 2 +-
 setup.py             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements-dev.txt b/requirements-dev.txt
index c168bfd9..18966c7a 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -4,7 +4,7 @@ behaving==1.5.6
 flake8==3.7.9
 nose==1.3.7
 mock
-nose_parameterized==0.3.3
+nose_parameterized==0.6.0
 profanityfilter
 lxml==4.5.0
 splinter>=0.13.0
diff --git a/setup.py b/setup.py
index 8076433a..90441c6c 100644
--- a/setup.py
+++ b/setup.py
@@ -46,7 +46,7 @@
         # -*- Extra requirements: -*-
     ],
     tests_require=[
-        'nose_parameterized==0.3.3',
+        'nose_parameterized==0.6.0',
         'selenium==3.141.0',
         'coveralls==1.11.1'
     ],

From 61a1cd7a09fa836497528ebaff0a2b5d99d7986d Mon Sep 17 00:00:00 2001
From: Costin Bleotu <costi.bleotu@gmail.com>
Date: Sat, 29 Feb 2020 16:44:19 +0200
Subject: [PATCH 038/276] added .mo

---
 .../i18n/ckanext-datarequests.pot             | 160 ++++++++----------
 .../ro/LC_MESSAGES/ckanext-datarequests.mo    | Bin 0 -> 8401 bytes
 2 files changed, 69 insertions(+), 91 deletions(-)
 create mode 100644 ckanext/datarequests/i18n/ro/LC_MESSAGES/ckanext-datarequests.mo

diff --git a/ckanext/datarequests/i18n/ckanext-datarequests.pot b/ckanext/datarequests/i18n/ckanext-datarequests.pot
index 290de903..cf20e5ba 100644
--- a/ckanext/datarequests/i18n/ckanext-datarequests.pot
+++ b/ckanext/datarequests/i18n/ckanext-datarequests.pot
@@ -1,53 +1,63 @@
 # Translations template for ckanext-datarequests.
-# Copyright (C) 2016 ORGANIZATION
+# Copyright (C) 2019 ORGANIZATION
 # This file is distributed under the same license as the ckanext-datarequests
 # project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2016.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2019.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: ckanext-datarequests 0.3.1\n"
+"Project-Id-Version: ckanext-datarequests 1.1.0\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2016-04-28 14:45+0200\n"
+"POT-Creation-Date: 2019-12-14 14:25+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 2.3.4\n"
 
-#: ckanext/datarequests/actions.py:192 ckanext/datarequests/actions.py:244
-#: ckanext/datarequests/actions.py:435 ckanext/datarequests/actions.py:480
-#: ckanext/datarequests/actions.py:536 ckanext/datarequests/actions.py:624
+#: ckanext/datarequests/actions.py:251 ckanext/datarequests/actions.py:304
+#: ckanext/datarequests/actions.py:496 ckanext/datarequests/actions.py:542
+#: ckanext/datarequests/actions.py:604 ckanext/datarequests/actions.py:696
+#: ckanext/datarequests/actions.py:830 ckanext/datarequests/actions.py:881
 msgid "Data Request ID has not been included"
 msgstr ""
 
-#: ckanext/datarequests/actions.py:203 ckanext/datarequests/actions.py:255
-#: ckanext/datarequests/actions.py:446 ckanext/datarequests/actions.py:491
+#: ckanext/datarequests/actions.py:262 ckanext/datarequests/actions.py:315
+#: ckanext/datarequests/actions.py:507 ckanext/datarequests/actions.py:553
+#: ckanext/datarequests/actions.py:841
 #, python-format
 msgid "Data Request %s not found in the data base"
 msgstr ""
 
-#: ckanext/datarequests/actions.py:500
+#: ckanext/datarequests/actions.py:562
 msgid "This Data Request is already closed"
 msgstr ""
 
-#: ckanext/datarequests/actions.py:578 ckanext/datarequests/actions.py:671
-#: ckanext/datarequests/actions.py:717
+#: ckanext/datarequests/actions.py:650 ckanext/datarequests/actions.py:743
+#: ckanext/datarequests/actions.py:789
 msgid "Comment ID has not been included"
 msgstr ""
 
-#: ckanext/datarequests/actions.py:589 ckanext/datarequests/actions.py:682
-#: ckanext/datarequests/actions.py:728
+#: ckanext/datarequests/actions.py:661 ckanext/datarequests/actions.py:754
+#: ckanext/datarequests/actions.py:800
 #, python-format
 msgid "Comment %s not found in the data base"
 msgstr ""
 
+#: ckanext/datarequests/actions.py:847
+msgid "The user is already following the given Data Request"
+msgstr ""
+
+#: ckanext/datarequests/actions.py:893
+msgid "The user is not following the given Data Request"
+msgstr ""
+
+#: ckanext/datarequests/templates/datarequests/snippets/datarequest_form.html:18
 #: ckanext/datarequests/validator.py:31 ckanext/datarequests/validator.py:34
 #: ckanext/datarequests/validator.py:41
-#: ckanext/datarequests/templates/datarequests/snippets/datarequest_form.html:17
 msgid "Title"
 msgstr ""
 
@@ -64,8 +74,8 @@ msgstr ""
 msgid "That title is already in use"
 msgstr ""
 
+#: ckanext/datarequests/templates/datarequests/snippets/datarequest_form.html:22
 #: ckanext/datarequests/validator.py:45
-#: ckanext/datarequests/templates/datarequests/snippets/datarequest_form.html:21
 msgid "Description"
 msgstr ""
 
@@ -74,9 +84,9 @@ msgstr ""
 msgid "Description must be a maximum of %d characters long"
 msgstr ""
 
-#: ckanext/datarequests/validator.py:52
 #: ckanext/datarequests/templates/datarequests/snippets/additional_info.html:11
-#: ckanext/datarequests/templates/datarequests/snippets/datarequest_form.html:25
+#: ckanext/datarequests/templates/datarequests/snippets/datarequest_form.html:26
+#: ckanext/datarequests/validator.py:52
 msgid "Organization"
 msgstr ""
 
@@ -84,8 +94,8 @@ msgstr ""
 msgid "Organization is not valid"
 msgstr ""
 
-#: ckanext/datarequests/validator.py:65
 #: ckanext/datarequests/templates/datarequests/snippets/additional_info.html:24
+#: ckanext/datarequests/validator.py:65
 msgid "Accepted Dataset"
 msgstr ""
 
@@ -93,9 +103,9 @@ msgstr ""
 msgid "Dataset not found"
 msgstr ""
 
-#: ckanext/datarequests/validator.py:75
 #: ckanext/datarequests/templates/datarequests/base.html:17
 #: ckanext/datarequests/templates/datarequests/show.html:25
+#: ckanext/datarequests/validator.py:75
 msgid "Data Request"
 msgstr ""
 
@@ -143,83 +153,83 @@ msgstr ""
 msgid "Unauthorized to list Data Requests"
 msgstr ""
 
-#: ckanext/datarequests/controllers/ui_controller.py:210
+#: ckanext/datarequests/controllers/ui_controller.py:209
 msgid "Unauthorized to create a Data Request"
 msgstr ""
 
-#: ckanext/datarequests/controllers/ui_controller.py:225
-#: ckanext/datarequests/controllers/ui_controller.py:248
-#: ckanext/datarequests/controllers/ui_controller.py:265
-#: ckanext/datarequests/controllers/ui_controller.py:334
-#: ckanext/datarequests/controllers/ui_controller.py:401
+#: ckanext/datarequests/controllers/ui_controller.py:224
+#: ckanext/datarequests/controllers/ui_controller.py:247
+#: ckanext/datarequests/controllers/ui_controller.py:264
+#: ckanext/datarequests/controllers/ui_controller.py:332
+#: ckanext/datarequests/controllers/ui_controller.py:399
 #, python-format
 msgid "Data Request %s not found"
 msgstr ""
 
-#: ckanext/datarequests/controllers/ui_controller.py:228
+#: ckanext/datarequests/controllers/ui_controller.py:227
 #, python-format
 msgid "You are not authorized to view the Data Request %s"
 msgstr ""
 
-#: ckanext/datarequests/controllers/ui_controller.py:251
+#: ckanext/datarequests/controllers/ui_controller.py:250
 #, python-format
 msgid "You are not authorized to update the Data Request %s"
 msgstr ""
 
-#: ckanext/datarequests/controllers/ui_controller.py:261
-#: ckanext/datarequests/tests/test_ui_controller.py:672
+#: ckanext/datarequests/controllers/ui_controller.py:260
+#: ckanext/datarequests/tests/test_ui_controller.py:673
 #, python-format
 msgid "Data Request %s has been deleted"
 msgstr ""
 
-#: ckanext/datarequests/controllers/ui_controller.py:268
+#: ckanext/datarequests/controllers/ui_controller.py:267
 #, python-format
 msgid "You are not authorized to delete the Data Request %s"
 msgstr ""
 
-#: ckanext/datarequests/controllers/ui_controller.py:316
+#: ckanext/datarequests/controllers/ui_controller.py:315
 msgid "This data request is already closed"
 msgstr ""
 
-#: ckanext/datarequests/controllers/ui_controller.py:337
+#: ckanext/datarequests/controllers/ui_controller.py:335
 #, python-format
 msgid "You are not authorized to close the Data Request %s"
 msgstr ""
 
-#: ckanext/datarequests/controllers/ui_controller.py:366
+#: ckanext/datarequests/controllers/ui_controller.py:364
 msgid "Comment has been published"
 msgstr ""
 
-#: ckanext/datarequests/controllers/ui_controller.py:368
+#: ckanext/datarequests/controllers/ui_controller.py:366
 msgid "Comment has been updated"
 msgstr ""
 
-#: ckanext/datarequests/controllers/ui_controller.py:374
+#: ckanext/datarequests/controllers/ui_controller.py:372
 #, python-format
 msgid "You are not authorized to %s"
 msgstr ""
 
-#: ckanext/datarequests/controllers/ui_controller.py:405
+#: ckanext/datarequests/controllers/ui_controller.py:403
 #, python-format
 msgid "You are not authorized to list the comments of the Data Request %s"
 msgstr ""
 
-#: ckanext/datarequests/controllers/ui_controller.py:414
+#: ckanext/datarequests/controllers/ui_controller.py:412
 msgid "Comment has been deleted"
 msgstr ""
 
-#: ckanext/datarequests/controllers/ui_controller.py:419
+#: ckanext/datarequests/controllers/ui_controller.py:416
 #, python-format
 msgid "Comment %s not found"
 msgstr ""
 
-#: ckanext/datarequests/controllers/ui_controller.py:422
+#: ckanext/datarequests/controllers/ui_controller.py:419
 msgid "You are not authorized to delete this comment"
 msgstr ""
 
 #: ckanext/datarequests/templates/header.html:5
 #: ckanext/datarequests/templates/organization/read_base.html:4
-#: ckanext/datarequests/templates/user/read_base.html:4
+#: ckanext/datarequests/templates/user/read_base.html:7
 msgid "Datasets"
 msgstr ""
 
@@ -227,15 +237,15 @@ msgstr ""
 msgid "Groups"
 msgstr ""
 
-#: ckanext/datarequests/templates/header.html:8
 #: ckanext/datarequests/templates/datarequests/base.html:8
 #: ckanext/datarequests/templates/datarequests/base.html:11
 #: ckanext/datarequests/templates/datarequests/close.html:6
 #: ckanext/datarequests/templates/datarequests/edit.html:6
 #: ckanext/datarequests/templates/datarequests/new.html:6
 #: ckanext/datarequests/templates/datarequests/show.html:8
+#: ckanext/datarequests/templates/header.html:8
 #: ckanext/datarequests/templates/organization/read_base.html:6
-#: ckanext/datarequests/templates/user/read_base.html:6
+#: ckanext/datarequests/templates/user/read_base.html:9
 msgid "Data Requests"
 msgstr ""
 
@@ -255,7 +265,7 @@ msgstr ""
 #: ckanext/datarequests/templates/datarequests/close.html:3
 #: ckanext/datarequests/templates/datarequests/close.html:8
 #: ckanext/datarequests/templates/datarequests/close.html:12
-#: ckanext/datarequests/templates/datarequests/snippets/close_datarequest_form.html:25
+#: ckanext/datarequests/templates/datarequests/snippets/close_datarequest_form.html:26
 msgid "Close Data Request"
 msgstr ""
 
@@ -284,7 +294,7 @@ msgstr ""
 #: ckanext/datarequests/templates/datarequests/new.html:3
 #: ckanext/datarequests/templates/datarequests/new.html:7
 #: ckanext/datarequests/templates/datarequests/new.html:11
-#: ckanext/datarequests/templates/datarequests/snippets/datarequest_form.html:47
+#: ckanext/datarequests/templates/datarequests/snippets/datarequest_form.html:48
 #: ckanext/datarequests/templates/datarequests/snippets/new_datarequest_form.html:7
 msgid "Create Data Request"
 msgstr ""
@@ -338,7 +348,7 @@ msgstr ""
 msgid "Not closed yet"
 msgstr ""
 
-#: ckanext/datarequests/templates/datarequests/snippets/close_datarequest_form.html:11
+#: ckanext/datarequests/templates/datarequests/snippets/close_datarequest_form.html:12
 msgid "Accep. Dataset"
 msgstr ""
 
@@ -383,23 +393,23 @@ msgstr ""
 msgid "This data request has not been commented yet"
 msgstr ""
 
-#: ckanext/datarequests/templates/datarequests/snippets/datarequest_form.html:17
+#: ckanext/datarequests/templates/datarequests/snippets/datarequest_form.html:18
 msgid "eg. Data Request Name"
 msgstr ""
 
-#: ckanext/datarequests/templates/datarequests/snippets/datarequest_form.html:21
+#: ckanext/datarequests/templates/datarequests/snippets/datarequest_form.html:22
 msgid "eg. Data Request description"
 msgstr ""
 
-#: ckanext/datarequests/templates/datarequests/snippets/datarequest_form.html:29
+#: ckanext/datarequests/templates/datarequests/snippets/datarequest_form.html:30
 msgid "No organization"
 msgstr ""
 
-#: ckanext/datarequests/templates/datarequests/snippets/datarequest_form.html:43
+#: ckanext/datarequests/templates/datarequests/snippets/datarequest_form.html:44
 msgid "Are you sure you want to delete this data request?"
 msgstr ""
 
-#: ckanext/datarequests/templates/datarequests/snippets/datarequest_form.html:44
+#: ckanext/datarequests/templates/datarequests/snippets/datarequest_form.html:45
 msgid "Delete"
 msgstr ""
 
@@ -419,52 +429,20 @@ msgstr ""
 msgid "Update Data Request"
 msgstr ""
 
-#: ckanext/datarequests/templates/home/snippets/stats.html:5
-msgid "{0} statistics"
-msgstr ""
-
-#: ckanext/datarequests/templates/home/snippets/stats.html:10
-msgid "dataset"
-msgstr ""
-
-#: ckanext/datarequests/templates/home/snippets/stats.html:10
-msgid "datasets"
-msgstr ""
-
-#: ckanext/datarequests/templates/home/snippets/stats.html:16
-msgid "organization"
-msgstr ""
-
-#: ckanext/datarequests/templates/home/snippets/stats.html:16
-msgid "organizations"
-msgstr ""
-
-#: ckanext/datarequests/templates/home/snippets/stats.html:22
-msgid "group"
-msgstr ""
-
-#: ckanext/datarequests/templates/home/snippets/stats.html:22
-msgid "groups"
-msgstr ""
-
-#: ckanext/datarequests/templates/home/snippets/stats.html:28
-msgid "related item"
-msgstr ""
-
-#: ckanext/datarequests/templates/home/snippets/stats.html:28
-msgid "related items"
+#: ckanext/datarequests/templates/datarequests/snippets/followers.html:11
+msgid "Followers"
 msgstr ""
 
-#: ckanext/datarequests/templates/home/snippets/stats.html:34
-msgid "data request"
+#: ckanext/datarequests/templates/datarequests/snippets/followers.html:22
+msgid "Unfollow"
 msgstr ""
 
-#: ckanext/datarequests/templates/home/snippets/stats.html:34
-msgid "data requests"
+#: ckanext/datarequests/templates/datarequests/snippets/followers.html:27
+msgid "Follow"
 msgstr ""
 
 #: ckanext/datarequests/templates/organization/read_base.html:5
-#: ckanext/datarequests/templates/user/read_base.html:5
+#: ckanext/datarequests/templates/user/read_base.html:8
 msgid "Activity Stream"
 msgstr ""
 
diff --git a/ckanext/datarequests/i18n/ro/LC_MESSAGES/ckanext-datarequests.mo b/ckanext/datarequests/i18n/ro/LC_MESSAGES/ckanext-datarequests.mo
new file mode 100644
index 0000000000000000000000000000000000000000..ea5389df46d6fa2745d381af5f76ed7a716a7f02
GIT binary patch
literal 8401
zcmb`LdyHL09mfa32dhXy5PXjdePQpiyKQ+a-Il)Dq_4C~6*Z8v=g!_e^xShU=dtY;
zP)uVC#+djZ0zx84LW}`ILexJ*6WTxx5ra{TA@vVTOeFdTMjnaL`1#G5^SIl)QW6{3
z@0pq3%<nh9=lt%UE<EQR#lIQ;|2Y4zIa@~czYXtE>N19t;JZN&{2<r?mx1%(`QX>U
z_k-Va^FIVHVEmL@e->;pehC~0&v~y>e5$KKId>y?A-K)We-`9Fbu)i10%yVH;O(FW
z9|A80p8-D#zU;<tfbU~`K7U5ROTiIv3j7dw1cXF=!{K*9;rjsi0q_Y>gFgp90-ge|
z0N(_K|M0m=eHgp}JP*7DJnJl_x}e-Q9xC{M1(f@J9TdHM3tS662nyYcZvD^TC5&Hn
z<99(U`_2W0&oWTtU+KmN!OIzULDBoS!E?ZeL9xrDpzQyNn|~UVdp!fneSQOq+<ygy
z@0+0L|9ptV{uhH{?{RPqc+icHfkO8vcro}GDE2%KevtdW28w<}h+$v_DDq74NA&(V
zP|goQ(Zk)~I`C;w&iMzp1=L(h=6z87<X-Ui;PW6VRuAEHuu?w;<sLr+#h%ZCm`J?<
zihO?nh2P&nk$VWGi(Zz2vi}lL_FwMC<8HhOL=?3fyaxOtI1SzdKEXX-1x5b*xs>pI
z0Tg~Of#Ros1I3@tVjy@CDCeyN#hzDz;<vlOHQ+3`9{di73#ea#a*yAELU#%jK5w}7
z|A3!jd@f9{1XqLN4>y5g-!Fk51MdYt0X_xFxxWR4{*=S>5Ju#h1Vul)K;g3=6uCd|
z*1Mqi!yVuX@CTsS>pAd~;On5+`y!l4&bu0X3)}(9`X(+R^EZQXeisxw=AfMOWe}CB
z$K3iaK~$)o17+XKASP6=f{3pE1+E7#;IeYRo!~mqfFk$(pro+JK-u>sDCax_3jY^D
zvHu@I@sGc_@!2F1p<f1yK0XbK{3}86>mA@KFa$-v_kcq8Bq(zI6ubibHMkEyc?%T#
zPQgU(IS(SbdIS`?p9W#AUIxd&*B!28QS5XRI0@bj%6*@6_;2u^jMpNZ_{l1qLGCx^
z@OqGtR(sv}3m~GXTS2+cS3$`akAR|&AAzEeCmsF*6ni`miXBdYa{g=J4WQEGdSD7v
z!#%HKhIP+NyspViqPuyT=^3NFNC#17Iwnz@XW~3ln|<H(M)Wo>^HSr6nQ1pBvS2>Q
z7W9EEF<w_~ZnyQ;xZ5=m#C*#}z2DrHo3xnlbYu=UNrEhhBQMlb(QK?XCq^&CxlVKU
zaoCG8oyEFsLIl;>T##zNIDgZbQMW~cq>x~f+UiBV3DwpxPEGN*UqrjmR^=5O>gB19
z;!MxRc~mX-O`<l0Gum>SL09DwdTN`V^NQ^=#)y9XFmIds7+JL|#T^GM^zxZ7NaqIa
z$$N0D7t)e#TANgNy(2+4@9KC~FK=sq4y*eZJ=I|xbp~z-qH@DnP4CDtGluB1>sC95
z;DT|Yw&qEK1L$o*>gQ>SeN`WQb0AtgO#_PwYTYlna=HQfNSCxiAJt$!X`l3|_QEhe
ztn*Y<h--T3AsizqOrOnpnZ`%uq{?iiY`xISpzP`ela1)9S?lW7!_&BHblNk1FdO*A
zNnX^p>mHFHr+G6W{vYevfQ5i@7wd^E*6(Uw?IKjuHFmd8MEixwipZ1YG8`Pog@A)9
z=j8@bEf@?t2x~P!0%$~mD2^GFV?z^2{Uqo~G&jG`*ble2xm42{YG)GXy;R+RvOP&g
z#YIHeI5L~mZZ9H>sXgYf<d!{g-{#cC>fmX8ILPMgl{>*aF^S*=MBvFOO$9Yh88B_F
zK72d5Em^p8SoX$A$BTlao>jsgq+}AYCD~w1^5@>LEyC{YnMmzz5;q5>|IB+~(C#Bk
z)dAxr{#^f6M@B}}fsCkB)8c(ukl`u#pci8J_JVjH&dMTlO$9e;3K<KU=2iQ1m&?5F
zGWNhe;s(?5KoLewTaoZZab(Jj>GrY(H(QmSx5-n}aqY-WrfY}@7X&u8ByNgGTF{<T
zhRk`?kjg`?=_oWw844qMUuf{>HMR;;V;Cibb`?Y@F;3c)N+LoCt@jWCha|0fKAP!C
zju!9iKldienM9!%rg1HpoL2ja4s0%PIm8t!F^|<^xPX+T4%BY_HXwPZ8zV2z=Hetc
z$}}=nLEg0RX;g^VA7rVz(N+*$Ry;TCJ4LQgrJ+8q%Tu-Vq7~lisd*X+|9|YM>U@8R
zIm1n&G57dbS}dyrNq3Gk6${Gv%%v=<?mOHxAMo&5ijQ~*L8>=+dM+`ulf##Fz2s0k
zJ{%1fK0G<R+fC@(^1wfYOUxRotj{~HO)73>UP7jx9PY)vc-|y#){lA4MNBVWRUUXt
z7RO;0^j4>iW-jZ7lfzk(o8gTW6Nx1+%kbw7S9%-u9K1$!>C2Y4Wh)gx&k$+twyPpR
zqHo;4YeYHi@-`9i$~fyAq;@3lN+Geu#B_?sX8C5+dw8L$(`Fl?tU6LAiodC9MpfS+
zRb>p3>bre|RNX#$r%uVBL`UE=jPmY`N$%85$z4GixK`GQfs4h)Ma5zur8{O3>Aobs
z)%aO!s@*!slY{y?q5VT%WR7Gl5zwWJRF96V9T^+iZ+dZ(wRWeSpxxS%chc5$JfXMm
z-aNJI`pw(6?caXjz|g+E(=Gd0<FM8?GRuS>A04}@HM*`fevKYmH?eO0XGX_IM<HzO
zH}ioot?909jg7a)*6FeJ6YH)m=yrK&)|yVdC?!wD$%G!-<wc#G`aGeNxEi#k=@Dc`
zZ`if#`Y;&5TpNe>g?ZwItsQt=I-#SU9j23OuhYfn<f>?La!ha1qk2Ni_o%+(4nCHT
zjgIP#%&u6Wi@^r2v3fO>V^EH-9@;&%dwZ?4v60cCtwlVvrWbmMmZ8Hdd6fmxb@rW$
z3r^<QZ0nkuPVPjYwYEooEG|BwubBz5p`9i&iKOJ#mW2tu#hWpq9!LM{hLr27l04L}
z-1UHTTCd#opr$>V$papF9`%YofdUfrD9uH)#p9`$7*n)c*@<H#`T&nDh%m5Gjc+M6
zriZJl9btY%D0s_D2PSlz+g{!|aZC~$G4CZoUQZFf$sh_|bh(n=i*P^r{UD(AqL3B)
z;T&|Rk?lA!C-2Kx<8VGq(h1<pOQykUliFU;*eyPkOKrnfL`W;qCUyLq5xPn8o{>*~
zE@;;ujz~&(p^1XRb~)t@w^o-8ZAV6_B7hJLO{764{f#3XxGt}w8SiM#Vrp9p%hf6j
z^FT+{p|*Q#@()XPRxblr?AzSOWKB_=kXSG0na7i{UJV+b^5(BS#|wBo*>=u$a;}lH
zy=HO8ph=ICiw)Aw>6~Y-+h7~Dqm>PczOCxsY}bY>c-p56kFb^6YHcM}kYwS8mC8iz
z?mD6bFTqU)(bQUWwrP+_gIy`PupII&VH=SKPpvnUR<UB%a@7RoiG^4}<xlovqBQ4V
zx@VFueMp`K)+oHMLRvfVd!LJOH1`)h8h!lnNSs`F<b}hPb~c>i!b4Iqzikw>QrY_A
z0+Wz&8oY~><;Z}7nV-B5QH1yL$3v?!8-;6hFUCCf#iwJ5Un`x&chy23f0!4q$ja3a
z#tJOAbb(C2U^2YCy!B#5+2y2G)5&`!=8fy?U{rtc#D07Kl-|yGwa0n%c6l#P0(CGk
zq!nC^>~}Q4Nj-knX?OA1lyhYZCPVVB)rgNf(o+R~z=PKsyY{5M*~J$^L$q8xahzRT
z!<RSCYPeJ7EoXQpY2I~#WO{dG`4GWUM(vD4`c&}(>A?zbsP8pzn6?^awd(im#=Wjd
zu;GZikaCT-eIbfzERr&42TDH(Tt_Gg-#3z`r6<gb-EDKL1S>r$$&uw|HZH^1(l~Kp
zw3te?E5Ax$2gxc`g5^r$g<gYEeTejcx$XIKQFSktNSc)>4vSfS$ap(X;zIkJ83(#Q
zCniz>yVj+oCF4g!+)Aoj9(t7IHT@xi_=Rc+HDalFR&oUtVWWrG9~3@%y2)skT;v~r
zII~V_j!-`RAR|gkNqafYZ{wJV&Jz)@m&BCMA_C(XtjlYn!IVtFC^b|r<CXEA5(hpn
z>4s+!H)04L`6*?SfR*%OeFVMhE(MU6mE{~uvp`Of&Y1Utgp^#6MsknAbEJ>trvoRl
z^pavm(u0k%IuQ&YmUe0h>dmgWxzMluWYGemId&qG+JmRsr$jB7BtiPdK`Wk(r?~(#
z7b&66|4Z!PEL*I3#Juwz-lAvEK$+kmY7y6~qC=`osb6>DrR6K11@?q~^(>_ac+Lk$
z?PFqzUHfd=C_=w#G|636t7+e<@>9(uvsEX!sNEDI%v3d;^2RM%&T6G>I$0Xjc2;z@
z@q|cPPbN1OJ*Rc1lDlm_Jpzg!Xsr0sdPX)KQaY(1RSomnCywPETlnZd<qb#WwrwbJ
z$n&Z&bxB?ftKF(mhvmC*urfy`^q#ycAyY&{y-SvOx>HT81210gP~>P#i%QoBTT^wW
zTqID^klJWJaV$D<OnyL@8D7{VfO0D6?@<|+J!-+Uu7iUY%n}<G&ztI?(pj-jqqr?`
I`u~CWzbE-pQvd(}

literal 0
HcmV?d00001


From df835dd61087ad659a991f51f5fa50b055bf53a8 Mon Sep 17 00:00:00 2001
From: Aitor Magan <aitor.magan@gmail.com>
Date: Mon, 2 Mar 2020 11:35:43 +0000
Subject: [PATCH 039/276] Fix RO links

---
 .../ro/LC_MESSAGES/ckanext-datarequests.mo    | Bin 8401 -> 8381 bytes
 .../ro/LC_MESSAGES/ckanext-datarequests.po    |   6 +++---
 .../so/LC_MESSAGES/ckanext-datarequests.mo    | Bin 0 -> 8278 bytes
 3 files changed, 3 insertions(+), 3 deletions(-)
 create mode 100644 ckanext/datarequests/i18n/so/LC_MESSAGES/ckanext-datarequests.mo

diff --git a/ckanext/datarequests/i18n/ro/LC_MESSAGES/ckanext-datarequests.mo b/ckanext/datarequests/i18n/ro/LC_MESSAGES/ckanext-datarequests.mo
index ea5389df46d6fa2745d381af5f76ed7a716a7f02..a84442be36cbf6e1af9cd3355a5ba089c66de250 100644
GIT binary patch
delta 156
zcmccUxYu#R7S{R)3=9m$atsU{Kw3nefq@T5%R*@#Ak7WrTSNKoKw1jO4+GLbEewS~
zngvKt0MhJ0dMc3S0n&4!^eP}N2;^@E(!xOcB#;J~e-}u50O>dK3~UVTK!)jNOE!Lq
O$@lpyHeZqZ%LoABK^5Ns

delta 277
zcmdn%c+qjg7S{SN3=9m$atsU{Kw3kdfq@T58$xLZAk7Wr`$PHBKw1jO&jQjwEex$d
zngvKN0n+S1dL@wN0n!_x^gbXh2;`pz(!xOcE|3P9{}D)g0BHsV1~!IvAnm!?l8s*?
z{!zmm<=n)g?3DcSyhjal6-qKoa#C%9qP|c;g~HOz<ZOka)U?#1)V$<WkfM~tl0@B-
z#G>@n5|Gk@{DS<l)FQY{a(-S(Y93f>vVnkz1Y9DcBsT}7p`@r3WX|UOa{m|s4^m4w

diff --git a/ckanext/datarequests/i18n/ro/LC_MESSAGES/ckanext-datarequests.po b/ckanext/datarequests/i18n/ro/LC_MESSAGES/ckanext-datarequests.po
index a096cb16..26672888 100644
--- a/ckanext/datarequests/i18n/ro/LC_MESSAGES/ckanext-datarequests.po
+++ b/ckanext/datarequests/i18n/ro/LC_MESSAGES/ckanext-datarequests.po
@@ -367,9 +367,9 @@ msgid ""
 "\">Markdown formatting</a> here. You can refer datasets by adding their "
 "URL."
 msgstr ""
-"Poți folosi <a href=“#markdown” title=“Markdown quick reference” data-"
-"target=“popover” data-content=“%(markdown_tooltip)s” data-"
-"html=“true”>formatarea Markdown</a> aici. Poți refenția seturi de date "
+"Poți folosi <a href=\"#markdown\" title=\"Markdown quick reference\" data-"
+"target=\"popover\" data-content=\"%(markdown_tooltip)s\" data-html=\"true"
+"\">formatarea Markdown</a> aici. Poți refenția seturi de date "
 "adăugând URL-ul lor."
 
 #: ckanext/datarequests/templates/datarequests/snippets/comment_form.html:28
diff --git a/ckanext/datarequests/i18n/so/LC_MESSAGES/ckanext-datarequests.mo b/ckanext/datarequests/i18n/so/LC_MESSAGES/ckanext-datarequests.mo
new file mode 100644
index 0000000000000000000000000000000000000000..40591a75dd8bfa150039f3b9788dd353a6eaf4a6
GIT binary patch
literal 8278
zcmcJTZHygN8OKi*MAjD&K|p*tEEGZZ-tKNIHcOXwySr^yx^2^4pe6)z?w#3thn+j;
z?!0vOf=x6K74?G}iJ0IAd<lv85)(8gh>2)O42m)Mf-&*|V~iL-SX6?EiNEK}%)NKo
zt(Ffq+xgEq=Q+=L-k&q~`HRkZK=H4^|99|z?6oo){M+?9rLJN)4W0`c@XcTgybwGN
zUI2a!d;|FTV*bnETNpo9tUm?T82=ia1kX87DPGn4LE(E7co8^P%-;s`r|#f!F}MP5
z1@8eh_%L`G_$2st@OQ=dpWy2mU%+D=ybP>^3*cM94G<FbsRBO-%DE4LZv?*uYViBu
z<>2qZ_ku5ja{lP~O1%v{0KN&l6Wp>zsSYUm+L8SHkAR}zCqS{wXTa^?7eS%>MX~+|
z@KVMv7US1IEc?y}<(vyak^eo#_*U?0#vM@X{#o!G@Jpch<q=T!f47)_0u;TT1Vx{p
zgCh5zK{@wjQ0#vJMB@KTK=Jn^I0oKYjPC`7?h)`3@Ef4`^GD#D(f@Ct*hhpI1+D=_
zo&_Fa_hX>&4?(fR{ooGp2~hZ)1owg(rDVPdN}N0h{tA2=#Kh`hf{vrqqoC;VJy87l
z6o`w|GoZ-#8&J;sD=2c0V05v|g`n)e6qNl}7vsrdyc<LmwFvG6ZwHsb2f(kQ=ZoMt
z<4>cM$n!%`?D{mwpZX&YL{+bV!vB1Nmp^qW4_O}rWql7g1s(xsz)ymNfchCI@;(O&
z{qvyccM=r&{{>21Y(dE}@G?;BJ`YMhtb*d#`@naB4}rq>aZt{C3cL~A0u$jg%|rMv
zgTnuI5EWGu#B?eHCEh*?z7u>Dybk;cI03!{ik-J|sOY;Fd<8rL3ZD-kl-TojQ24Kc
zVz(IF34RFVPko1n==}@`OZ7`o=>GzuvN{RMx#wZ*ZQukbab`fV!+oIm_1mEE`2i^B
z{uq2W_$(-;?Ilp+<Yf?+u6T$%ms3RK+^ay@KLv`udqC0u4)7ZAUhqorYoN&YQ&5A?
zg4@BrgD1gjuTbiG@CuA0a_<MlFKZwq>V8n-;45Gad<>L$e*qNwOE`QdxEmC{8=&y}
zx(G!aJ_m}ue~Xg^{{#xZe}JO*xhO6EyBL%>*b0gsbD-3V02DnVQ0$R{5+^4>;q!5j
zP*D$pV%Kki5~q)Y$H0GsYP4%w{;2Mn*mV5Vk98+YQr+;iiF6R9e#?*5Ov7fWnrSxu
zZe7or)Fgf}Onq-?A`OlQX-_Yuv2QwR#`E;7?R5MIV%}w=KI*S!ev(fZ9r^3SBtaV3
z$b@<!TCr*-_I1x@I?0NcbrYpJwc7JT1l4IfNOUvjzx(W{J&_>JCD^TIP1N*5H5=N*
z&!1Hh-GZk|6$;c_6CK%9uh=Z=FIFZo8^Zb8oz}osB@4YUr`smq-tc{~Z!^q1f51jo
z-Ab<GCJWuH5e7+nvprdt69)@Pd2BLpsqUDKpp$j9UC~=T-E8CaCQeUuXrtDq8-l3Z
zFfpJn$Z<1{sQ7i(%^|p;jn!-x#{__$3zBA*B=}cV=!XYl#nUWsD#5_^XIwem0Tt3S
zdZ9wK`8i2N`b3*BwCg%c#Ds*VNmdDrICp*8HmN2?g;U>crEJ~Mq)>Kr&rj=mVa0{I
zi}1vDe4TXtX0Q@8b517m+`1tXgqvxE#J|-m0Sf`+4&D=4T-*)L^72$o#@y~E8QsiX
zmS>(Um+4TP*b89P4_-8g27+;53t^oFC;&rQAckWG<G9oWl4cxqC7Xxe&pHn0J(L>u
zhT0$7tedC<7~4oO$`uh|ZRGD(izcFqsYCv{)RsfGvN<Vob@OSx9;9ujaw|AaP9iu7
z5g6ezY@i`7n@l^ekKRLVi+d+VWv`7}CJOF0&IpH)l1aptVuLfOpNB(FggxB#BXxL~
zcz968&v6q5UWF`COTLMl?W(HvdR;B0WTje`=u3l?NFfGIh~vGUL?6M*B6GtA9;V4<
z%xQ*It=6uh@)pWCh85zWLraDtj9PXg5sMPYv>CtCO?$;`zxDi&I<;&EfjoTZ7#UF{
zfy*t)n>>?x+7!l+IYSTWN2qfhjV3Nrp{|dFKJh%}x*$D<QA}$0lL#Z)*rQdF5klyq
zhYVPivTB-GrYkjCqO;2PgS0crLK7x-Aee9)#EK4FEhuV8(X7Nh&Wd3VDJdP8-NkJ{
z@ldx!CQI8k4(?_enfggS?BUa>5V4wMiMqvg5M6e>Vp!oKD)h@x<<zZ-I`g6v-q~rG
z8wLNr?CJOUYKu9`O=7X)@^NOdoDHPh6{LxHP{wC3W!`mP<)-5S7oRhoBN0N9>Rm>+
zV}E6O^s0`DS3SEPjpi{tJ-S#-=(Q|pt`ZU}K3%rSJ<g*P*HRNxsi#M~wrh|3aWUJp
zT<0RDw_aN^yfd{nOoQ%qNkP+2JK^+b8fX6KP5nb8mrR-x&%3snn{=DA>bi_&ceXoL
zI)HAFX`WYfks#K$96eZ9g>|``h<Ih5RR)P0$-PoYTr=@o`DL@bGwMU!P}OO(L#eD<
z(kAj}qK31oGDuXJLzMbXWss<Q#!u*k3QBeaO@>j{Y54I8JuG?AP&QpF`^2V;`NmV4
z#io=6n^Q=S#P%+~nbsD(+O1qU=&w_{xoRSRBdv*mMY%}yczt_)V&tgbwQ*WoOj?0g
z+ncqL+OnO}^NTYJ2lvd(%^jUzS{gZWc)8{-YcQ+LQCX(+<oLu5wecOb$(?#)$JCDZ
zT|YiKJ`Q2+sDC_=LkDy_YvYsr>4_Vr#-ZB|-9eM2wdL4E33bZGQ+jS@d1h&LVgAtU
zygs-*M-N)Ddz_b>fdp;6Y3r*#`=VAx7oXCJ?GI|pd`ZZR-gWTco-nB6)SE_*gjsCD
z+CJhknbJ|$4U_4~8+HCVeQl(#oYoW9jVvxK&JRpAQ6C?f&9k7k-0N~wisiO(7Ym{r
z-R+jZo6gde+Rg!;XhM3`=A)*Sz@E}O8$mj<-;exQ3UO_3Z%Xeq4L{VASbfI`9~Pl8
z9pjm{(GA-&dfgbb&N8k{YaZ{NfNNW_nrW|XR!pRB&Jtr932(=2OE+jy?V#mT%tNEi
zS_5`HR#r(JCTy!^;qNiGWD#kVGGW$34ucP28tWA!*V1wXNfPJ{w!yKS%t<s?@~q(w
z_1Zq_7<yxy+mvo+jTAwxr4u9mhM^{TmRn2@N#zzHq-hY#ANNoWM4(76Vy|*5a#4Jd
zu!nR+vbveOsa>;4+p1#$cQKw`J14=Ckf#tG<c(>yFW1xo0>}qMh~+6!VGtFomOCvr
za!alLqE1XGRxWv}nKjf)0>-&*ifxWvf*mky$x==dm*R}v1b(kLOPgLkkCz*!iHmXx
z`|}vQk()6<<8oQfa+J0>H4hj=Eo~dp+UTs65f@%0e%R_EOv9{+cbwZc+3F9rTFc%Z
zA9`$^$aiux?C+gvWLX@bQN<H{@-vP64t;f-=-lQJx^VLh--=#h5}9Hrp(#<62dKD{
z>7JOpVkQ^GL+%y=kqSHJ4ilc@0mpE#%8XmrUJ$?#Zw`6O?dgda9mCgj)*&*HF*Ge+
zDIBHe`uWorZzxibeGr9CwZO4-;pXDMr?WEiBIA<4bLY4=!I|g~u;92L3|fgj1=op1
zCl0nZji5>Lw5%n)>iU2|BbQ1=ZdtdhW#qoumIc0Rv{+nttV#qrg0e#NJSSxlY|&Vr
zspPQpscewg5ru<1)y3_(PLjW|X^^~#&3oH-8Rv>j?vvald-Gx>yQF+9yOdW;^1}f|
z!5h3~&ezTcX9!yKAYJ%KCP&)jIbSAi%BEbtO1Be1>Sk*<tXc{@Rzl=;%Af{CQ|gQ9
zWT84NG3^;Tv)?nlZFw2H&1@8*gdcK62Tm1xcFbLYqya)_ahAFI9O9A<oZTxUCXY06
zo)b&T66L0>DPm!<MavAWOU;zSH<^cPf9v4$aM5Tau^K62wHT1r?8n29N?BuADEPvM
zzd&HG`@LwJOJgqiPGhx?jR#DRb$n31a5Ik*<mecgryrCHRvpDx{F--amhZO>%P(M(
zRn*=<TquDoS05MCcq-2ZzE4n(G>1rpC<>Zb8IwwP8nTCDMFNWIMKL7}P%y6%F5&xG
zh;ohx!nI-KWQhuqGO>tsgGgeTUPRxdukxz|1W{fJim;=(vfp?ZwOT6kkYfqAlZRzM
z@s%V|H^}laa%LmozGXWEDrEe~=JQ)f5MqfAymio%$s+KJv?5hoB=SDvg;+?w?j&pz
zsi)3iE18$^4Jt-kXRph3r@C}fWYvy<8gKi_%VthrmGs~nGHAKPmptxpRMW)_Kln&B
z&fO0a5AG6u_*ZgS`gq_DP%}s+I$L*VkY5}nMG`L3KH4}FxUiKdceLU$VhB1%iY?bH
zmUoo>UO79|#YzuL3#-f{PbGz1J$7<X*-5FE)aqO?IZFhW;6LRo;_Xb-dGDoy<(i|H
zvuxgZss~_&;s_UyQdj%8mnvmRht|c#2J_`Nh>8t1lS))58ayo`;Hq4;TXm1iG*^2G
zsTPNw#-ExZEc@wLM#9;A7;-jwvf3udsC*gPZV(pD|IY{F8ja2L$l(0@P%a5kT^HhK
zx|Mki%wM!4yj3e3nD3E+bVCVQ8Y7)SJ{W6crM28KNW`Lk$ZfY8P(vfypmnPQwx<kP
zUzR&IIpwnGlsd?TqFm;@w){W6SVFW)YjO{(%IxdEcvev{q>V^93n=f3UO@qENbMM!
zl@Clp*TAeX_`Doa$KCsBL#W*UG-SEja$tBm$spgbTuGtzpz#dz8xT_o`osg;{{SMc
B)}a6Z

literal 0
HcmV?d00001


From 5906687063cfd14e1380953f1c57dfc4ffbd2cfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aitor=20Mag=C3=A1n=20Garc=C3=ADa?=
 <aitormagan@users.noreply.github.com>
Date: Mon, 2 Mar 2020 12:49:01 +0100
Subject: [PATCH 040/276] Get ready for next version

---
 README.md | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index a242abad..7ad2e23d 100644
--- a/README.md
+++ b/README.md
@@ -219,7 +219,7 @@ sudo service apache2 restart
 
 ## Translations
 
-Help us to translate this extension so everyone can create data requests. Currently, the extension is translated to English, Spanish, German and Brazilian Portuguese. If you want to contribute with your translation, the first step is to clone this repo and move to the `develop` branch. Then, create the locale for your translation by executing:
+Help us to translate this extension so everyone can create data requests. Currently, the extension is translated to English, Spanish, German, French, Somali, Romanian and Brazilian Portuguese. If you want to contribute with your translation, the first step is to clone this repo and move to the `develop` branch. Then, create the locale for your translation by executing:
 
 ```
 python setup.py init_catalog -l <YOUR_LOCALE>
@@ -252,6 +252,14 @@ python setup.py nosetests
 
 ## Changelog
 
+### v1.2.0 (UNRELEASED)
+
+* New: French translations (thanks to @bobeal)
+* New: Romanian translations (thanks to @costibleotu)
+* New: Option to force users to introduce a request description (thanks to @MarkCalvert)
+* Fix: Documentation fixes (thanks to @nykc)
+* Fix: Datarequests creation and closing times displayed incorrectly (thanks to @iamarnavgarg)
+
 ### v1.1.0
 
 * New: Compatibility with CKAN 2.8.0

From cfa021f34832a4a7f77b2c2048e79eba8418cc07 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 7 Apr 2020 19:27:07 +0000
Subject: [PATCH 041/276] Bump coveralls from 1.11.1 to 2.0.0

Bumps [coveralls](https://github.com/coveralls-clients/coveralls-python) from 1.11.1 to 2.0.0.
- [Release notes](https://github.com/coveralls-clients/coveralls-python/releases)
- [Changelog](https://github.com/coveralls-clients/coveralls-python/blob/master/CHANGELOG.md)
- [Commits](https://github.com/coveralls-clients/coveralls-python/compare/1.11.1...2.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 8076433a..e3236deb 100644
--- a/setup.py
+++ b/setup.py
@@ -48,7 +48,7 @@
     tests_require=[
         'nose_parameterized==0.3.3',
         'selenium==3.141.0',
-        'coveralls==1.11.1'
+        'coveralls==2.0.0'
     ],
     test_suite='nosetests',
     entry_points='''

From 1d72a8c559c6d9e37c20ed794e4da4cf33b502cb Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 19 May 2020 19:18:19 +0000
Subject: [PATCH 042/276] Bump lxml from 4.5.0 to 4.5.1

Bumps [lxml](https://github.com/lxml/lxml) from 4.5.0 to 4.5.1.
- [Release notes](https://github.com/lxml/lxml/releases)
- [Changelog](https://github.com/lxml/lxml/blob/master/CHANGES.txt)
- [Commits](https://github.com/lxml/lxml/compare/lxml-4.5.0...lxml-4.5.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 requirements-dev.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements-dev.txt b/requirements-dev.txt
index c168bfd9..4a7a2561 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -6,7 +6,7 @@ nose==1.3.7
 mock
 nose_parameterized==0.3.3
 profanityfilter
-lxml==4.5.0
+lxml==4.5.1
 splinter>=0.13.0
 -e git+https://github.com/qld-gov-au/ckanext-data-qld@develop#egg=ckanext-data_qld
 -e git+https://github.com/ckan/ckantoolkit@release-0.0.4#egg=ckantoolkit

From 20517e30f395746e4881148f7ae7a48eaf25908e Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 25 May 2020 19:16:06 +0000
Subject: [PATCH 043/276] Bump flake8 from 3.7.9 to 3.8.2

Bumps [flake8](https://gitlab.com/pycqa/flake8) from 3.7.9 to 3.8.2.
- [Release notes](https://gitlab.com/pycqa/flake8/tags)
- [Commits](https://gitlab.com/pycqa/flake8/compare/3.7.9...3.8.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 requirements-dev.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements-dev.txt b/requirements-dev.txt
index c168bfd9..37e21df0 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,7 +1,7 @@
 beautifulsoup4==4.8.2
 behave==1.2.6
 behaving==1.5.6
-flake8==3.7.9
+flake8==3.8.2
 nose==1.3.7
 mock
 nose_parameterized==0.3.3

From 0757bdb8a42b13193d2a8bf63d0a9942ee0333f3 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 26 May 2020 00:02:00 +0000
Subject: [PATCH 044/276] Bump beautifulsoup4 from 4.8.2 to 4.9.1

Bumps [beautifulsoup4](http://www.crummy.com/software/BeautifulSoup/bs4/) from 4.8.2 to 4.9.1.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 requirements-dev.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements-dev.txt b/requirements-dev.txt
index 37e21df0..f62c1aee 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,4 +1,4 @@
-beautifulsoup4==4.8.2
+beautifulsoup4==4.9.1
 behave==1.2.6
 behaving==1.5.6
 flake8==3.8.2

From cf32b8e28e6a143d8f8a42328457bb98eeebf218 Mon Sep 17 00:00:00 2001
From: Mark Calvert <mark.calvert@salsadigital.com.au>
Date: Mon, 8 Jun 2020 16:30:38 -0600
Subject: [PATCH 045/276] [DQL2-32] Added new admin config
 'datarequest_circumstances' [DQL2-33] Added new columns to datareqest table:
 - close_circumstance - approx_publishing_date Added close_circumstance &
 approx_publishing_date values to action 'close_datarequest' Show
 close_circumstance & approx_publishing_date values on 'additional_info.html'
 [DQL2-31] - Add template helper get_closing_circumstances - Added closing
 circumstances dropdown to 'close_datarequest_form.html' with JS logic to
 show/hide condition elements - Refactored '_dictize_datarequest' &
 '_undictize_datarequest_basic' methods to the 'db.py' model - Added
 conditional logic for throuhout extension for 'closing_circumstances_enabled'

---
 ckanext/datarequests/actions.py               |  71 ++----------
 ckanext/datarequests/constants.py             |   1 +
 .../datarequests/controllers/ui_controller.py |  11 +-
 ckanext/datarequests/db.py                    | 109 ++++++++++++++----
 .../fanstatic/datarequest_close.js            |  36 ++++++
 ckanext/datarequests/helpers.py               |  16 +++
 ckanext/datarequests/plugin.py                |  27 ++++-
 .../datarequests/templates/admin/config.html  |  27 +++++
 .../snippets/additional_info.html             |  16 ++-
 .../snippets/close_datarequest_form.html      |  23 ++++
 ckanext/datarequests/validator.py             |  12 +-
 requirements-dev.txt                          |   2 +-
 12 files changed, 258 insertions(+), 93 deletions(-)
 create mode 100644 ckanext/datarequests/fanstatic/datarequest_close.js
 create mode 100644 ckanext/datarequests/templates/admin/config.html

diff --git a/ckanext/datarequests/actions.py b/ckanext/datarequests/actions.py
index cb996475..5bc3129c 100644
--- a/ckanext/datarequests/actions.py
+++ b/ckanext/datarequests/actions.py
@@ -51,64 +51,12 @@ def _get_user(user_id):
         log.warn(e)
 
 
-def _get_organization(organization_id):
-    try:
-        organization_show = tk.get_action('organization_show')
-        return organization_show({'ignore_auth': True}, {'id': organization_id})
-    except Exception as e:
-        log.warn(e)
-
-
-def _get_package(package_id):
-    try:
-        package_show = tk.get_action('package_show')
-        return package_show({'ignore_auth': True}, {'id': package_id})
-    except Exception as e:
-        log.warn(e)
-
-
 def _dictize_datarequest(datarequest):
-    # Transform time
-    open_time = str(datarequest.open_time)
-    # Close time can be None and the transformation is only needed when the
-    # fields contains a valid date
-    close_time = datarequest.close_time
-    close_time = str(close_time) if close_time else close_time
-
-    # Convert the data request into a dict
-    data_dict = {
-        'id': datarequest.id,
-        'user_id': datarequest.user_id,
-        'title': datarequest.title,
-        'description': datarequest.description,
-        'organization_id': datarequest.organization_id,
-        'open_time': open_time,
-        'accepted_dataset_id': datarequest.accepted_dataset_id,
-        'close_time': close_time,
-        'closed': datarequest.closed,
-        'user': _get_user(datarequest.user_id),
-        'organization': None,
-        'accepted_dataset': None,
-        'followers': 0
-    }
-
-    if datarequest.organization_id:
-        data_dict['organization'] = _get_organization(datarequest.organization_id)
-
-    if datarequest.accepted_dataset_id:
-        data_dict['accepted_dataset'] = _get_package(datarequest.accepted_dataset_id)
-
-    data_dict['followers'] = db.DataRequestFollower.get_datarequest_followers_number(
-        datarequest_id=datarequest.id)
-
-    return data_dict
+    return datarequest.dictize_datarequest()
 
 
-def _undictize_datarequest_basic(data_request, data_dict):
-    data_request.title = data_dict['title']
-    data_request.description = data_dict['description']
-    organization = data_dict['organization_id']
-    data_request.organization_id = organization if organization else None
+def _undictize_datarequest_basic(datarequest, data_dict):
+    datarequest.undictize_datarequest_basic(data_dict)
 
 
 def _dictize_comment(comment):
@@ -131,7 +79,7 @@ def _undictize_comment_basic(comment, data_dict):
 def _get_datarequest_involved_users(context, datarequest_dict):
 
     datarequest_id = datarequest_dict['id']
-    new_context = {'ignore_auth': True, 'model': context['model'] }
+    new_context = {'ignore_auth': True, 'model': context['model']}
 
     # Creator + Followers + People who has commented + Organization Staff
     users = set()
@@ -141,7 +89,7 @@ def _get_datarequest_involved_users(context, datarequest_dict):
 
     if datarequest_dict['organization']:
         users.update([user['id'] for user in datarequest_dict['organization']['users']])
-    
+
     # Notifications are not sent to the user that performs the action
     users.discard(context['auth_user_obj'].id)
 
@@ -214,7 +162,7 @@ def create_datarequest(context, data_dict):
     data_req.open_time = datetime.datetime.utcnow()
 
     session.add(data_req)
-    session.commit()    
+    session.commit()
 
     datarequest_dict = _dictize_datarequest(data_req)
 
@@ -562,8 +510,11 @@ def close_datarequest(context, data_dict):
         raise tk.ValidationError([tk._('This Data Request is already closed')])
 
     data_req.closed = True
-    data_req.accepted_dataset_id = data_dict.get('accepted_dataset_id', None)
+    data_req.accepted_dataset_id = data_dict.get('accepted_dataset_id') or None
     data_req.close_time = datetime.datetime.utcnow()
+    if tk.h.closing_circumstances_enabled:
+        data_req.close_circumstance = data_dict.get('close_circumstance') or None
+        data_req.approx_publishing_date = data_dict.get('approx_publishing_date') or None
 
     session.add(data_req)
     session.commit()
@@ -806,6 +757,7 @@ def delete_datarequest_comment(context, data_dict):
 
     return _dictize_comment(comment)
 
+
 def follow_datarequest(context, data_dict):
     '''
     Action to follow a data request. Access rights will be cheked before 
@@ -857,6 +809,7 @@ def follow_datarequest(context, data_dict):
 
     return True
 
+
 def unfollow_datarequest(context, data_dict):
     '''
     Action to unfollow a data request. Access rights will be cheked before 
diff --git a/ckanext/datarequests/constants.py b/ckanext/datarequests/constants.py
index 560ed748..cf3c1cb8 100644
--- a/ckanext/datarequests/constants.py
+++ b/ckanext/datarequests/constants.py
@@ -35,3 +35,4 @@
 DESCRIPTION_MAX_LENGTH = 1000
 COMMENT_MAX_LENGTH = DESCRIPTION_MAX_LENGTH
 DATAREQUESTS_PER_PAGE = 10
+CLOSE_CIRCUMSTANCE_MAX_LENGTH = 100
diff --git a/ckanext/datarequests/controllers/ui_controller.py b/ckanext/datarequests/controllers/ui_controller.py
index 71419256..44a5573f 100644
--- a/ckanext/datarequests/controllers/ui_controller.py
+++ b/ckanext/datarequests/controllers/ui_controller.py
@@ -263,7 +263,7 @@ def delete(self, id):
             log.warn(e)
             tk.abort(404, tk._('Data Request %s not found') % id)
         except tk.NotAuthorized as e:
-            log.warn(e) 
+            log.warn(e)
             tk.abort(403, tk._('You are not authorized to delete the Data Request %s'
                                % id))
 
@@ -305,6 +305,10 @@ def _return_page(errors={}, errors_summary={}):
             for dataset in base_datasets:
                 c.datasets.append({'name': dataset.get('name'), 'title': dataset.get('title')})
 
+            if tk.h.closing_circumstances_enabled:
+                # This is required so the form can set the currently selected close_curcumstance option in the select dropdown
+                c.datarequest['close_circumstance'] = request.POST.get('close_circumstance', None)
+
             return tk.render('datarequests/close.html')
 
         try:
@@ -317,6 +321,10 @@ def _return_page(errors={}, errors_summary={}):
                 data_dict = {}
                 data_dict['accepted_dataset_id'] = request.POST.get('accepted_dataset_id', None)
                 data_dict['id'] = id
+                if tk.h.closing_circumstances_enabled:
+                    data_dict['close_circumstance'] = request.POST.get('close_circumstance', None)
+                    data_dict['approx_publishing_date'] = request.POST.get('approx_publishing_date', None)
+                    data_dict['condition'] = request.POST.get('condition', None)
 
                 tk.get_action(constants.CLOSE_DATAREQUEST)(context, data_dict)
                 tk.redirect_to(helpers.url_for(controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI', action='show', id=data_dict['id']))
@@ -425,4 +433,3 @@ def follow(self, datarequest_id):
     def unfollow(self, datarequest_id):
         # Method is not called
         pass
-        
diff --git a/ckanext/datarequests/db.py b/ckanext/datarequests/db.py
index 1f36ac91..96fe6833 100644
--- a/ckanext/datarequests/db.py
+++ b/ckanext/datarequests/db.py
@@ -20,10 +20,15 @@
 import constants
 import sqlalchemy as sa
 import uuid
+import logging
+import ckan.lib.dictization.model_dictize as model_dictize
+import ckan.plugins.toolkit as tk
 
-from sqlalchemy import func
+from sqlalchemy import func, MetaData, ForeignKey, DDL
 from sqlalchemy.sql.expression import or_
+from ckan.lib import dictization
 
+log = logging.getLogger(__name__)
 DataRequest = None
 Comment = None
 DataRequestFollower = None
@@ -38,6 +43,8 @@ def init_db(model):
     global DataRequest
     global Comment
     global DataRequestFollower
+    global closing_circumstances_enabled
+    closing_circumstances_enabled = tk.h.closing_circumstances_enabled
 
     if DataRequest is None:
 
@@ -84,26 +91,56 @@ def get_open_datarequests_number(cls):
                 '''Returns the number of data requests that are open'''
                 return model.Session.query(func.count(cls.id)).filter_by(closed=False).scalar()
 
+            def dictize_datarequest(self):
+                '''Returns this model and its relationship models as a dictionary'''
+                context = {'model': model}
+                data_dict = dictization.table_dictize(self, context)               
+                if self.organization:
+                    data_dict['organization'] = model_dictize.group_dictize(self.organization, context)
+                if self.package:
+                    data_dict['accepted_dataset'] = model_dictize.package_dictize(self.package, context)
+                data_dict['followers'] = DataRequestFollower.get_datarequest_followers_number(datarequest_id=self.id)
+
+                return data_dict
+
+            def undictize_datarequest_basic(self, data_dict):
+                '''Adds some basic data_dict fields to the datarequest model'''
+                self.title = data_dict.get('title', '')
+                self.description = data_dict.get('description') or None
+                self.organization_id = data_dict.get('organization_id') or None
+                if tk.h.closing_circumstances_enabled:
+                    self.accepted_dataset_id = data_dict.get('accepted_dataset_id') or None
+                    self.close_circumstance = data_dict.get('close_circumstance', None)
+                    self.close_circumstance = data_dict.get('approx_publishing_date', None)
+
         DataRequest = _DataRequest
 
         # FIXME: References to the other tables...
         datarequests_table = sa.Table('datarequests', model.meta.metadata,
-            sa.Column('user_id', sa.types.UnicodeText, primary_key=False, default=u''),
-            sa.Column('id', sa.types.UnicodeText, primary_key=True, default=uuid4),
-            sa.Column('title', sa.types.Unicode(constants.NAME_MAX_LENGTH), primary_key=True, default=u''),
-            sa.Column('description', sa.types.Unicode(constants.DESCRIPTION_MAX_LENGTH), primary_key=False, default=u''),
-            sa.Column('organization_id', sa.types.UnicodeText, primary_key=False, default=None),
-            sa.Column('open_time', sa.types.DateTime, primary_key=False, default=None),
-            sa.Column('accepted_dataset_id', sa.types.UnicodeText, primary_key=False, default=None),
-            sa.Column('close_time', sa.types.DateTime, primary_key=False, default=None),
-            sa.Column('closed', sa.types.Boolean, primary_key=False, default=False)
-        )
+                                      sa.Column('user_id', sa.types.UnicodeText, primary_key=False, default=u''),
+                                      sa.Column('id', sa.types.UnicodeText, primary_key=True, default=uuid4),
+                                      sa.Column('title', sa.types.Unicode(constants.NAME_MAX_LENGTH), primary_key=True, default=u''),
+                                      sa.Column('description', sa.types.Unicode(constants.DESCRIPTION_MAX_LENGTH), primary_key=False, default=u''),
+                                      sa.Column('organization_id', sa.types.UnicodeText, sa.ForeignKey(model.Group.id), primary_key=False, default=None),
+                                      sa.Column('open_time', sa.types.DateTime, primary_key=False, default=None),
+                                      sa.Column('accepted_dataset_id', sa.types.UnicodeText, sa.ForeignKey(model.Package.id), primary_key=False, default=None),
+                                      sa.Column('close_time', sa.types.DateTime, primary_key=False, default=None),
+                                      sa.Column('closed', sa.types.Boolean, primary_key=False, default=False),
+                                      sa.Column('close_circumstance', sa.types.Unicode(constants.CLOSE_CIRCUMSTANCE_MAX_LENGTH), primary_key=False, default=u'')
+                                      if closing_circumstances_enabled else None,
+                                      sa.Column('approx_publishing_date', sa.types.DateTime, primary_key=False, default=None)
+                                      if closing_circumstances_enabled else None
+                                      )
 
         # Create the table only if it does not exist
         datarequests_table.create(checkfirst=True)
 
-        model.meta.mapper(DataRequest, datarequests_table,)
+        model.meta.mapper(DataRequest, datarequests_table, properties={
+            'organization': sa.orm.relation(model.Group),
+            'package': sa.orm.relation(model.Package)
+        })
 
+        update_db(model)
 
     if Comment is None:
         class _Comment(model.DomainObject):
@@ -132,12 +169,12 @@ def get_comment_datarequests_number(cls, **kw):
 
         # FIXME: References to the other tables...
         comments_table = sa.Table('datarequests_comments', model.meta.metadata,
-            sa.Column('id', sa.types.UnicodeText, primary_key=True, default=uuid4),
-            sa.Column('user_id', sa.types.UnicodeText, primary_key=False, default=u''),
-            sa.Column('datarequest_id', sa.types.UnicodeText, primary_key=True, default=uuid4),
-            sa.Column('time', sa.types.DateTime, primary_key=True, default=u''),
-            sa.Column('comment', sa.types.Unicode(constants.COMMENT_MAX_LENGTH), primary_key=False, default=u'')
-        )
+                                  sa.Column('id', sa.types.UnicodeText, primary_key=True, default=uuid4),
+                                  sa.Column('user_id', sa.types.UnicodeText, primary_key=False, default=u''),
+                                  sa.Column('datarequest_id', sa.types.UnicodeText, primary_key=True, default=uuid4),
+                                  sa.Column('time', sa.types.DateTime, primary_key=True, default=u''),
+                                  sa.Column('comment', sa.types.Unicode(constants.COMMENT_MAX_LENGTH), primary_key=False, default=u'')
+                                  )
 
         # Create the table only if it does not exist
         comments_table.create(checkfirst=True)
@@ -164,14 +201,40 @@ def get_datarequest_followers_number(cls, **kw):
 
         # FIXME: References to the other tables...
         followers_table = sa.Table('datarequests_followers', model.meta.metadata,
-            sa.Column('id', sa.types.UnicodeText, primary_key=True, default=uuid4),
-            sa.Column('user_id', sa.types.UnicodeText, primary_key=False, default=u''),
-            sa.Column('datarequest_id', sa.types.UnicodeText, primary_key=True, default=uuid4),
-            sa.Column('time', sa.types.DateTime, primary_key=True, default=u'')
-        )
+                                   sa.Column('id', sa.types.UnicodeText, primary_key=True, default=uuid4),
+                                   sa.Column('user_id', sa.types.UnicodeText, primary_key=False, default=u''),
+                                   sa.Column('datarequest_id', sa.types.UnicodeText, primary_key=True, default=uuid4),
+                                   sa.Column('time', sa.types.DateTime, primary_key=True, default=u'')
+                                   )
 
         # Create the table only if it does not exist
         followers_table.create(checkfirst=True)
 
         model.meta.mapper(DataRequestFollower, followers_table,)
 
+
+def update_db(model):
+    '''    
+    A place to make any datarequest table updates via SQL commands
+    This is required because adding new columns to sqlalchemy metadata will not get created if the table already exists
+    '''
+    meta = MetaData(bind=model.Session.get_bind(), reflect=True)
+
+    # Check to see if foreign key constraints exists and create them if they do not exists
+    if 'datarequests' in meta.tables and not any(x for x in meta.tables['datarequests'].foreign_key_constraints if x.name == 'datarequests_organization_id_fkey'):
+        log.info("DataRequests-UpdateDB: 'datarequests_organization_id_fkey' foreign_key does not exist, adding...")
+        DDL('ALTER TABLE "datarequests" ADD CONSTRAINT "datarequests_organization_id_fkey" FOREIGN KEY ("organization_id") REFERENCES "group" ("id")').execute(model.Session.get_bind())
+
+    if 'datarequests' in meta.tables and not any(x for x in meta.tables['datarequests'].foreign_key_constraints if x.name == 'datarequests_accepted_dataset_id_fkey'):
+        log.info("DataRequests-UpdateDB: 'datarequests_accepted_dataset_id_fkey' foreign_key does not exist, adding...")
+        DDL('ALTER TABLE "datarequests" ADD CONSTRAINT "datarequests_accepted_dataset_id_fkey" FOREIGN KEY ("accepted_dataset_id") REFERENCES "package" ("id")').execute(model.Session.get_bind())
+
+    # Check to see if columns exists and create them if they do not exists
+    if tk.h.closing_circumstances_enabled:
+        if 'datarequests' in meta.tables and 'close_circumstance' not in meta.tables['datarequests'].columns:
+            log.info("DataRequests-UpdateDB: 'close_circumstance' field does not exist, adding...")
+            DDL('ALTER TABLE "datarequests" ADD COLUMN "close_circumstance" varchar(100) NULL').execute(model.Session.get_bind())
+
+        if 'datarequests' in meta.tables and 'approx_publishing_date' not in meta.tables['datarequests'].columns:
+            log.info("DataRequests-UpdateDB: 'approx_publishing_date' field does not exist, adding...")
+            DDL('ALTER TABLE "datarequests" ADD COLUMN "approx_publishing_date" timestamp NULL').execute(model.Session.get_bind())
diff --git a/ckanext/datarequests/fanstatic/datarequest_close.js b/ckanext/datarequests/fanstatic/datarequest_close.js
new file mode 100644
index 00000000..01f631b1
--- /dev/null
+++ b/ckanext/datarequests/fanstatic/datarequest_close.js
@@ -0,0 +1,36 @@
+
+jQuery(document).ready(function () {
+
+  // On page load select the first circumstance option
+  showCondition(jQuery('#field-close_circumstance').find(':selected').data('condition'))
+
+  // On change check if the selected circumstance has a condition
+  jQuery('#field-close_circumstance').change(function () {
+    showCondition(jQuery('#field-close_circumstance').find(':selected').data('condition'));
+  });
+
+  // Show the elements for the selected condition
+  function showCondition(condition) {
+    jQuery('#field-condition').val(condition)
+    clearConditionElements()
+
+    if (condition === 'nominate_dataset') {
+      jQuery('#field-accepted_dataset_id').parent().parent().show()
+      jQuery('#field-approx_publishing_date').parent().parent().hide()
+    }
+    else if (condition === 'nominate_approximate_date') {
+      jQuery('#field-accepted_dataset_id').parent().parent().hide()
+      jQuery('#field-approx_publishing_date').parent().parent().show()
+    }
+    else {
+      jQuery('#field-accepted_dataset_id').parent().parent().hide()
+      jQuery('#field-approx_publishing_date').parent().parent().hide()
+    }
+  }
+
+  function clearConditionElements() {
+    jQuery('#field-accepted_dataset_id').val('')
+    jQuery('#field-approx_publishing_date').val('')
+  }
+
+});
\ No newline at end of file
diff --git a/ckanext/datarequests/helpers.py b/ckanext/datarequests/helpers.py
index d6c7787f..e547d621 100644
--- a/ckanext/datarequests/helpers.py
+++ b/ckanext/datarequests/helpers.py
@@ -54,3 +54,19 @@ def get_open_datarequests_badge(show_badge):
                                  {'comments_count': get_open_datarequests_number()})
     else:
         return ''
+
+
+def get_closing_circumstances():
+    """Returns a list of datarequest closing circumstances from admin config
+
+    :rtype: List of circumstance objects {'circumstance': circumstance, 'condition': condition}
+
+    """
+    closing_circumstances = []
+    for closing_circumstance in tk.config.get('ckan.datarequests.closing_circumstances', '').split('\n'):
+        option = closing_circumstance.split('|')
+        circumstance = option[0].strip()
+        condition = option[1].strip() if len(option) == 2 else ''
+        closing_circumstances.append({'circumstance': circumstance, 'condition': condition})
+
+    return closing_circumstances
diff --git a/ckanext/datarequests/plugin.py b/ckanext/datarequests/plugin.py
index 68986fe7..b3b631dd 100644
--- a/ckanext/datarequests/plugin.py
+++ b/ckanext/datarequests/plugin.py
@@ -36,6 +36,7 @@ def get_config_bool_value(config_name, default_value=False):
     value = value if type(value) == bool else value != 'False'
     return value
 
+
 def is_fontawesome_4():
     if hasattr(h, 'ckan_version'):
         ckan_version = float(h.ckan_version()[0:3])
@@ -43,9 +44,11 @@ def is_fontawesome_4():
     else:
         return False
 
+
 def get_plus_icon():
     return 'plus-square' if is_fontawesome_4() else 'plus-sign-alt'
 
+
 def get_question_icon():
     return 'question-circle' if is_fontawesome_4() else 'question-sign'
 
@@ -66,9 +69,10 @@ class DataRequestsPlugin(p.SingletonPlugin):
 
     def __init__(self, name=None):
         self.comments_enabled = get_config_bool_value('ckan.datarequests.comments', True)
-        self._show_datarequests_badge = get_config_bool_value('ckan.datarequests.show_datarequests_badge')        
+        self._show_datarequests_badge = get_config_bool_value('ckan.datarequests.show_datarequests_badge')
         self.name = 'datarequests'
         self.is_description_required = get_config_bool_value('ckan.datarequests.description_required', False)
+        self.closing_circumstances_enabled = get_config_bool_value('ckan.datarequests.enable_closing_circumstances', False)
 
     ######################################################################
     ############################## IACTIONS ##############################
@@ -135,6 +139,15 @@ def update_config(self, config):
         # Register this plugin's fanstatic directory with CKAN.
         tk.add_resource('fanstatic', 'datarequest')
 
+    def update_config_schema(self, schema):
+        if self.closing_circumstances_enabled:
+            ignore_missing = tk.get_validator('ignore_missing')
+            schema.update({
+                # This is a custom configuration option
+                'ckan.datarequests.closing_circumstances': [ignore_missing, unicode],
+            })
+        return schema
+
     ######################################################################
     ############################## IROUTES ###############################
     ######################################################################
@@ -217,7 +230,9 @@ def get_helpers(self):
             'get_open_datarequests_badge': partial(helpers.get_open_datarequests_badge, self._show_datarequests_badge),
             'get_plus_icon': get_plus_icon,
             'is_following_datarequest': helpers.is_following_datarequest,
-            'is_description_required': self.is_description_required
+            'is_description_required': self.is_description_required,
+            'closing_circumstances_enabled': self.closing_circumstances_enabled,
+            'get_closing_circumstances': helpers.get_closing_circumstances
         }
 
     ######################################################################
@@ -247,10 +262,10 @@ def i18n_locales(self):
         plugin
         '''
         directory = self.i18n_directory()
-        return [ d for
-                 d in os.listdir(directory)
-                 if os.path.isdir(os.path.join(directory, d))
-        ]
+        return [d for
+                d in os.listdir(directory)
+                if os.path.isdir(os.path.join(directory, d))
+                ]
 
     def i18n_domain(self):
         '''Change the gettext domain handled by this plugin
diff --git a/ckanext/datarequests/templates/admin/config.html b/ckanext/datarequests/templates/admin/config.html
new file mode 100644
index 00000000..6a4016bc
--- /dev/null
+++ b/ckanext/datarequests/templates/admin/config.html
@@ -0,0 +1,27 @@
+{% ckan_extends %}
+
+{% import 'macros/form.html' as form %}
+
+{% block admin_form %}
+
+    {{ super() }}
+    {% if h.closing_circumstances_enabled %}
+        {{ form.textarea('ckan.datarequests.closing_circumstances', id='field-ckan.datarequests.closing_circumstances', label=_('Data request closing circumstances'), placeholder=_('eg.\nPartially released|nominate_dataset\nTo be released as open data at a later date|nominate_approximate_date\nData openly available elsewhere'), value=data['ckan.datarequests.closing_circumstances'], error=errors['ckan.datarequests.closing_circumstances']) }}
+    {% endif %}
+{% endblock %}
+
+
+{% block admin_form_help %}
+
+    {{ super() }}
+    {% if h.closing_circumstances_enabled %}
+        <p>
+            <strong>Data Request Closing Circumstances:</strong>
+            Options displayed when closing a data request </br>
+            Optional conditions are added to an option by adding a pipe character (|) followed by the condition</br>
+            The following conditions can be used:</br>
+            - nominate_dataset (e.g. Released as open data|nominate_dataset)</br>     
+            - nominate_approximate_date (e.g.To be released as open data at a later date|nominate_approximate_date)
+        </p>
+    {% endif %}
+{% endblock %}
diff --git a/ckanext/datarequests/templates/datarequests/snippets/additional_info.html b/ckanext/datarequests/templates/datarequests/snippets/additional_info.html
index 1c842d87..f3508369 100644
--- a/ckanext/datarequests/templates/datarequests/snippets/additional_info.html
+++ b/ckanext/datarequests/templates/datarequests/snippets/additional_info.html
@@ -3,7 +3,7 @@ <h3>{{ _('Additional Info') }}</h3>
   <table class="table table-striped table-bordered table-condensed">
     <tbody>
       {% block package_additional_info %}
-          <tr>
+        <tr>
           <th scope="row" class="dataset-label">{{ _('Creator') }}</th>
           <td class="dataset-details">{{ datarequest.user['display_name'] if datarequest.user else _('None') }}</td>
         </tr>
@@ -20,6 +20,20 @@ <h3>{{ _('Additional Info') }}</h3>
           <td class="dataset-details" title="{{ datarequest.close_time }}">{{ h.time_ago_from_timestamp(datarequest.close_time) if datarequest.close_time else _('Not closed yet') }}</td>
         </tr>
         {% if datarequest.closed %}
+          {% if h.closing_circumstances_enabled %}
+            <tr>
+              <th scope="row" class="dataset-label">{{ _('Close Circumstance') }}</th>
+              <td class="dataset-details" title="{{ datarequest.close_circumstance }}">
+                {{ datarequest.close_circumstance if datarequest.close_circumstance else _('None') }}
+              </td>
+            </tr>
+            <tr>
+              <th scope="row" class="dataset-label">{{ _('Approx Publishing Date') }}</th>
+              <td class="dataset-details" title="{{ datarequest.approx_publishing_date }}">
+                {{ h.time_ago_from_timestamp(datarequest.approx_publishing_date) if datarequest.approx_publishing_date else _('None') }}
+              </td>
+            </tr>
+          {% endif %}
           <tr>
             <th scope="row" class="dataset-label">{{ _('Accepted Dataset') }}</th>
             <td class="dataset-details">
diff --git a/ckanext/datarequests/templates/datarequests/snippets/close_datarequest_form.html b/ckanext/datarequests/templates/datarequests/snippets/close_datarequest_form.html
index 06cd5f80..da36ead2 100644
--- a/ckanext/datarequests/templates/datarequests/snippets/close_datarequest_form.html
+++ b/ckanext/datarequests/templates/datarequests/snippets/close_datarequest_form.html
@@ -7,6 +7,29 @@
 
   <input type="hidden" id="id" name="id" value="{{ datarequest.get('id', '') }}" />
 
+  {% block closing_circumstance %}
+    {% if h.closing_circumstances_enabled %}
+        {% resource 'datarequest/datarequest_close.js' %}
+        {% set close_circumstances = h.get_closing_circumstances() %}
+        {% set selected_close_circumstance = datarequest.get('close_circumstance', '') %}
+       
+        <input type="hidden" id="field-condition" name="condition" />
+        <div class="control-group control-full form-group">
+          <label class="control-label" for="field-close_circumstance">{{ _("Circumstances") }}</label>
+          <div class="controls">
+            <select id="field-close_circumstance" name="close_circumstance" >           
+              {% for close_circumstance in close_circumstances  %}
+                {% set circumstance = close_circumstance.get('circumstance', '') %}
+                {% set condition = close_circumstance.get('condition', '') %}
+                <option value="{{ circumstance }}" {% if circumstance ==  selected_close_circumstance %} selected{% endif %} data-condition="{{ condition }}">{{ circumstance }}</option>
+              {% endfor %}
+            </select>
+          </div>
+        </div>
+        {{ form.input('approx_publishing_date', id='field-approx_publishing_date', label=_('Approx Publishing Date'), type='date', error=errors.approx_publishing_date) }}
+      {% endif %}
+  {% endblock %}
+
   {% block package_basic_fields_tags %}
     <div class="control-group control-full form-group">
       <label class="control-label" for="field-accepted_dataset_id">{{ _("Accep. Dataset") }}</label>
diff --git a/ckanext/datarequests/validator.py b/ckanext/datarequests/validator.py
index 4cf37e3e..617698fa 100644
--- a/ckanext/datarequests/validator.py
+++ b/ckanext/datarequests/validator.py
@@ -40,7 +40,7 @@ def validate_datarequest(context, request_data):
     if 'Title' not in errors and not avoid_existing_title_check:
         if db.DataRequest.datarequest_exists(request_data['title']):
             errors[tk._('Title')] = [tk._('That title is already in use')]
-    
+
     # Check description
     if datarequests.get_config_bool_value('ckan.datarequests.description_required', False) and not request_data['description']:
         errors[tk._('Description')] = [tk._('Description cannot be empty')]
@@ -60,6 +60,16 @@ def validate_datarequest(context, request_data):
 
 
 def validate_datarequest_closing(context, request_data):
+    if tk.h.closing_circumstances_enabled:
+        close_circumstance = request_data.get('close_circumstance', None)
+        if not close_circumstance:
+            raise tk.ValidationError({tk._('Circumstances'): [tk._('Circumstances cannot be empty')]})
+        condition = request_data.get('condition', None)
+        if condition:
+            if condition == 'nominate_dataset' and request_data.get('accepted_dataset_id', '') == '':
+                raise tk.ValidationError({tk._('Accepted Dataset'): [tk._('Accepted Dataset cannot be empty')]})
+            elif condition == 'nominate_approximate_date' and request_data.get('approx_publishing_date', '') == '':
+                raise tk.ValidationError({tk._('Approx Publishing Date'): [tk._('Approx Publishing Date cannot be empty')]})
 
     accepted_dataset_id = request_data.get('accepted_dataset_id', '')
     if accepted_dataset_id:
diff --git a/requirements-dev.txt b/requirements-dev.txt
index c168bfd9..78ba5d78 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -8,7 +8,7 @@ nose_parameterized==0.3.3
 profanityfilter
 lxml==4.5.0
 splinter>=0.13.0
--e git+https://github.com/qld-gov-au/ckanext-data-qld@develop#egg=ckanext-data_qld
+-e git+https://github.com/salsadigitalauorg/ckanext-data-qld@feature/Enhancements_to_the_data_request_functionality#egg=ckanext-data_qld
 -e git+https://github.com/ckan/ckantoolkit@release-0.0.4#egg=ckantoolkit
 -e git+https://github.com/ckan/ckanapi@ckanapi-4.3#egg=ckanapi
 -e git+https://github.com/ckan/ckanext-scheming@release-1.2.0#egg=ckanext-scheming

From 68e16de86c46723660096c32368c7cfa304f1864 Mon Sep 17 00:00:00 2001
From: Mark Calvert <mark.calvert@salsadigital.com.au>
Date: Tue, 9 Jun 2020 11:30:57 -0600
Subject: [PATCH 046/276] [DQL2-31] - Updated close accepted_dataset dropdown
 to use dataset id instead of name as its value - Updated
 validate_datarequest_closing to use 'package_id_exists' to validate
 accepted_dataset_id

---
 ckanext/datarequests/controllers/ui_controller.py | 2 +-
 ckanext/datarequests/validator.py                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ckanext/datarequests/controllers/ui_controller.py b/ckanext/datarequests/controllers/ui_controller.py
index 44a5573f..d299ecf7 100644
--- a/ckanext/datarequests/controllers/ui_controller.py
+++ b/ckanext/datarequests/controllers/ui_controller.py
@@ -303,7 +303,7 @@ def _return_page(errors={}, errors_summary={}):
             c.errors = errors
             c.errors_summary = errors_summary
             for dataset in base_datasets:
-                c.datasets.append({'name': dataset.get('name'), 'title': dataset.get('title')})
+                c.datasets.append({'name': dataset.get('id'), 'title': dataset.get('title')})
 
             if tk.h.closing_circumstances_enabled:
                 # This is required so the form can set the currently selected close_curcumstance option in the select dropdown
diff --git a/ckanext/datarequests/validator.py b/ckanext/datarequests/validator.py
index 617698fa..93706200 100644
--- a/ckanext/datarequests/validator.py
+++ b/ckanext/datarequests/validator.py
@@ -74,7 +74,7 @@ def validate_datarequest_closing(context, request_data):
     accepted_dataset_id = request_data.get('accepted_dataset_id', '')
     if accepted_dataset_id:
         try:
-            tk.get_validator('package_name_exists')(accepted_dataset_id, context)
+            tk.get_validator('package_id_exists')(accepted_dataset_id, context)
         except Exception:
             raise tk.ValidationError({tk._('Accepted Dataset'): [tk._('Dataset not found')]})
 

From 18d5d6112e6b7bf8412c4cca782b8e76d97ffb57 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 9 Jun 2020 19:18:16 +0000
Subject: [PATCH 047/276] Bump flake8 from 3.8.2 to 3.8.3

Bumps [flake8](https://gitlab.com/pycqa/flake8) from 3.8.2 to 3.8.3.
- [Release notes](https://gitlab.com/pycqa/flake8/tags)
- [Commits](https://gitlab.com/pycqa/flake8/compare/3.8.2...3.8.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 requirements-dev.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements-dev.txt b/requirements-dev.txt
index 37e21df0..23352012 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,7 +1,7 @@
 beautifulsoup4==4.8.2
 behave==1.2.6
 behaving==1.5.6
-flake8==3.8.2
+flake8==3.8.3
 nose==1.3.7
 mock
 nose_parameterized==0.3.3

From a81862361eafafee0b6be3dd38cad990bdd199a7 Mon Sep 17 00:00:00 2001
From: Mark Calvert <mark.calvert@salsadigital.com.au>
Date: Wed, 10 Jun 2020 12:34:44 -0600
Subject: [PATCH 048/276] [DQL2-40] - Added BDD tests for datarequest
 circumstances - Added CKAN config
 'ckan.datarequests.enable_closing_circumstances = True' to test.ini - Updated
 'create-test-data.sh' to add new admin config value for
 'ckan.datarequests.closing_circumstances' -  Updated 'create-test-data.sh' to
 create test data datasets - Added new BDD steps 'I log in and go to admin
 config page',  'I go to admin config page', 'I log in and create a
 datarequest' - Updated 'datarequest.feature' to use new step 'I log in and
 create a datarequest

[DQL2-33]
- Updated validation error messages to Sentence casing
- Update additinal_info to conditionally show 'approx_publishing_date' or 'accepted_dataset' rows if the values exist
---
 .ahoy.yml                                     |   4 +-
 .docker/scripts/create-test-data.sh           |  34 +++-
 .docker/test.ini                              |   2 +
 .../snippets/additional_info.html             |  37 ++--
 ckanext/datarequests/validator.py             |   4 +-
 test/features/datarequest.feature             |  33 ++--
 .../datarequest_circumstances.feature         | 167 ++++++++++++++++++
 test/features/steps/steps.py                  |  28 +++
 8 files changed, 271 insertions(+), 38 deletions(-)
 create mode 100644 test/features/datarequest_circumstances.feature

diff --git a/.ahoy.yml b/.ahoy.yml
index efee9220..55010b89 100644
--- a/.ahoy.yml
+++ b/.ahoy.yml
@@ -51,11 +51,11 @@ commands:
 
   restart:
     usage: Restart all stopped and running Docker containers.
-    cmd: docker-compose restart
+    cmd: docker-compose restart "$@"
 
   logs:
     usage: Show Docker logs.
-    cmd: docker-compose logs "$@"
+    cmd: docker-compose logs -f "$@"
 
   pull:
     usage: Pull latest docker images.
diff --git a/.docker/scripts/create-test-data.sh b/.docker/scripts/create-test-data.sh
index 8c29bb9f..f707be2c 100644
--- a/.docker/scripts/create-test-data.sh
+++ b/.docker/scripts/create-test-data.sh
@@ -14,6 +14,21 @@ CKAN_INI_FILE=/app/ckan/default/production.ini
 # We know the "admin" sysadmin account exists, so we'll use her API KEY to create further data
 API_KEY=$(paster --plugin=ckan user admin -c ${CKAN_INI_FILE} | tr -d '\n' | sed -r 's/^(.*)apikey=(\S*)(.*)/\2/')
 
+# # 
+##
+# BEGIN: Add sysadmin config values. 
+# This needs to be done before closing datarequests as they require the below config values
+#
+echo "Adding ckan.datarequests.closing_circumstances:"
+
+curl -L -s --header "Authorization: ${API_KEY}" --header "Content-Type: application/json" \
+    --data '{"ckan.datarequests.closing_circumstances":"Released as open data|nominate_dataset\nOpen dataset already exists|nominate_dataset\nPartially released|nominate_dataset\nTo be released as open data at a later date|nominate_approximate_date\nData openly available elsewhere\nNot suitable for release as open data\nRequested data not available/cannot be compiled\nRequestor initiated closure"}' \
+    ${CKAN_ACTION_URL}/config_option_update
+
+##
+# END.
+#
+
 ##
 # BEGIN: Create a test organisation with test users for admin, editor and member
 #
@@ -116,12 +131,29 @@ echo $CLOSE_DR_ID
 echo "Closing Data Request:"
 
 curl -L -s --header "Authorization: ${API_KEY}" \
-    --data "id=${CLOSE_DR_ID}" \
+    --data "id=${CLOSE_DR_ID}&close_circumstance=Requestor initiated closure" \
     ${CKAN_ACTION_URL}/close_datarequest
 
 ##
 # END.
 #
 
+# Use CKAN's built-in paster command for creating some test datasets...
+paster create-test-data -c ${CKAN_INI_FILE}
+
+# Datasets need to be assigned to an organisation
+
+echo "Assigning test Datasets to Organisation open-data-administration-data-requests..."
+
+curl -L -s -q --header "Authorization: ${API_KEY}" \
+    --data "id=annakarenina&owner_org=${DR_ORG_ID}" \
+    ${CKAN_ACTION_URL}/package_patch >> /dev/null
+
+curl -L -s -q --header "Authorization: ${API_KEY}" \
+    --data "id=warandpeace&owner_org=${DR_ORG_ID}" \
+    ${CKAN_ACTION_URL}/package_patch >> /dev/null
+##
+# END.
+#
 
 deactivate
diff --git a/.docker/test.ini b/.docker/test.ini
index 52c60fd6..81c076f6 100644
--- a/.docker/test.ini
+++ b/.docker/test.ini
@@ -171,6 +171,8 @@ ckan.datarequests.show_datarequests_badge = true
 ckan.datarequests.description_required = true
 # Default organisation used for new data requests
 ckan.datarequests.default_organisation = open-data-administration-data-requests
+# Enable or disable circumstances for closing data requests. Default value is False
+ckan.datarequests.enable_closing_circumstances = True
 
 # YTP Comments
 ckan.comments.moderation = False
diff --git a/ckanext/datarequests/templates/datarequests/snippets/additional_info.html b/ckanext/datarequests/templates/datarequests/snippets/additional_info.html
index f3508369..616879eb 100644
--- a/ckanext/datarequests/templates/datarequests/snippets/additional_info.html
+++ b/ckanext/datarequests/templates/datarequests/snippets/additional_info.html
@@ -27,23 +27,34 @@ <h3>{{ _('Additional Info') }}</h3>
                 {{ datarequest.close_circumstance if datarequest.close_circumstance else _('None') }}
               </td>
             </tr>
+            {% if datarequest.approx_publishing_date %}
+              <tr>
+                <th scope="row" class="dataset-label">{{ _('Approx Publishing Date') }}</th>
+                <td class="dataset-details" title="{{ datarequest.approx_publishing_date }}">
+                  {{ h.time_ago_from_timestamp(datarequest.approx_publishing_date) }}
+                </td>
+              </tr>
+            {% endif %}
+            {% if datarequest.accepted_dataset %}
+              <tr>
+                <th scope="row" class="dataset-label">{{ _('Accepted Dataset') }}</th>
+                <td class="dataset-details">
+                  {% link_for datarequest.accepted_dataset['title'], controller='package', action='read', id=datarequest.accepted_dataset.get('id') %}
+                </td>
+              </tr>
+            {% endif %}
+          {% else %}
             <tr>
-              <th scope="row" class="dataset-label">{{ _('Approx Publishing Date') }}</th>
-              <td class="dataset-details" title="{{ datarequest.approx_publishing_date }}">
-                {{ h.time_ago_from_timestamp(datarequest.approx_publishing_date) if datarequest.approx_publishing_date else _('None') }}
+              <th scope="row" class="dataset-label">{{ _('Accepted Dataset') }}</th>
+              <td class="dataset-details">
+              {% if datarequest.accepted_dataset %}
+                {% link_for datarequest.accepted_dataset['title'], controller='package', action='read', id=datarequest.accepted_dataset.get('id') %}
+              {% else %}
+                {{ _('None') }}
+              {% endif %}
               </td>
             </tr>
           {% endif %}
-          <tr>
-            <th scope="row" class="dataset-label">{{ _('Accepted Dataset') }}</th>
-            <td class="dataset-details">
-            {% if datarequest.accepted_dataset %}
-              {% link_for datarequest.accepted_dataset['title'], controller='package', action='read', id=datarequest.accepted_dataset.get('id') %}
-            {% else %}
-              {{ _('None') }}
-            {% endif %}
-            </td>
-          </tr>
         {% endif %}
       {% endblock %}
     </tbody>
diff --git a/ckanext/datarequests/validator.py b/ckanext/datarequests/validator.py
index 93706200..8a33a8d8 100644
--- a/ckanext/datarequests/validator.py
+++ b/ckanext/datarequests/validator.py
@@ -67,9 +67,9 @@ def validate_datarequest_closing(context, request_data):
         condition = request_data.get('condition', None)
         if condition:
             if condition == 'nominate_dataset' and request_data.get('accepted_dataset_id', '') == '':
-                raise tk.ValidationError({tk._('Accepted Dataset'): [tk._('Accepted Dataset cannot be empty')]})
+                raise tk.ValidationError({tk._('Accepted Dataset'): [tk._('Accepted dataset cannot be empty')]})
             elif condition == 'nominate_approximate_date' and request_data.get('approx_publishing_date', '') == '':
-                raise tk.ValidationError({tk._('Approx Publishing Date'): [tk._('Approx Publishing Date cannot be empty')]})
+                raise tk.ValidationError({tk._('Approx Publishing Date'): [tk._('Approx publishing date cannot be empty')]})
 
     accepted_dataset_id = request_data.get('accepted_dataset_id', '')
     if accepted_dataset_id:
diff --git a/test/features/datarequest.feature b/test/features/datarequest.feature
index a3fb0951..89dfb7fe 100644
--- a/test/features/datarequest.feature
+++ b/test/features/datarequest.feature
@@ -18,6 +18,7 @@ Feature: Datarequest
         And I enter my credentials and login
         Then I should see an element with xpath "//a[contains(string(), 'Add data request')]"
 
+
     Scenario: Data requests submitted without a description will produce an error message
         Given "SysAdmin" as the persona
         When I log in and go to datarequest page
@@ -41,6 +42,7 @@ Feature: Datarequest
         | SysAdmin              |
         | DataRequestOrgAdmin   |
 
+
     Scenario Outline: Non-admin users should not see "Re-open" button on the data request detail page for closed data requests
         Given "<User>" as the persona
         When I log in and go to datarequest page
@@ -68,6 +70,7 @@ Feature: Datarequest
         | SysAdmin              |
         | DataRequestOrgAdmin   |
 
+
     Scenario Outline: Non admin users cannot not see a "Close" button on the data request detail page for opened data requests
         Given "<User>" as the persona
         When I log in and go to datarequest page
@@ -83,40 +86,33 @@ Feature: Datarequest
         | TestOrgEditor         |
         | TestOrgMember         |
 
+
     Scenario: Creating a new data request will email the Admin users of the organisation
         Given "TestOrgEditor" as the persona
-        When I log in and go to datarequest page
-        And I click the link with text that contains "Add data request"
-        And I fill in title with random text
-        And I fill in "description" with "Test description"
-        And I press the element with xpath "//button[contains(string(), 'Create data request')]"
+        When I log in and create a datarequest 
         When I wait for 3 seconds
         Then I should receive an email at "dr_admin@localhost" with subject "Queensland Government Open Data - Data Request"
         And I should receive a base64 email at "dr_admin@localhost" containing "A new data request has been added and assigned to your organisation."
         And I should receive an email at "admin@localhost" with subject "Queensland Government Open Data - Data Request"
         And I should receive a base64 email at "admin@localhost" containing "A new data request has been added and assigned to your organisation."
 
+
     Scenario: Closing a data request will email the creator
         Given "DataRequestOrgAdmin" as the persona
-        When I log in and go to datarequest page
-        And I click the link with text that contains "Add data request"
-        And I fill in title with random text
-        And I fill in "description" with "Test description"
-        And I press the element with xpath "//button[contains(string(), 'Create data request')]"
+        When I log in and create a datarequest 
         And I press the element with xpath "//a[contains(string(), 'Close')]"
+        And I select "Requestor initiated closure" from "close_circumstance" 
         And I press the element with xpath "//button[contains(string(), 'Close data request')]"
         When I wait for 3 seconds
         Then I should receive an email at "dr_admin@localhost" with subject "Queensland Government Open Data - Data Request"
         And I should receive a base64 email at "dr_admin@localhost" containing "Your data request has been closed."
 
+
     Scenario: Re-Opening a data request will email the Admin users of the organisation and creator
         Given "DataRequestOrgAdmin" as the persona
-        When I log in and go to datarequest page
-        And I click the link with text that contains "Add data request"
-        And I fill in title with random text
-        And I fill in "description" with "Test description"
-        And I press the element with xpath "//button[contains(string(), 'Create data request')]"
+        When I log in and create a datarequest 
         And I press the element with xpath "//a[contains(string(), 'Close')]"
+        And I select "Requestor initiated closure" from "close_circumstance" 
         And I press the element with xpath "//button[contains(string(), 'Close data request')]"
         And I press the element with xpath "//a[@class='btn btn-success' and contains(string(), ' Re-open')]"
         When I wait for 3 seconds
@@ -125,13 +121,10 @@ Feature: Datarequest
         And I should receive an email at "admin@localhost" with subject "Queensland Government Open Data - Data Request"
         And I should receive a base64 email at "admin@localhost" containing "A data request assigned to your organisation has been re-opened."
 
+
      Scenario: Re-assigning a data request will email the Admin users of the assigned organisation and un-assigned organisation
         Given "DataRequestOrgAdmin" as the persona
-        When I log in and go to datarequest page
-        And I click the link with text that contains "Add data request"
-        And I fill in title with random text
-        And I fill in "description" with "Test description"
-        And I press the element with xpath "//button[contains(string(), 'Create data request')]"
+        When I log in and create a datarequest 
         And I press the element with xpath "//a[contains(string(), 'Manage')]"
         When I wait for 3 seconds
         # Have to use JS to change the selected value as the behaving framework does not work with autocomplete dropdown
diff --git a/test/features/datarequest_circumstances.feature b/test/features/datarequest_circumstances.feature
new file mode 100644
index 00000000..005885e5
--- /dev/null
+++ b/test/features/datarequest_circumstances.feature
@@ -0,0 +1,167 @@
+@data-requests-circumstances
+Feature: Datarequest-circumstances
+
+    Scenario: As a sysadmin user when I go to the admin config page I can view the data requests closing circumstances textarea
+        Given "SysAdmin" as the persona
+        When I log in and go to admin config page
+        Then the browser's URL should contain "/ckan-admin/config"
+        And I should see "Data request closing circumstances"
+
+
+    Scenario Outline: Data request creator, Sysadmin and Admin users can see the drop-down field circumstances  
+        Given "<User>" as the persona
+        When I log in and create a datarequest      
+        And I press the element with xpath "//a[contains(string(), 'Close')]"
+        Then the element with the css selector "#field-close_circumstance" should be visible within 1 seconds
+        
+        Examples: Users  
+        | User                  |
+        | SysAdmin              |
+        | DataRequestOrgAdmin   |
+
+
+    Scenario Outline: Data request creator, Sysadmin and Admin users, when I select a closing circumstance 'Open dataset already exists', accepted dataset is required
+        Given "<User>" as the persona
+        When I log in and create a datarequest 
+        And I press the element with xpath "//a[contains(string(), 'Close')]"
+        And I select "Open dataset already exists" from "close_circumstance"
+        And I press the element with xpath "//button[contains(string(), 'Close data request')]"
+        Then I should see an element with the css selector "div.error-explanation.alert.alert-error" within 2 seconds
+        And I should see "The form contains invalid entries" within 1 seconds    
+        And I should see "Accepted dataset cannot be empty" within 1 seconds 
+        
+        Examples: Users  
+        | User                  |
+        | SysAdmin              |
+        | DataRequestOrgAdmin   |
+
+
+    Scenario Outline: Data request creator, Sysadmin and Admin users, when I select vlosing circumstance with condition 'To be released as open data at a later date', approx publishing date is required
+        Given "<User>" as the persona
+        When I log in and create a datarequest 
+        And I press the element with xpath "//a[contains(string(), 'Close')]"
+        And I select "To be released as open data at a later date" from "close_circumstance"
+        And I press the element with xpath "//button[contains(string(), 'Close data request')]"
+        Then I should see an element with the css selector "div.error-explanation.alert.alert-error" within 2 seconds
+        And I should see "The form contains invalid entries" within 1 seconds    
+        And I should see "Approx publishing date cannot be empty" within 1 seconds
+        
+        Examples: Users  
+        | User                  |
+        | SysAdmin              |
+        | DataRequestOrgAdmin   |
+
+
+    Scenario Outline: Data request creator, Sysadmin and Admin users, when I select closing circumstance 'Requestor initiated closure', accepted dataset or approx publishing date is not required
+        Given "<User>" as the persona
+        When I log in and create a datarequest 
+        And I press the element with xpath "//a[contains(string(), 'Close')]"
+        And I select "Requestor initiated closure" from "close_circumstance"
+        And I press the element with xpath "//button[contains(string(), 'Close data request')]"
+        Then I should see an element with xpath "//span[contains(@class,'label-closed') and contains(string(), 'Closed')]" within 2 seconds
+        
+        Examples: Users  
+        | User                  |
+        | SysAdmin              |
+        | DataRequestOrgAdmin   |
+    
+
+    Scenario Outline: Data request creator, Sysadmin and Admin users, when I select closing circumstance 'Open dataset already exists', the approx publishing date element is not visible
+        Given "<User>" as the persona
+        When I log in and create a datarequest 
+        And I press the element with xpath "//a[contains(string(), 'Close')]"
+        And I select "Open dataset already exists" from "close_circumstance"
+        Then the element with the css selector "#field-approx_publishing_date" should not be visible within 1 seconds
+        
+        Examples: Users  
+        | User                  |
+        | SysAdmin              |
+        | DataRequestOrgAdmin   |
+
+
+    Scenario Outline: Data request creator, Sysadmin and Admin users, when I select closing circumstance 'To be released as open data at a later date', the accepted dataset element is not visible
+        Given "<User>" as the persona
+        When I log in and create a datarequest 
+        And I press the element with xpath "//a[contains(string(), 'Close')]"
+        And I select "To be released as open data at a later date" from "close_circumstance"
+        Then the element with the css selector "#field-accepted_dataset_id" should not be visible within 1 seconds
+        
+        Examples: Users  
+        | User                  |
+        | SysAdmin              |
+        | DataRequestOrgAdmin   |
+
+
+    Scenario Outline: Data request creator, Sysadmin and Admin users, when I select closing circumstance 'Data openly available elsewhere', the accepted dataset and approx publishing date elements are not visible
+        Given "<User>" as the persona
+        When I log in and create a datarequest 
+        And I press the element with xpath "//a[contains(string(), 'Close')]"
+        And I select "Data openly available elsewhere" from "close_circumstance"
+        Then the element with the css selector "#field-accepted_dataset_id" should not be visible within 1 seconds
+        Then the element with the css selector "#field-approx_publishing_date" should not be visible within 1 seconds
+        
+        Examples: Users  
+        | User                  |
+        | SysAdmin              |
+        | DataRequestOrgAdmin   |
+
+    
+    Scenario Outline: Data request creator, Sysadmin and Admin users, when I close a datarequest with accepted dataset, the accepeted dataset should be visible on datarequest page
+        Given "<User>" as the persona
+        When I log in and create a datarequest 
+        And I press the element with xpath "//a[contains(string(), 'Close')]"
+        And I select "Open dataset already exists" from "close_circumstance" 
+        # Have to use JS to change the selected value as the behaving framework does not work with autocomplete dropdown
+        Then I execute the script "document.getElementById('field-accepted_dataset_id').value = document.getElementById('field-accepted_dataset_id').options[1].value" 
+        And I press the element with xpath "//button[contains(string(), 'Close data request')]"
+        Then I should see "Accepted Dataset" within 1 seconds 
+        And I should see "A Wonderful Story" within 1 seconds 
+        
+        Examples: Users  
+        | User                  |
+        | SysAdmin              |
+        | DataRequestOrgAdmin   |
+
+
+    Scenario Outline: Data request creator, Sysadmin and Admin users, when I close a datarequest with approx publishing date, the approx publishing date should be visible on datarequest page
+        Given "<User>" as the persona
+        When I log in and create a datarequest 
+        And I press the element with xpath "//a[contains(string(), 'Close')]"
+        And I select "To be released as open data at a later date" from "close_circumstance" 
+        And I fill in "approx_publishing_date" with "2025-06-01"
+        And I press the element with xpath "//button[contains(string(), 'Close data request')]"
+        Then I should see "Approx Publishing Date" within 1 seconds 
+        
+        Examples: Users  
+        | User                  |
+        | SysAdmin              |
+        | DataRequestOrgAdmin   |
+
+    Scenario Outline: Data request creator, Sysadmin and Admin users, when I close a datarequest with closing circumstance 'Requestor initiated closure', the circumstance should be visible on the datarequest page
+        Given "<User>" as the persona
+        When I log in and create a datarequest 
+        And I press the element with xpath "//a[contains(string(), 'Close')]"
+        And I select "Requestor initiated closure" from "close_circumstance" 
+        And I press the element with xpath "//button[contains(string(), 'Close data request')]"
+        Then I should see "Close Circumstance" within 1 seconds 
+        Then I should see "Requestor initiated closure" within 1 seconds 
+        
+        Examples: Users  
+        | User                  |
+        | SysAdmin              |
+        | DataRequestOrgAdmin   |
+
+
+    Scenario Outline: Data request creator, Sysadmin and Admin users, when I close a datarequest with no accepted dataset or approx publishing date, they should not be visibe on datarequest page
+        Given "<User>" as the persona
+        When I log in and create a datarequest 
+        And I press the element with xpath "//a[contains(string(), 'Close')]"
+        And I select "Requestor initiated closure" from "close_circumstance" 
+        And I press the element with xpath "//button[contains(string(), 'Close data request')]"
+        Then I should not see "Accepted Dataset" within 1 seconds 
+        Then I should not see "Approx Publishing Date" within 1 seconds 
+        
+        Examples: Users  
+        | User                  |
+        | SysAdmin              |
+        | DataRequestOrgAdmin   |
diff --git a/test/features/steps/steps.py b/test/features/steps/steps.py
index f95925b4..0b3f9376 100644
--- a/test/features/steps/steps.py
+++ b/test/features/steps/steps.py
@@ -68,3 +68,31 @@ def filter_contents(mail):
         return text in decoded_payload
 
     assert context.mail.user_messages(address, filter_contents)
+
+@step('I log in and go to admin config page')
+def log_in_go_to_admin_config(context):
+
+    assert context.persona
+    context.execute_steps(u"""
+        When I go to homepage
+        And I click the link with text that contains "Log in"
+        And I log in
+        And I go to admin config page
+    """)
+
+@step('I go to admin config page')
+def go_to_admin_config(context):
+    when_i_visit_url(context, '/ckan-admin/config')
+
+@step('I log in and create a datarequest')
+def log_in_create_a_datarequest(context):
+
+    assert context.persona
+    context.execute_steps(u"""
+        When I log in and go to datarequest page
+        And I click the link with text that contains "Add data request"
+        And I fill in title with random text
+        And I fill in "description" with "Test description"
+        And I press the element with xpath "//button[contains(string(), 'Create data request')]"
+    """)
+        
\ No newline at end of file

From 97b7d8c6ad73e0a9294035351d0b5f34b0f8890e Mon Sep 17 00:00:00 2001
From: Mark Calvert <mark.calvert@salsadigital.com.au>
Date: Wed, 10 Jun 2020 13:44:53 -0600
Subject: [PATCH 049/276] Allow unit tests failures in circleci

---
 .env | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.env b/.env
index a209c7f7..13c91ba3 100644
--- a/.env
+++ b/.env
@@ -19,7 +19,7 @@ COMPOSE_PROJECT_NAME="ckanext-datarequests"
 ALLOW_LINT_FAIL=1
 
 # Flag to allow unit tests failures.
-ALLOW_UNIT_FAIL=0
+ALLOW_UNIT_FAIL=1
 
 # Flag to allow BDD tests failures.
 ALLOW_BDD_FAIL=0

From 8c8ec0c7370213aab97c9ad9380464ab4523c71e Mon Sep 17 00:00:00 2001
From: Mark Calvert <mark.calvert@salsadigital.com.au>
Date: Wed, 10 Jun 2020 16:37:26 -0600
Subject: [PATCH 050/276] [DQL2-33] - Updated approx_publishing_date to use
 'render_datetime 'helper function timestamp string as a localised date

---
 .../templates/datarequests/snippets/additional_info.html        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ckanext/datarequests/templates/datarequests/snippets/additional_info.html b/ckanext/datarequests/templates/datarequests/snippets/additional_info.html
index 616879eb..0b98e8da 100644
--- a/ckanext/datarequests/templates/datarequests/snippets/additional_info.html
+++ b/ckanext/datarequests/templates/datarequests/snippets/additional_info.html
@@ -31,7 +31,7 @@ <h3>{{ _('Additional Info') }}</h3>
               <tr>
                 <th scope="row" class="dataset-label">{{ _('Approx Publishing Date') }}</th>
                 <td class="dataset-details" title="{{ datarequest.approx_publishing_date }}">
-                  {{ h.time_ago_from_timestamp(datarequest.approx_publishing_date) }}
+                  {{ h.render_datetime(datarequest.approx_publishing_date) }}
                 </td>
               </tr>
             {% endif %}

From 1cf953ceccf10e48304226d096d401f1ccb36f64 Mon Sep 17 00:00:00 2001
From: Mark Calvert <mark.calvert@salsadigital.com.au>
Date: Thu, 11 Jun 2020 13:26:10 -0600
Subject: [PATCH 051/276] [DQL2-31] - Reverted changes back to original way of
 using '_dictize_datarequest' & '_undictize_datarequest_basic' and not using
 model relationships - Re-enabled unit test failures - Updated unit tests to
 default to using 'tk.h.closing_circumstances_enabled = False'

---
 .env                                          |  2 +-
 ckanext/datarequests/actions.py               | 65 ++++++++++++++++++-
 .../datarequests/controllers/ui_controller.py |  2 +-
 ckanext/datarequests/db.py                    | 46 ++-----------
 ckanext/datarequests/tests/test_actions.py    |  1 +
 ckanext/datarequests/tests/test_validator.py  |  1 +
 ckanext/datarequests/validator.py             |  2 +-
 7 files changed, 72 insertions(+), 47 deletions(-)

diff --git a/.env b/.env
index 13c91ba3..a209c7f7 100644
--- a/.env
+++ b/.env
@@ -19,7 +19,7 @@ COMPOSE_PROJECT_NAME="ckanext-datarequests"
 ALLOW_LINT_FAIL=1
 
 # Flag to allow unit tests failures.
-ALLOW_UNIT_FAIL=1
+ALLOW_UNIT_FAIL=0
 
 # Flag to allow BDD tests failures.
 ALLOW_BDD_FAIL=0
diff --git a/ckanext/datarequests/actions.py b/ckanext/datarequests/actions.py
index 5bc3129c..9dd120fb 100644
--- a/ckanext/datarequests/actions.py
+++ b/ckanext/datarequests/actions.py
@@ -51,12 +51,71 @@ def _get_user(user_id):
         log.warn(e)
 
 
+def _get_organization(organization_id):
+    try:
+        organization_show = tk.get_action('organization_show')
+        return organization_show({'ignore_auth': True}, {'id': organization_id})
+    except Exception as e:
+        log.warn(e)
+
+
+def _get_package(package_id):
+    try:
+        package_show = tk.get_action('package_show')
+        return package_show({'ignore_auth': True}, {'id': package_id})
+    except Exception as e:
+        log.warn(e)
+
+
 def _dictize_datarequest(datarequest):
-    return datarequest.dictize_datarequest()
+    # Transform time
+    open_time = str(datarequest.open_time)
+    # Close time can be None and the transformation is only needed when the
+    # fields contains a valid date
+    close_time = datarequest.close_time
+    close_time = str(close_time) if close_time else close_time
+
+    # Convert the data request into a dict
+    data_dict = {
+        'id': datarequest.id,
+        'user_id': datarequest.user_id,
+        'title': datarequest.title,
+        'description': datarequest.description,
+        'organization_id': datarequest.organization_id,
+        'open_time': open_time,
+        'accepted_dataset_id': datarequest.accepted_dataset_id,
+        'close_time': close_time,
+        'closed': datarequest.closed,
+        'user': _get_user(datarequest.user_id),
+        'organization': None,
+        'accepted_dataset': None,
+        'followers': 0
+    }
+
+    if datarequest.organization_id:
+        data_dict['organization'] = _get_organization(datarequest.organization_id)
+
+    if datarequest.accepted_dataset_id:
+        data_dict['accepted_dataset'] = _get_package(datarequest.accepted_dataset_id)
 
+    data_dict['followers'] = db.DataRequestFollower.get_datarequest_followers_number(
+        datarequest_id=datarequest.id)
+
+    if tk.h.closing_circumstances_enabled:
+        data_dict['close_circumstance'] = datarequest.close_circumstance
+        data_dict['approx_publishing_date'] = datarequest.approx_publishing_date
 
-def _undictize_datarequest_basic(datarequest, data_dict):
-    datarequest.undictize_datarequest_basic(data_dict)
+    return data_dict
+
+
+def _undictize_datarequest_basic(data_request, data_dict):
+    data_request.title = data_dict['title']
+    data_request.description = data_dict['description']
+    organization = data_dict['organization_id']
+    data_request.organization_id = organization if organization else None
+    if tk.h.closing_circumstances_enabled:
+        data_request.close_circumstance = data_dict.get('close_circumstance', None)
+        data_request.approx_publishing_date = data_dict.get('approx_publishing_date', None)
 
 
 def _dictize_comment(comment):
diff --git a/ckanext/datarequests/controllers/ui_controller.py b/ckanext/datarequests/controllers/ui_controller.py
index d299ecf7..44a5573f 100644
--- a/ckanext/datarequests/controllers/ui_controller.py
+++ b/ckanext/datarequests/controllers/ui_controller.py
@@ -303,7 +303,7 @@ def _return_page(errors={}, errors_summary={}):
             c.errors = errors
             c.errors_summary = errors_summary
             for dataset in base_datasets:
-                c.datasets.append({'name': dataset.get('id'), 'title': dataset.get('title')})
+                c.datasets.append({'name': dataset.get('name'), 'title': dataset.get('title')})
 
             if tk.h.closing_circumstances_enabled:
                 # This is required so the form can set the currently selected close_curcumstance option in the select dropdown
diff --git a/ckanext/datarequests/db.py b/ckanext/datarequests/db.py
index 96fe6833..1953649f 100644
--- a/ckanext/datarequests/db.py
+++ b/ckanext/datarequests/db.py
@@ -21,12 +21,10 @@
 import sqlalchemy as sa
 import uuid
 import logging
-import ckan.lib.dictization.model_dictize as model_dictize
 import ckan.plugins.toolkit as tk
 
-from sqlalchemy import func, MetaData, ForeignKey, DDL
+from sqlalchemy import func, MetaData, DDL
 from sqlalchemy.sql.expression import or_
-from ckan.lib import dictization
 
 log = logging.getLogger(__name__)
 DataRequest = None
@@ -91,28 +89,6 @@ def get_open_datarequests_number(cls):
                 '''Returns the number of data requests that are open'''
                 return model.Session.query(func.count(cls.id)).filter_by(closed=False).scalar()
 
-            def dictize_datarequest(self):
-                '''Returns this model and its relationship models as a dictionary'''
-                context = {'model': model}
-                data_dict = dictization.table_dictize(self, context)               
-                if self.organization:
-                    data_dict['organization'] = model_dictize.group_dictize(self.organization, context)
-                if self.package:
-                    data_dict['accepted_dataset'] = model_dictize.package_dictize(self.package, context)
-                data_dict['followers'] = DataRequestFollower.get_datarequest_followers_number(datarequest_id=self.id)
-
-                return data_dict
-
-            def undictize_datarequest_basic(self, data_dict):
-                '''Adds some basic data_dict fields to the datarequest model'''
-                self.title = data_dict.get('title', '')
-                self.description = data_dict.get('description') or None
-                self.organization_id = data_dict.get('organization_id') or None
-                if tk.h.closing_circumstances_enabled:
-                    self.accepted_dataset_id = data_dict.get('accepted_dataset_id') or None
-                    self.close_circumstance = data_dict.get('close_circumstance', None)
-                    self.close_circumstance = data_dict.get('approx_publishing_date', None)
-
         DataRequest = _DataRequest
 
         # FIXME: References to the other tables...
@@ -121,9 +97,9 @@ def undictize_datarequest_basic(self, data_dict):
                                       sa.Column('id', sa.types.UnicodeText, primary_key=True, default=uuid4),
                                       sa.Column('title', sa.types.Unicode(constants.NAME_MAX_LENGTH), primary_key=True, default=u''),
                                       sa.Column('description', sa.types.Unicode(constants.DESCRIPTION_MAX_LENGTH), primary_key=False, default=u''),
-                                      sa.Column('organization_id', sa.types.UnicodeText, sa.ForeignKey(model.Group.id), primary_key=False, default=None),
+                                      sa.Column('organization_id', sa.types.UnicodeText, primary_key=False, default=None),
                                       sa.Column('open_time', sa.types.DateTime, primary_key=False, default=None),
-                                      sa.Column('accepted_dataset_id', sa.types.UnicodeText, sa.ForeignKey(model.Package.id), primary_key=False, default=None),
+                                      sa.Column('accepted_dataset_id', sa.types.UnicodeText, primary_key=False, default=None),
                                       sa.Column('close_time', sa.types.DateTime, primary_key=False, default=None),
                                       sa.Column('closed', sa.types.Boolean, primary_key=False, default=False),
                                       sa.Column('close_circumstance', sa.types.Unicode(constants.CLOSE_CIRCUMSTANCE_MAX_LENGTH), primary_key=False, default=u'')
@@ -135,10 +111,7 @@ def undictize_datarequest_basic(self, data_dict):
         # Create the table only if it does not exist
         datarequests_table.create(checkfirst=True)
 
-        model.meta.mapper(DataRequest, datarequests_table, properties={
-            'organization': sa.orm.relation(model.Group),
-            'package': sa.orm.relation(model.Package)
-        })
+        model.meta.mapper(DataRequest, datarequests_table)
 
         update_db(model)
 
@@ -220,17 +193,8 @@ def update_db(model):
     '''
     meta = MetaData(bind=model.Session.get_bind(), reflect=True)
 
-    # Check to see if foreign key constraints exists and create them if they do not exists
-    if 'datarequests' in meta.tables and not any(x for x in meta.tables['datarequests'].foreign_key_constraints if x.name == 'datarequests_organization_id_fkey'):
-        log.info("DataRequests-UpdateDB: 'datarequests_organization_id_fkey' foreign_key does not exist, adding...")
-        DDL('ALTER TABLE "datarequests" ADD CONSTRAINT "datarequests_organization_id_fkey" FOREIGN KEY ("organization_id") REFERENCES "group" ("id")').execute(model.Session.get_bind())
-
-    if 'datarequests' in meta.tables and not any(x for x in meta.tables['datarequests'].foreign_key_constraints if x.name == 'datarequests_accepted_dataset_id_fkey'):
-        log.info("DataRequests-UpdateDB: 'datarequests_accepted_dataset_id_fkey' foreign_key does not exist, adding...")
-        DDL('ALTER TABLE "datarequests" ADD CONSTRAINT "datarequests_accepted_dataset_id_fkey" FOREIGN KEY ("accepted_dataset_id") REFERENCES "package" ("id")').execute(model.Session.get_bind())
-
     # Check to see if columns exists and create them if they do not exists
-    if tk.h.closing_circumstances_enabled:
+    if closing_circumstances_enabled:
         if 'datarequests' in meta.tables and 'close_circumstance' not in meta.tables['datarequests'].columns:
             log.info("DataRequests-UpdateDB: 'close_circumstance' field does not exist, adding...")
             DDL('ALTER TABLE "datarequests" ADD COLUMN "close_circumstance" varchar(100) NULL').execute(model.Session.get_bind())
diff --git a/ckanext/datarequests/tests/test_actions.py b/ckanext/datarequests/tests/test_actions.py
index 22a72bce..486cb567 100644
--- a/ckanext/datarequests/tests/test_actions.py
+++ b/ckanext/datarequests/tests/test_actions.py
@@ -36,6 +36,7 @@ def setUp(self):
         actions.USERS_CACHE = {}
         actions.tk.ObjectNotFound = self._tk.ObjectNotFound
         actions.tk.ValidationError = self._tk.ValidationError
+        actions.tk.h.closing_circumstances_enabled = False
 
         self._c = actions.c
         actions.c = MagicMock()
diff --git a/ckanext/datarequests/tests/test_validator.py b/ckanext/datarequests/tests/test_validator.py
index d1e98f14..dbd17e83 100644
--- a/ckanext/datarequests/tests/test_validator.py
+++ b/ckanext/datarequests/tests/test_validator.py
@@ -45,6 +45,7 @@ def setUp(self):
         validator.tk = MagicMock()
         validator.tk.ValidationError = self._tk.ValidationError
         validator.tk._ = self._tk._
+        validator.tk.h.closing_circumstances_enabled = False
 
         self._db = validator.db
         validator.db = MagicMock()
diff --git a/ckanext/datarequests/validator.py b/ckanext/datarequests/validator.py
index 8a33a8d8..affdeb18 100644
--- a/ckanext/datarequests/validator.py
+++ b/ckanext/datarequests/validator.py
@@ -74,7 +74,7 @@ def validate_datarequest_closing(context, request_data):
     accepted_dataset_id = request_data.get('accepted_dataset_id', '')
     if accepted_dataset_id:
         try:
-            tk.get_validator('package_id_exists')(accepted_dataset_id, context)
+            tk.get_validator('package_name_exists')(accepted_dataset_id, context)
         except Exception:
             raise tk.ValidationError({tk._('Accepted Dataset'): [tk._('Dataset not found')]})
 

From b37c324537f89bd447164341944a87597e43f27d Mon Sep 17 00:00:00 2001
From: Mark Calvert <mark.calvert@salsadigital.com.au>
Date: Thu, 11 Jun 2020 13:46:13 -0600
Subject: [PATCH 052/276] [DQL2-31] Increase random number range to descrease
 change of duplicates

---
 test/features/steps/steps.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/features/steps/steps.py b/test/features/steps/steps.py
index 0b3f9376..5a782978 100644
--- a/test/features/steps/steps.py
+++ b/test/features/steps/steps.py
@@ -53,7 +53,7 @@ def title_random_text(context):
     assert context.persona
     context.execute_steps(u"""
         When I fill in "title" with "Test Title {0}"
-    """.format(random.randrange(1000)) )
+    """.format(random.randrange(10000)))
 
 # The default behaving step does not convert base64 emails
 # Modifed the default step to decode the payload from base64

From 466a505771c867f7b769cac434e4aa75f99ecd68 Mon Sep 17 00:00:00 2001
From: Mark Calvert <mark.calvert@salsadigital.com.au>
Date: Thu, 11 Jun 2020 17:59:14 -0600
Subject: [PATCH 053/276] [DQL-31] - Updated CLOSE_CIRCUMSTANCE_MAX_LENGTH from
 100 to 255

---
 ckanext/datarequests/constants.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ckanext/datarequests/constants.py b/ckanext/datarequests/constants.py
index cf3c1cb8..4f726818 100644
--- a/ckanext/datarequests/constants.py
+++ b/ckanext/datarequests/constants.py
@@ -35,4 +35,4 @@
 DESCRIPTION_MAX_LENGTH = 1000
 COMMENT_MAX_LENGTH = DESCRIPTION_MAX_LENGTH
 DATAREQUESTS_PER_PAGE = 10
-CLOSE_CIRCUMSTANCE_MAX_LENGTH = 100
+CLOSE_CIRCUMSTANCE_MAX_LENGTH = 255

From dff9aa28e83ccb028a9aee233b1f91de0890d5fa Mon Sep 17 00:00:00 2001
From: Mark Calvert <mark.calvert@salsadigital.com.au>
Date: Thu, 11 Jun 2020 18:31:43 -0600
Subject: [PATCH 054/276] [DQL-31] - Updated variable name data_request to
 'datarequest' to keep same standard in the file - Updated
 _undictize_datarequest_closing_circumstances default values to None when
 empty string

---
 ckanext/datarequests/actions.py | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/ckanext/datarequests/actions.py b/ckanext/datarequests/actions.py
index 9dd120fb..e727ae45 100644
--- a/ckanext/datarequests/actions.py
+++ b/ckanext/datarequests/actions.py
@@ -108,14 +108,18 @@ def _dictize_datarequest(datarequest):
     return data_dict
 
 
-def _undictize_datarequest_basic(data_request, data_dict):
-    data_request.title = data_dict['title']
-    data_request.description = data_dict['description']
+def _undictize_datarequest_basic(datarequest, data_dict):
+    datarequest.title = data_dict['title']
+    datarequest.description = data_dict['description']
     organization = data_dict['organization_id']
-    data_request.organization_id = organization if organization else None
+    datarequest.organization_id = organization if organization else None
+    _undictize_datarequest_closing_circumstances(datarequest, data_dict)
+
+
+def _undictize_datarequest_closing_circumstances(datarequest, data_dict):
     if tk.h.closing_circumstances_enabled:
-        data_request.close_circumstance = data_dict.get('close_circumstance', None)
-        data_request.approx_publishing_date = data_dict.get('approx_publishing_date', None)
+        datarequest.close_circumstance = data_dict.get('close_circumstance') or None
+        datarequest.approx_publishing_date = data_dict.get('approx_publishing_date') or None
 
 
 def _dictize_comment(comment):
@@ -571,9 +575,7 @@ def close_datarequest(context, data_dict):
     data_req.closed = True
     data_req.accepted_dataset_id = data_dict.get('accepted_dataset_id') or None
     data_req.close_time = datetime.datetime.utcnow()
-    if tk.h.closing_circumstances_enabled:
-        data_req.close_circumstance = data_dict.get('close_circumstance') or None
-        data_req.approx_publishing_date = data_dict.get('approx_publishing_date') or None
+    _undictize_datarequest_closing_circumstances(data_req, data_dict)
 
     session.add(data_req)
     session.commit()

From 8104274fca7ee43ed8bf83a96267d514c49c9e10 Mon Sep 17 00:00:00 2001
From: Mark Calvert <mark.calvert@salsadigital.com.au>
Date: Mon, 15 Jun 2020 18:29:17 -0600
Subject: [PATCH 055/276] Updated requirments-dev to use orginal repo from
 qld-gov-au

---
 requirements-dev.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements-dev.txt b/requirements-dev.txt
index 78ba5d78..c168bfd9 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -8,7 +8,7 @@ nose_parameterized==0.3.3
 profanityfilter
 lxml==4.5.0
 splinter>=0.13.0
--e git+https://github.com/salsadigitalauorg/ckanext-data-qld@feature/Enhancements_to_the_data_request_functionality#egg=ckanext-data_qld
+-e git+https://github.com/qld-gov-au/ckanext-data-qld@develop#egg=ckanext-data_qld
 -e git+https://github.com/ckan/ckantoolkit@release-0.0.4#egg=ckantoolkit
 -e git+https://github.com/ckan/ckanapi@ckanapi-4.3#egg=ckanapi
 -e git+https://github.com/ckan/ckanext-scheming@release-1.2.0#egg=ckanext-scheming

From 8d6064c39267444ebf20f4ce36c4e28f434fdb99 Mon Sep 17 00:00:00 2001
From: Mark Calvert <mark.calvert@salsadigital.com.au>
Date: Tue, 16 Jun 2020 11:33:55 -0600
Subject: [PATCH 056/276] [DQL-33] - Added constant
 'CLOSE_CIRCUMSTANCE_MAX_LENGTH' for 'close_circumstance' varchar size - Fixed
 spelling mistakes

[DQl-40]
- Fixed spelling mistakes
---
 ckanext/datarequests/controllers/ui_controller.py |  2 +-
 ckanext/datarequests/db.py                        | 15 ++++++++-------
 test/features/datarequest_circumstances.feature   |  2 +-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/ckanext/datarequests/controllers/ui_controller.py b/ckanext/datarequests/controllers/ui_controller.py
index 44a5573f..d68f8f7b 100644
--- a/ckanext/datarequests/controllers/ui_controller.py
+++ b/ckanext/datarequests/controllers/ui_controller.py
@@ -306,7 +306,7 @@ def _return_page(errors={}, errors_summary={}):
                 c.datasets.append({'name': dataset.get('name'), 'title': dataset.get('title')})
 
             if tk.h.closing_circumstances_enabled:
-                # This is required so the form can set the currently selected close_curcumstance option in the select dropdown
+                # This is required so the form can set the currently selected close_circumstance option in the select dropdown
                 c.datarequest['close_circumstance'] = request.POST.get('close_circumstance', None)
 
             return tk.render('datarequests/close.html')
diff --git a/ckanext/datarequests/db.py b/ckanext/datarequests/db.py
index 1953649f..731be6f1 100644
--- a/ckanext/datarequests/db.py
+++ b/ckanext/datarequests/db.py
@@ -195,10 +195,11 @@ def update_db(model):
 
     # Check to see if columns exists and create them if they do not exists
     if closing_circumstances_enabled:
-        if 'datarequests' in meta.tables and 'close_circumstance' not in meta.tables['datarequests'].columns:
-            log.info("DataRequests-UpdateDB: 'close_circumstance' field does not exist, adding...")
-            DDL('ALTER TABLE "datarequests" ADD COLUMN "close_circumstance" varchar(100) NULL').execute(model.Session.get_bind())
-
-        if 'datarequests' in meta.tables and 'approx_publishing_date' not in meta.tables['datarequests'].columns:
-            log.info("DataRequests-UpdateDB: 'approx_publishing_date' field does not exist, adding...")
-            DDL('ALTER TABLE "datarequests" ADD COLUMN "approx_publishing_date" timestamp NULL').execute(model.Session.get_bind())
+        if 'datarequests' in meta.tables:
+            if 'close_circumstance' not in meta.tables['datarequests'].columns:
+                log.info("DataRequests-UpdateDB: 'close_circumstance' field does not exist, adding...")
+                DDL('ALTER TABLE "datarequests" ADD COLUMN "close_circumstance" varchar({0}) NULL'.format(constants.CLOSE_CIRCUMSTANCE_MAX_LENGTH)).execute(model.Session.get_bind())
+
+            if 'approx_publishing_date' not in meta.tables['datarequests'].columns:
+                log.info("DataRequests-UpdateDB: 'approx_publishing_date' field does not exist, adding...")
+                DDL('ALTER TABLE "datarequests" ADD COLUMN "approx_publishing_date" timestamp NULL').execute(model.Session.get_bind())
diff --git a/test/features/datarequest_circumstances.feature b/test/features/datarequest_circumstances.feature
index 005885e5..8073f26e 100644
--- a/test/features/datarequest_circumstances.feature
+++ b/test/features/datarequest_circumstances.feature
@@ -36,7 +36,7 @@ Feature: Datarequest-circumstances
         | DataRequestOrgAdmin   |
 
 
-    Scenario Outline: Data request creator, Sysadmin and Admin users, when I select vlosing circumstance with condition 'To be released as open data at a later date', approx publishing date is required
+    Scenario Outline: Data request creator, Sysadmin and Admin users, when I select closing circumstance with condition 'To be released as open data at a later date', approx publishing date is required
         Given "<User>" as the persona
         When I log in and create a datarequest 
         And I press the element with xpath "//a[contains(string(), 'Close')]"

From ec24e71ef48d150f41072ac1ae0a634a26b4fc19 Mon Sep 17 00:00:00 2001
From: Mark Calvert <mark.calvert@salsadigital.com.au>
Date: Tue, 16 Jun 2020 19:44:50 -0600
Subject: [PATCH 057/276] [DQL2-31] - Updated labels from 'Approx Publishing
 Date' to 'Approximate Publishing Date'

[DQL2-40]
- Updated BDD tests for new label text 'Approximate Publishing Date'
---
 .../datarequests/snippets/additional_info.html |  2 +-
 .../snippets/close_datarequest_form.html       |  2 +-
 ckanext/datarequests/validator.py              |  2 +-
 .../features/datarequest_circumstances.feature | 18 +++++++++---------
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/ckanext/datarequests/templates/datarequests/snippets/additional_info.html b/ckanext/datarequests/templates/datarequests/snippets/additional_info.html
index 0b98e8da..c2439c64 100644
--- a/ckanext/datarequests/templates/datarequests/snippets/additional_info.html
+++ b/ckanext/datarequests/templates/datarequests/snippets/additional_info.html
@@ -29,7 +29,7 @@ <h3>{{ _('Additional Info') }}</h3>
             </tr>
             {% if datarequest.approx_publishing_date %}
               <tr>
-                <th scope="row" class="dataset-label">{{ _('Approx Publishing Date') }}</th>
+                <th scope="row" class="dataset-label">{{ _('Approximate Publishing Date') }}</th>
                 <td class="dataset-details" title="{{ datarequest.approx_publishing_date }}">
                   {{ h.render_datetime(datarequest.approx_publishing_date) }}
                 </td>
diff --git a/ckanext/datarequests/templates/datarequests/snippets/close_datarequest_form.html b/ckanext/datarequests/templates/datarequests/snippets/close_datarequest_form.html
index da36ead2..8e20756f 100644
--- a/ckanext/datarequests/templates/datarequests/snippets/close_datarequest_form.html
+++ b/ckanext/datarequests/templates/datarequests/snippets/close_datarequest_form.html
@@ -26,7 +26,7 @@
             </select>
           </div>
         </div>
-        {{ form.input('approx_publishing_date', id='field-approx_publishing_date', label=_('Approx Publishing Date'), type='date', error=errors.approx_publishing_date) }}
+        {{ form.input('approx_publishing_date', id='field-approx_publishing_date', label=_('Approximate Publishing Date'), placeholder="yyyy-mm-dd", type='date', error=errors.approx_publishing_date) }}
       {% endif %}
   {% endblock %}
 
diff --git a/ckanext/datarequests/validator.py b/ckanext/datarequests/validator.py
index affdeb18..81ef343e 100644
--- a/ckanext/datarequests/validator.py
+++ b/ckanext/datarequests/validator.py
@@ -69,7 +69,7 @@ def validate_datarequest_closing(context, request_data):
             if condition == 'nominate_dataset' and request_data.get('accepted_dataset_id', '') == '':
                 raise tk.ValidationError({tk._('Accepted Dataset'): [tk._('Accepted dataset cannot be empty')]})
             elif condition == 'nominate_approximate_date' and request_data.get('approx_publishing_date', '') == '':
-                raise tk.ValidationError({tk._('Approx Publishing Date'): [tk._('Approx publishing date cannot be empty')]})
+                raise tk.ValidationError({tk._('Approximate Publishing Date'): [tk._('Approximate publishing date cannot be empty')]})
 
     accepted_dataset_id = request_data.get('accepted_dataset_id', '')
     if accepted_dataset_id:
diff --git a/test/features/datarequest_circumstances.feature b/test/features/datarequest_circumstances.feature
index 8073f26e..d3615aae 100644
--- a/test/features/datarequest_circumstances.feature
+++ b/test/features/datarequest_circumstances.feature
@@ -36,7 +36,7 @@ Feature: Datarequest-circumstances
         | DataRequestOrgAdmin   |
 
 
-    Scenario Outline: Data request creator, Sysadmin and Admin users, when I select closing circumstance with condition 'To be released as open data at a later date', approx publishing date is required
+    Scenario Outline: Data request creator, Sysadmin and Admin users, when I select closing circumstance with condition 'To be released as open data at a later date', Approximate publishing date is required
         Given "<User>" as the persona
         When I log in and create a datarequest 
         And I press the element with xpath "//a[contains(string(), 'Close')]"
@@ -44,7 +44,7 @@ Feature: Datarequest-circumstances
         And I press the element with xpath "//button[contains(string(), 'Close data request')]"
         Then I should see an element with the css selector "div.error-explanation.alert.alert-error" within 2 seconds
         And I should see "The form contains invalid entries" within 1 seconds    
-        And I should see "Approx publishing date cannot be empty" within 1 seconds
+        And I should see "Approximate publishing date cannot be empty" within 1 seconds
         
         Examples: Users  
         | User                  |
@@ -52,7 +52,7 @@ Feature: Datarequest-circumstances
         | DataRequestOrgAdmin   |
 
 
-    Scenario Outline: Data request creator, Sysadmin and Admin users, when I select closing circumstance 'Requestor initiated closure', accepted dataset or approx publishing date is not required
+    Scenario Outline: Data request creator, Sysadmin and Admin users, when I select closing circumstance 'Requestor initiated closure', accepted dataset or Approximate publishing date is not required
         Given "<User>" as the persona
         When I log in and create a datarequest 
         And I press the element with xpath "//a[contains(string(), 'Close')]"
@@ -66,7 +66,7 @@ Feature: Datarequest-circumstances
         | DataRequestOrgAdmin   |
     
 
-    Scenario Outline: Data request creator, Sysadmin and Admin users, when I select closing circumstance 'Open dataset already exists', the approx publishing date element is not visible
+    Scenario Outline: Data request creator, Sysadmin and Admin users, when I select closing circumstance 'Open dataset already exists', the Approximate publishing date element is not visible
         Given "<User>" as the persona
         When I log in and create a datarequest 
         And I press the element with xpath "//a[contains(string(), 'Close')]"
@@ -92,7 +92,7 @@ Feature: Datarequest-circumstances
         | DataRequestOrgAdmin   |
 
 
-    Scenario Outline: Data request creator, Sysadmin and Admin users, when I select closing circumstance 'Data openly available elsewhere', the accepted dataset and approx publishing date elements are not visible
+    Scenario Outline: Data request creator, Sysadmin and Admin users, when I select closing circumstance 'Data openly available elsewhere', the accepted dataset and Approximate publishing date elements are not visible
         Given "<User>" as the persona
         When I log in and create a datarequest 
         And I press the element with xpath "//a[contains(string(), 'Close')]"
@@ -123,14 +123,14 @@ Feature: Datarequest-circumstances
         | DataRequestOrgAdmin   |
 
 
-    Scenario Outline: Data request creator, Sysadmin and Admin users, when I close a datarequest with approx publishing date, the approx publishing date should be visible on datarequest page
+    Scenario Outline: Data request creator, Sysadmin and Admin users, when I close a datarequest with Approximate publishing date, the Approximate publishing date should be visible on datarequest page
         Given "<User>" as the persona
         When I log in and create a datarequest 
         And I press the element with xpath "//a[contains(string(), 'Close')]"
         And I select "To be released as open data at a later date" from "close_circumstance" 
         And I fill in "approx_publishing_date" with "2025-06-01"
         And I press the element with xpath "//button[contains(string(), 'Close data request')]"
-        Then I should see "Approx Publishing Date" within 1 seconds 
+        Then I should see "Approximate Publishing Date" within 1 seconds 
         
         Examples: Users  
         | User                  |
@@ -152,14 +152,14 @@ Feature: Datarequest-circumstances
         | DataRequestOrgAdmin   |
 
 
-    Scenario Outline: Data request creator, Sysadmin and Admin users, when I close a datarequest with no accepted dataset or approx publishing date, they should not be visibe on datarequest page
+    Scenario Outline: Data request creator, Sysadmin and Admin users, when I close a datarequest with no accepted dataset or Approximate publishing date, they should not be visibe on datarequest page
         Given "<User>" as the persona
         When I log in and create a datarequest 
         And I press the element with xpath "//a[contains(string(), 'Close')]"
         And I select "Requestor initiated closure" from "close_circumstance" 
         And I press the element with xpath "//button[contains(string(), 'Close data request')]"
         Then I should not see "Accepted Dataset" within 1 seconds 
-        Then I should not see "Approx Publishing Date" within 1 seconds 
+        Then I should not see "Approximate Publishing Date" within 1 seconds 
         
         Examples: Users  
         | User                  |

From 8c25be2e3202b04356d51704bf07349e3a8c2d6d Mon Sep 17 00:00:00 2001
From: Mark Calvert <mark.calvert@salsadigital.com.au>
Date: Wed, 17 Jun 2020 15:24:06 -0600
Subject: [PATCH 058/276] [DQL2-31] - Fixed sentence casing - Added validation
 for 'Approximate publishing date' date format. This is required as Safari
 does not support date inputs and fallsback to using a textbox.

---
 .../datarequests/snippets/additional_info.html   |  8 ++++----
 .../snippets/close_datarequest_form.html         |  2 +-
 ckanext/datarequests/validator.py                | 16 ++++++++++++----
 test/features/datarequest_circumstances.feature  |  6 +++---
 4 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/ckanext/datarequests/templates/datarequests/snippets/additional_info.html b/ckanext/datarequests/templates/datarequests/snippets/additional_info.html
index c2439c64..e5547c43 100644
--- a/ckanext/datarequests/templates/datarequests/snippets/additional_info.html
+++ b/ckanext/datarequests/templates/datarequests/snippets/additional_info.html
@@ -22,14 +22,14 @@ <h3>{{ _('Additional Info') }}</h3>
         {% if datarequest.closed %}
           {% if h.closing_circumstances_enabled %}
             <tr>
-              <th scope="row" class="dataset-label">{{ _('Close Circumstance') }}</th>
+              <th scope="row" class="dataset-label">{{ _('Close circumstance') }}</th>
               <td class="dataset-details" title="{{ datarequest.close_circumstance }}">
                 {{ datarequest.close_circumstance if datarequest.close_circumstance else _('None') }}
               </td>
             </tr>
             {% if datarequest.approx_publishing_date %}
               <tr>
-                <th scope="row" class="dataset-label">{{ _('Approximate Publishing Date') }}</th>
+                <th scope="row" class="dataset-label">{{ _('Approximate publishing date') }}</th>
                 <td class="dataset-details" title="{{ datarequest.approx_publishing_date }}">
                   {{ h.render_datetime(datarequest.approx_publishing_date) }}
                 </td>
@@ -37,7 +37,7 @@ <h3>{{ _('Additional Info') }}</h3>
             {% endif %}
             {% if datarequest.accepted_dataset %}
               <tr>
-                <th scope="row" class="dataset-label">{{ _('Accepted Dataset') }}</th>
+                <th scope="row" class="dataset-label">{{ _('Accepted dataset') }}</th>
                 <td class="dataset-details">
                   {% link_for datarequest.accepted_dataset['title'], controller='package', action='read', id=datarequest.accepted_dataset.get('id') %}
                 </td>
@@ -45,7 +45,7 @@ <h3>{{ _('Additional Info') }}</h3>
             {% endif %}
           {% else %}
             <tr>
-              <th scope="row" class="dataset-label">{{ _('Accepted Dataset') }}</th>
+              <th scope="row" class="dataset-label">{{ _('Accepted dataset') }}</th>
               <td class="dataset-details">
               {% if datarequest.accepted_dataset %}
                 {% link_for datarequest.accepted_dataset['title'], controller='package', action='read', id=datarequest.accepted_dataset.get('id') %}
diff --git a/ckanext/datarequests/templates/datarequests/snippets/close_datarequest_form.html b/ckanext/datarequests/templates/datarequests/snippets/close_datarequest_form.html
index 8e20756f..9f817759 100644
--- a/ckanext/datarequests/templates/datarequests/snippets/close_datarequest_form.html
+++ b/ckanext/datarequests/templates/datarequests/snippets/close_datarequest_form.html
@@ -26,7 +26,7 @@
             </select>
           </div>
         </div>
-        {{ form.input('approx_publishing_date', id='field-approx_publishing_date', label=_('Approximate Publishing Date'), placeholder="yyyy-mm-dd", type='date', error=errors.approx_publishing_date) }}
+        {{ form.input('approx_publishing_date', id='field-approx_publishing_date', label=_('Approximate publishing date'), placeholder="yyyy-mm-dd", type='date', error=errors.approx_publishing_date) }}
       {% endif %}
   {% endblock %}
 
diff --git a/ckanext/datarequests/validator.py b/ckanext/datarequests/validator.py
index 81ef343e..1d07d5fa 100644
--- a/ckanext/datarequests/validator.py
+++ b/ckanext/datarequests/validator.py
@@ -21,6 +21,7 @@
 import ckan.plugins.toolkit as tk
 import ckanext.datarequests.db as db
 import plugin as datarequests
+import datetime
 
 
 def validate_datarequest(context, request_data):
@@ -67,16 +68,23 @@ def validate_datarequest_closing(context, request_data):
         condition = request_data.get('condition', None)
         if condition:
             if condition == 'nominate_dataset' and request_data.get('accepted_dataset_id', '') == '':
-                raise tk.ValidationError({tk._('Accepted Dataset'): [tk._('Accepted dataset cannot be empty')]})
-            elif condition == 'nominate_approximate_date' and request_data.get('approx_publishing_date', '') == '':
-                raise tk.ValidationError({tk._('Approximate Publishing Date'): [tk._('Approximate publishing date cannot be empty')]})
+                raise tk.ValidationError({tk._('Accepted dataset'): [tk._('Accepted dataset cannot be empty')]})
+            elif condition == 'nominate_approximate_date':
+                if request_data.get('approx_publishing_date', '') == '':
+                    raise tk.ValidationError({tk._('Approximate publishing date'): [tk._('Approximate publishing date cannot be empty')]})
+                try:
+                    # This validation is required for the Safari browser as the date type input is not supported and falls back to using a text type input
+                    # SQLAlchemy throws an error if the date value is not in the format yyyy-mm-dd
+                    datetime.datetime.strptime(request_data.get('approx_publishing_date', ''), '%Y-%m-%d')
+                except ValueError:
+                    raise tk.ValidationError({tk._('Approximate publishing date'): [tk._('Approximate publishing date must be in format yyyy-mm-dd')]})
 
     accepted_dataset_id = request_data.get('accepted_dataset_id', '')
     if accepted_dataset_id:
         try:
             tk.get_validator('package_name_exists')(accepted_dataset_id, context)
         except Exception:
-            raise tk.ValidationError({tk._('Accepted Dataset'): [tk._('Dataset not found')]})
+            raise tk.ValidationError({tk._('Accepted dataset'): [tk._('Dataset not found')]})
 
 
 def validate_comment(context, request_data):
diff --git a/test/features/datarequest_circumstances.feature b/test/features/datarequest_circumstances.feature
index d3615aae..4290b7a9 100644
--- a/test/features/datarequest_circumstances.feature
+++ b/test/features/datarequest_circumstances.feature
@@ -130,7 +130,7 @@ Feature: Datarequest-circumstances
         And I select "To be released as open data at a later date" from "close_circumstance" 
         And I fill in "approx_publishing_date" with "2025-06-01"
         And I press the element with xpath "//button[contains(string(), 'Close data request')]"
-        Then I should see "Approximate Publishing Date" within 1 seconds 
+        Then I should see "Approximate publishing date" within 1 seconds 
         
         Examples: Users  
         | User                  |
@@ -152,14 +152,14 @@ Feature: Datarequest-circumstances
         | DataRequestOrgAdmin   |
 
 
-    Scenario Outline: Data request creator, Sysadmin and Admin users, when I close a datarequest with no accepted dataset or Approximate publishing date, they should not be visibe on datarequest page
+    Scenario Outline: Data request creator, Sysadmin and Admin users, when I close a datarequest with no accepted dataset or Approximate publishing date, they should not be visible on datarequest page
         Given "<User>" as the persona
         When I log in and create a datarequest 
         And I press the element with xpath "//a[contains(string(), 'Close')]"
         And I select "Requestor initiated closure" from "close_circumstance" 
         And I press the element with xpath "//button[contains(string(), 'Close data request')]"
         Then I should not see "Accepted Dataset" within 1 seconds 
-        Then I should not see "Approximate Publishing Date" within 1 seconds 
+        Then I should not see "Approximate publishing date" within 1 seconds 
         
         Examples: Users  
         | User                  |

From c42dc35fee34ac8b7d78e67456e06b3b9c948517 Mon Sep 17 00:00:00 2001
From: Mark Calvert <mark.calvert@salsadigital.com.au>
Date: Wed, 17 Jun 2020 15:40:44 -0600
Subject: [PATCH 059/276] Revert back text change to fix unit tests

---
 ckanext/datarequests/validator.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ckanext/datarequests/validator.py b/ckanext/datarequests/validator.py
index 1d07d5fa..0510c214 100644
--- a/ckanext/datarequests/validator.py
+++ b/ckanext/datarequests/validator.py
@@ -84,7 +84,7 @@ def validate_datarequest_closing(context, request_data):
         try:
             tk.get_validator('package_name_exists')(accepted_dataset_id, context)
         except Exception:
-            raise tk.ValidationError({tk._('Accepted dataset'): [tk._('Dataset not found')]})
+            raise tk.ValidationError({tk._('Accepted Dataset'): [tk._('Dataset not found')]})
 
 
 def validate_comment(context, request_data):

From fea262172c3eafbcce78a8429949a76f8454e134 Mon Sep 17 00:00:00 2001
From: Mark Calvert <mark.calvert@salsadigital.com.au>
Date: Wed, 17 Jun 2020 19:45:53 -0600
Subject: [PATCH 060/276] [DQL2-40] Updated BDD tests to match label case
 sentencing changes

---
 test/features/datarequest_circumstances.feature | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/test/features/datarequest_circumstances.feature b/test/features/datarequest_circumstances.feature
index 4290b7a9..20d89302 100644
--- a/test/features/datarequest_circumstances.feature
+++ b/test/features/datarequest_circumstances.feature
@@ -114,7 +114,7 @@ Feature: Datarequest-circumstances
         # Have to use JS to change the selected value as the behaving framework does not work with autocomplete dropdown
         Then I execute the script "document.getElementById('field-accepted_dataset_id').value = document.getElementById('field-accepted_dataset_id').options[1].value" 
         And I press the element with xpath "//button[contains(string(), 'Close data request')]"
-        Then I should see "Accepted Dataset" within 1 seconds 
+        Then I should see "Accepted dataset" within 1 seconds 
         And I should see "A Wonderful Story" within 1 seconds 
         
         Examples: Users  
@@ -137,13 +137,14 @@ Feature: Datarequest-circumstances
         | SysAdmin              |
         | DataRequestOrgAdmin   |
 
+    @wip
     Scenario Outline: Data request creator, Sysadmin and Admin users, when I close a datarequest with closing circumstance 'Requestor initiated closure', the circumstance should be visible on the datarequest page
         Given "<User>" as the persona
         When I log in and create a datarequest 
         And I press the element with xpath "//a[contains(string(), 'Close')]"
         And I select "Requestor initiated closure" from "close_circumstance" 
         And I press the element with xpath "//button[contains(string(), 'Close data request')]"
-        Then I should see "Close Circumstance" within 1 seconds 
+        Then I should see "Close circumstance" within 1 seconds 
         Then I should see "Requestor initiated closure" within 1 seconds 
         
         Examples: Users  
@@ -158,7 +159,7 @@ Feature: Datarequest-circumstances
         And I press the element with xpath "//a[contains(string(), 'Close')]"
         And I select "Requestor initiated closure" from "close_circumstance" 
         And I press the element with xpath "//button[contains(string(), 'Close data request')]"
-        Then I should not see "Accepted Dataset" within 1 seconds 
+        Then I should not see "Accepted dataset" within 1 seconds 
         Then I should not see "Approximate publishing date" within 1 seconds 
         
         Examples: Users  

From a9a4f2b901bbf3d0e398135780bc5673ae5ec269 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 8 Jul 2020 19:17:32 +0000
Subject: [PATCH 061/276] Bump coveralls from 2.0.0 to 2.1.1

Bumps [coveralls](https://github.com/coveralls-clients/coveralls-python) from 2.0.0 to 2.1.1.
- [Release notes](https://github.com/coveralls-clients/coveralls-python/releases)
- [Changelog](https://github.com/coveralls-clients/coveralls-python/blob/master/CHANGELOG.md)
- [Commits](https://github.com/coveralls-clients/coveralls-python/compare/2.0.0...2.1.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index e3236deb..294101be 100644
--- a/setup.py
+++ b/setup.py
@@ -48,7 +48,7 @@
     tests_require=[
         'nose_parameterized==0.3.3',
         'selenium==3.141.0',
-        'coveralls==2.0.0'
+        'coveralls==2.1.1'
     ],
     test_suite='nosetests',
     entry_points='''

From 46bc84e3865315976c776e19c7be0318effa57ec Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 9 Jul 2020 19:14:20 +0000
Subject: [PATCH 062/276] Bump lxml from 4.5.1 to 4.5.2

Bumps [lxml](https://github.com/lxml/lxml) from 4.5.1 to 4.5.2.
- [Release notes](https://github.com/lxml/lxml/releases)
- [Changelog](https://github.com/lxml/lxml/blob/master/CHANGES.txt)
- [Commits](https://github.com/lxml/lxml/compare/lxml-4.5.1...lxml-4.5.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 requirements-dev.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements-dev.txt b/requirements-dev.txt
index 53c882c5..9df30832 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -6,7 +6,7 @@ nose==1.3.7
 mock
 nose_parameterized==0.3.3
 profanityfilter
-lxml==4.5.1
+lxml==4.5.2
 splinter>=0.13.0
 -e git+https://github.com/qld-gov-au/ckanext-data-qld@develop#egg=ckanext-data_qld
 -e git+https://github.com/ckan/ckantoolkit@release-0.0.4#egg=ckantoolkit

From fd3df02b57c6bc12eedef6eb7bf5af644c468ce1 Mon Sep 17 00:00:00 2001
From: antuarc <carl.antuar@smartservice.qld.gov.au>
Date: Fri, 24 Jul 2020 10:40:47 +1000
Subject: [PATCH 063/276] increase range of random data request titles so
 there's less chance of collisions

---
 .../datarequest_circumstances.feature         | 104 +++++++++---------
 test/features/steps/steps.py                  |   3 +-
 2 files changed, 53 insertions(+), 54 deletions(-)

diff --git a/test/features/datarequest_circumstances.feature b/test/features/datarequest_circumstances.feature
index 20d89302..6323e9ee 100644
--- a/test/features/datarequest_circumstances.feature
+++ b/test/features/datarequest_circumstances.feature
@@ -8,13 +8,13 @@ Feature: Datarequest-circumstances
         And I should see "Data request closing circumstances"
 
 
-    Scenario Outline: Data request creator, Sysadmin and Admin users can see the drop-down field circumstances  
+    Scenario Outline: Data request creator, Sysadmin and Admin users can see the drop-down field circumstances
         Given "<User>" as the persona
-        When I log in and create a datarequest      
+        When I log in and create a datarequest
         And I press the element with xpath "//a[contains(string(), 'Close')]"
         Then the element with the css selector "#field-close_circumstance" should be visible within 1 seconds
-        
-        Examples: Users  
+
+        Examples: Users
         | User                  |
         | SysAdmin              |
         | DataRequestOrgAdmin   |
@@ -22,15 +22,15 @@ Feature: Datarequest-circumstances
 
     Scenario Outline: Data request creator, Sysadmin and Admin users, when I select a closing circumstance 'Open dataset already exists', accepted dataset is required
         Given "<User>" as the persona
-        When I log in and create a datarequest 
+        When I log in and create a datarequest
         And I press the element with xpath "//a[contains(string(), 'Close')]"
         And I select "Open dataset already exists" from "close_circumstance"
         And I press the element with xpath "//button[contains(string(), 'Close data request')]"
         Then I should see an element with the css selector "div.error-explanation.alert.alert-error" within 2 seconds
-        And I should see "The form contains invalid entries" within 1 seconds    
-        And I should see "Accepted dataset cannot be empty" within 1 seconds 
-        
-        Examples: Users  
+        And I should see "The form contains invalid entries" within 1 seconds
+        And I should see "Accepted dataset cannot be empty" within 1 seconds
+
+        Examples: Users
         | User                  |
         | SysAdmin              |
         | DataRequestOrgAdmin   |
@@ -38,15 +38,15 @@ Feature: Datarequest-circumstances
 
     Scenario Outline: Data request creator, Sysadmin and Admin users, when I select closing circumstance with condition 'To be released as open data at a later date', Approximate publishing date is required
         Given "<User>" as the persona
-        When I log in and create a datarequest 
+        When I log in and create a datarequest
         And I press the element with xpath "//a[contains(string(), 'Close')]"
         And I select "To be released as open data at a later date" from "close_circumstance"
         And I press the element with xpath "//button[contains(string(), 'Close data request')]"
         Then I should see an element with the css selector "div.error-explanation.alert.alert-error" within 2 seconds
-        And I should see "The form contains invalid entries" within 1 seconds    
+        And I should see "The form contains invalid entries" within 1 seconds
         And I should see "Approximate publishing date cannot be empty" within 1 seconds
-        
-        Examples: Users  
+
+        Examples: Users
         | User                  |
         | SysAdmin              |
         | DataRequestOrgAdmin   |
@@ -54,26 +54,26 @@ Feature: Datarequest-circumstances
 
     Scenario Outline: Data request creator, Sysadmin and Admin users, when I select closing circumstance 'Requestor initiated closure', accepted dataset or Approximate publishing date is not required
         Given "<User>" as the persona
-        When I log in and create a datarequest 
+        When I log in and create a datarequest
         And I press the element with xpath "//a[contains(string(), 'Close')]"
         And I select "Requestor initiated closure" from "close_circumstance"
         And I press the element with xpath "//button[contains(string(), 'Close data request')]"
         Then I should see an element with xpath "//span[contains(@class,'label-closed') and contains(string(), 'Closed')]" within 2 seconds
-        
-        Examples: Users  
+
+        Examples: Users
         | User                  |
         | SysAdmin              |
         | DataRequestOrgAdmin   |
-    
+
 
     Scenario Outline: Data request creator, Sysadmin and Admin users, when I select closing circumstance 'Open dataset already exists', the Approximate publishing date element is not visible
         Given "<User>" as the persona
-        When I log in and create a datarequest 
+        When I log in and create a datarequest
         And I press the element with xpath "//a[contains(string(), 'Close')]"
         And I select "Open dataset already exists" from "close_circumstance"
         Then the element with the css selector "#field-approx_publishing_date" should not be visible within 1 seconds
-        
-        Examples: Users  
+
+        Examples: Users
         | User                  |
         | SysAdmin              |
         | DataRequestOrgAdmin   |
@@ -81,12 +81,12 @@ Feature: Datarequest-circumstances
 
     Scenario Outline: Data request creator, Sysadmin and Admin users, when I select closing circumstance 'To be released as open data at a later date', the accepted dataset element is not visible
         Given "<User>" as the persona
-        When I log in and create a datarequest 
+        When I log in and create a datarequest
         And I press the element with xpath "//a[contains(string(), 'Close')]"
         And I select "To be released as open data at a later date" from "close_circumstance"
         Then the element with the css selector "#field-accepted_dataset_id" should not be visible within 1 seconds
-        
-        Examples: Users  
+
+        Examples: Users
         | User                  |
         | SysAdmin              |
         | DataRequestOrgAdmin   |
@@ -94,30 +94,30 @@ Feature: Datarequest-circumstances
 
     Scenario Outline: Data request creator, Sysadmin and Admin users, when I select closing circumstance 'Data openly available elsewhere', the accepted dataset and Approximate publishing date elements are not visible
         Given "<User>" as the persona
-        When I log in and create a datarequest 
+        When I log in and create a datarequest
         And I press the element with xpath "//a[contains(string(), 'Close')]"
         And I select "Data openly available elsewhere" from "close_circumstance"
         Then the element with the css selector "#field-accepted_dataset_id" should not be visible within 1 seconds
         Then the element with the css selector "#field-approx_publishing_date" should not be visible within 1 seconds
-        
-        Examples: Users  
+
+        Examples: Users
         | User                  |
         | SysAdmin              |
         | DataRequestOrgAdmin   |
 
-    
-    Scenario Outline: Data request creator, Sysadmin and Admin users, when I close a datarequest with accepted dataset, the accepeted dataset should be visible on datarequest page
+
+    Scenario Outline: Data request creator, Sysadmin and Admin users, when I close a datarequest with accepted dataset, the accepted dataset should be visible on datarequest page
         Given "<User>" as the persona
-        When I log in and create a datarequest 
+        When I log in and create a datarequest
         And I press the element with xpath "//a[contains(string(), 'Close')]"
-        And I select "Open dataset already exists" from "close_circumstance" 
+        And I select "Open dataset already exists" from "close_circumstance"
         # Have to use JS to change the selected value as the behaving framework does not work with autocomplete dropdown
-        Then I execute the script "document.getElementById('field-accepted_dataset_id').value = document.getElementById('field-accepted_dataset_id').options[1].value" 
+        Then I execute the script "document.getElementById('field-accepted_dataset_id').value = document.getElementById('field-accepted_dataset_id').options[1].value"
         And I press the element with xpath "//button[contains(string(), 'Close data request')]"
-        Then I should see "Accepted dataset" within 1 seconds 
-        And I should see "A Wonderful Story" within 1 seconds 
-        
-        Examples: Users  
+        Then I should see "Accepted dataset" within 1 seconds
+        And I should see "A Wonderful Story" within 1 seconds
+
+        Examples: Users
         | User                  |
         | SysAdmin              |
         | DataRequestOrgAdmin   |
@@ -125,14 +125,14 @@ Feature: Datarequest-circumstances
 
     Scenario Outline: Data request creator, Sysadmin and Admin users, when I close a datarequest with Approximate publishing date, the Approximate publishing date should be visible on datarequest page
         Given "<User>" as the persona
-        When I log in and create a datarequest 
+        When I log in and create a datarequest
         And I press the element with xpath "//a[contains(string(), 'Close')]"
-        And I select "To be released as open data at a later date" from "close_circumstance" 
+        And I select "To be released as open data at a later date" from "close_circumstance"
         And I fill in "approx_publishing_date" with "2025-06-01"
         And I press the element with xpath "//button[contains(string(), 'Close data request')]"
-        Then I should see "Approximate publishing date" within 1 seconds 
-        
-        Examples: Users  
+        Then I should see "Approximate publishing date" within 1 seconds
+
+        Examples: Users
         | User                  |
         | SysAdmin              |
         | DataRequestOrgAdmin   |
@@ -140,14 +140,14 @@ Feature: Datarequest-circumstances
     @wip
     Scenario Outline: Data request creator, Sysadmin and Admin users, when I close a datarequest with closing circumstance 'Requestor initiated closure', the circumstance should be visible on the datarequest page
         Given "<User>" as the persona
-        When I log in and create a datarequest 
+        When I log in and create a datarequest
         And I press the element with xpath "//a[contains(string(), 'Close')]"
-        And I select "Requestor initiated closure" from "close_circumstance" 
+        And I select "Requestor initiated closure" from "close_circumstance"
         And I press the element with xpath "//button[contains(string(), 'Close data request')]"
-        Then I should see "Close circumstance" within 1 seconds 
-        Then I should see "Requestor initiated closure" within 1 seconds 
-        
-        Examples: Users  
+        Then I should see "Close circumstance" within 1 seconds
+        Then I should see "Requestor initiated closure" within 1 seconds
+
+        Examples: Users
         | User                  |
         | SysAdmin              |
         | DataRequestOrgAdmin   |
@@ -155,14 +155,14 @@ Feature: Datarequest-circumstances
 
     Scenario Outline: Data request creator, Sysadmin and Admin users, when I close a datarequest with no accepted dataset or Approximate publishing date, they should not be visible on datarequest page
         Given "<User>" as the persona
-        When I log in and create a datarequest 
+        When I log in and create a datarequest
         And I press the element with xpath "//a[contains(string(), 'Close')]"
-        And I select "Requestor initiated closure" from "close_circumstance" 
+        And I select "Requestor initiated closure" from "close_circumstance"
         And I press the element with xpath "//button[contains(string(), 'Close data request')]"
-        Then I should not see "Accepted dataset" within 1 seconds 
-        Then I should not see "Approximate publishing date" within 1 seconds 
-        
-        Examples: Users  
+        Then I should not see "Accepted dataset" within 1 seconds
+        Then I should not see "Approximate publishing date" within 1 seconds
+
+        Examples: Users
         | User                  |
         | SysAdmin              |
         | DataRequestOrgAdmin   |
diff --git a/test/features/steps/steps.py b/test/features/steps/steps.py
index 5a782978..29f55c23 100644
--- a/test/features/steps/steps.py
+++ b/test/features/steps/steps.py
@@ -53,7 +53,7 @@ def title_random_text(context):
     assert context.persona
     context.execute_steps(u"""
         When I fill in "title" with "Test Title {0}"
-    """.format(random.randrange(10000)))
+    """.format(random.randrange(100000)))
 
 # The default behaving step does not convert base64 emails
 # Modifed the default step to decode the payload from base64
@@ -95,4 +95,3 @@ def log_in_create_a_datarequest(context):
         And I fill in "description" with "Test description"
         And I press the element with xpath "//button[contains(string(), 'Create data request')]"
     """)
-        
\ No newline at end of file

From 4d28ff599dce92d718f8cf712096b5959988af49 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Mon, 27 Jul 2020 12:24:34 +1000
Subject: [PATCH 064/276] add dependencies on QA extensions now required by
 ckanext-data-qld

---
 .docker/test.ini     |  2 +-
 requirements-dev.txt | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/.docker/test.ini b/.docker/test.ini
index 81c076f6..c824ab46 100644
--- a/.docker/test.ini
+++ b/.docker/test.ini
@@ -94,7 +94,7 @@ ckan.redis.url = redis://redis:6379
 #       Add ``resource_proxy`` to enable resorce proxying and get around the
 #       same origin policy
 # @todo:setup Cleanup the list to use only required plugins.
-ckan.plugins = stats text_view image_view recline_view datastore data_qld_theme datarequests data_qld ytp_comments
+ckan.plugins = stats text_view image_view recline_view datastore data_qld_theme datarequests data_qld ytp_comments qa archiver report
 
 # Define which views should be created by default
 # (plugins must be loaded in ckan.plugins)
diff --git a/requirements-dev.txt b/requirements-dev.txt
index 9df30832..bae38abd 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -8,9 +8,20 @@ nose_parameterized==0.3.3
 profanityfilter
 lxml==4.5.2
 splinter>=0.13.0
+xlrd==1.0.0
+python-magic==0.4.12
+messytables==0.15.2
+progressbar==2.3
+SQLAlchemy>=0.6.6
+requests==2.11.1
+six==1.11.0
 -e git+https://github.com/qld-gov-au/ckanext-data-qld@develop#egg=ckanext-data_qld
 -e git+https://github.com/ckan/ckantoolkit@release-0.0.4#egg=ckantoolkit
 -e git+https://github.com/ckan/ckanapi@ckanapi-4.3#egg=ckanapi
 -e git+https://github.com/ckan/ckanext-scheming@release-1.2.0#egg=ckanext-scheming
 -e git+https://github.com/qld-gov-au/ckanext-data-qld-theme@develop#egg=ckanext-data_qld_theme
 -e git+https://github.com/qld-gov-au/ckanext-ytp-comments@develop#egg=ckanext-ytp-comments
+-e git+https://github.com/qld-gov-au/ckanext-qa@develop#egg=ckanext-qa
+-e git+https://github.com/qld-gov-au/ckanext-archiver.git@develop#egg=ckanext-archiver
+-e git+https://github.com/qld-gov-au/ckanext-report.git@0.1#egg=ckanext-report
+

From c7cff1503bf5156925a2ec5a977b3f5e207f58fb Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Mon, 27 Jul 2020 12:37:07 +1000
Subject: [PATCH 065/276] initialise QA tables

---
 .docker/scripts/init.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.docker/scripts/init.sh b/.docker/scripts/init.sh
index 4c98dba8..6df228bb 100755
--- a/.docker/scripts/init.sh
+++ b/.docker/scripts/init.sh
@@ -18,5 +18,8 @@ CKAN_USER_EMAIL="${CKAN_USER_EMAIL:-admin@localhost}"
 # Initialise the Comments database tables
 paster --plugin=ckanext-ytp-comments initdb --config=/app/ckan/default/production.ini
 
+# Initialise the QA database tables
+paster --plugin=ckanext-qa qa init --config=/app/ckan/default/production.ini
+
 # Create some base test data
-. /app/scripts/create-test-data.sh
\ No newline at end of file
+. /app/scripts/create-test-data.sh

From 279d64dacdfca5298b88253175972a01451659be Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Mon, 27 Jul 2020 12:48:49 +1000
Subject: [PATCH 066/276] initialise archival and reporting tables

---
 .docker/scripts/init.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.docker/scripts/init.sh b/.docker/scripts/init.sh
index 6df228bb..24b0ca91 100755
--- a/.docker/scripts/init.sh
+++ b/.docker/scripts/init.sh
@@ -18,6 +18,12 @@ CKAN_USER_EMAIL="${CKAN_USER_EMAIL:-admin@localhost}"
 # Initialise the Comments database tables
 paster --plugin=ckanext-ytp-comments initdb --config=/app/ckan/default/production.ini
 
+# Initialise the archiver database tables
+paster --plugin=ckanext-archiver archiver init --config=/app/ckan/default/production.ini
+
+# Initialise the reporting database tables
+paster --plugin=ckanext-report report initdb --config=/app/ckan/default/production.ini
+
 # Initialise the QA database tables
 paster --plugin=ckanext-qa qa init --config=/app/ckan/default/production.ini
 

From b79005ce499cbff5e7832c7a42e7672103c49757 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 27 Jul 2020 19:16:10 +0000
Subject: [PATCH 067/276] [Security] Bump requests from 2.11.1 to 2.24.0

Bumps [requests](https://github.com/psf/requests) from 2.11.1 to 2.24.0. **This update includes a security fix.**
- [Release notes](https://github.com/psf/requests/releases)
- [Changelog](https://github.com/psf/requests/blob/master/HISTORY.md)
- [Commits](https://github.com/psf/requests/compare/v2.11.1...v2.24.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 requirements-dev.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements-dev.txt b/requirements-dev.txt
index bae38abd..b211c375 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -13,7 +13,7 @@ python-magic==0.4.12
 messytables==0.15.2
 progressbar==2.3
 SQLAlchemy>=0.6.6
-requests==2.11.1
+requests==2.24.0
 six==1.11.0
 -e git+https://github.com/qld-gov-au/ckanext-data-qld@develop#egg=ckanext-data_qld
 -e git+https://github.com/ckan/ckantoolkit@release-0.0.4#egg=ckantoolkit

From 5b0f5f0d382f87532c2271065d6d31d8cc7e82ba Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 27 Jul 2020 19:16:30 +0000
Subject: [PATCH 068/276] Bump python-magic from 0.4.12 to 0.4.18

Bumps [python-magic](https://github.com/ahupp/python-magic) from 0.4.12 to 0.4.18.
- [Release notes](https://github.com/ahupp/python-magic/releases)
- [Changelog](https://github.com/ahupp/python-magic/blob/master/CHANGELOG)
- [Commits](https://github.com/ahupp/python-magic/compare/0.4.12...0.4.18)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 requirements-dev.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements-dev.txt b/requirements-dev.txt
index bae38abd..a0e876a2 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -9,7 +9,7 @@ profanityfilter
 lxml==4.5.2
 splinter>=0.13.0
 xlrd==1.0.0
-python-magic==0.4.12
+python-magic==0.4.18
 messytables==0.15.2
 progressbar==2.3
 SQLAlchemy>=0.6.6

From 2463008edd59a37d991639f731ebe7cadb42e140 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 12 Aug 2020 19:17:41 +0000
Subject: [PATCH 069/276] Bump coveralls from 2.1.1 to 2.1.2

Bumps [coveralls](https://github.com/coveralls-clients/coveralls-python) from 2.1.1 to 2.1.2.
- [Release notes](https://github.com/coveralls-clients/coveralls-python/releases)
- [Changelog](https://github.com/coveralls-clients/coveralls-python/blob/master/CHANGELOG.md)
- [Commits](https://github.com/coveralls-clients/coveralls-python/compare/2.1.1...2.1.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 294101be..dd7a1391 100644
--- a/setup.py
+++ b/setup.py
@@ -48,7 +48,7 @@
     tests_require=[
         'nose_parameterized==0.3.3',
         'selenium==3.141.0',
-        'coveralls==2.1.1'
+        'coveralls==2.1.2'
     ],
     test_suite='nosetests',
     entry_points='''

From 57458901038f39f5f017f69d6b42495fc87834e9 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 23 Sep 2020 02:49:33 +0000
Subject: [PATCH 070/276] Bump progressbar from 2.3 to 2.5

Bumps [progressbar](https://github.com/niltonvolpato/python-progressbar) from 2.3 to 2.5.
- [Release notes](https://github.com/niltonvolpato/python-progressbar/releases)
- [Changelog](https://github.com/niltonvolpato/python-progressbar/blob/master/ChangeLog.yaml)
- [Commits](https://github.com/niltonvolpato/python-progressbar/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 requirements-dev.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements-dev.txt b/requirements-dev.txt
index b211c375..e66888c9 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -11,7 +11,7 @@ splinter>=0.13.0
 xlrd==1.0.0
 python-magic==0.4.12
 messytables==0.15.2
-progressbar==2.3
+progressbar==2.5
 SQLAlchemy>=0.6.6
 requests==2.24.0
 six==1.11.0

From f9dbc3cb4348f5864bbc55808b43c425945724d0 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 23 Sep 2020 03:08:26 +0000
Subject: [PATCH 071/276] Bump six from 1.11.0 to 1.15.0

Bumps [six](https://github.com/benjaminp/six) from 1.11.0 to 1.15.0.
- [Release notes](https://github.com/benjaminp/six/releases)
- [Changelog](https://github.com/benjaminp/six/blob/master/CHANGES)
- [Commits](https://github.com/benjaminp/six/compare/1.11.0...1.15.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 requirements-dev.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements-dev.txt b/requirements-dev.txt
index 042a5db2..3c705901 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -14,7 +14,7 @@ messytables==0.15.2
 progressbar==2.5
 SQLAlchemy>=0.6.6
 requests==2.24.0
-six==1.11.0
+six==1.15.0
 -e git+https://github.com/qld-gov-au/ckanext-data-qld@develop#egg=ckanext-data_qld
 -e git+https://github.com/ckan/ckantoolkit@release-0.0.4#egg=ckantoolkit
 -e git+https://github.com/ckan/ckanapi@ckanapi-4.3#egg=ckanapi

From ebe48432b2f619e229d8dd81435a53530ddfb792 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 23 Sep 2020 03:08:33 +0000
Subject: [PATCH 072/276] Bump xlrd from 1.0.0 to 1.2.0

Bumps [xlrd](https://github.com/python-excel/xlrd) from 1.0.0 to 1.2.0.
- [Release notes](https://github.com/python-excel/xlrd/releases)
- [Changelog](https://github.com/python-excel/xlrd/blob/master/docs/changes.rst)
- [Commits](https://github.com/python-excel/xlrd/compare/1.0.0...1.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 requirements-dev.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements-dev.txt b/requirements-dev.txt
index 042a5db2..83712a55 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -8,7 +8,7 @@ nose_parameterized==0.3.3
 profanityfilter
 lxml==4.5.2
 splinter>=0.13.0
-xlrd==1.0.0
+xlrd==1.2.0
 python-magic==0.4.18
 messytables==0.15.2
 progressbar==2.5

From fed43990041625242c627746e2c06e29c7e83a83 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 6 Apr 2021 23:14:13 +0000
Subject: [PATCH 073/276] Bump lxml from 4.5.2 to 4.6.3

Bumps [lxml](https://github.com/lxml/lxml) from 4.5.2 to 4.6.3.
- [Release notes](https://github.com/lxml/lxml/releases)
- [Changelog](https://github.com/lxml/lxml/blob/master/CHANGES.txt)
- [Commits](https://github.com/lxml/lxml/compare/lxml-4.5.2...lxml-4.6.3)

Signed-off-by: dependabot[bot] <support@github.com>
---
 requirements-dev.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements-dev.txt b/requirements-dev.txt
index 448034eb..e8bef0a7 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -6,7 +6,7 @@ nose==1.3.7
 mock
 nose_parameterized==0.3.3
 profanityfilter
-lxml==4.5.2
+lxml==4.6.3
 splinter>=0.13.0
 xlrd==1.2.0
 python-magic==0.4.18

From 8246be1714ff4095634a641884d2823a10edce3e Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 29 Apr 2021 20:05:42 +0000
Subject: [PATCH 074/276] Upgrade to GitHub-native Dependabot

---
 .github/dependabot.yml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 .github/dependabot.yml

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 00000000..b5158981
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,18 @@
+version: 2
+registries:
+  python-index-pypi-org:
+    type: python-index
+    url: https://pypi.org/
+    replaces-base: true
+    username: "${{secrets.PYTHON_INDEX_PYPI_ORG_USERNAME}}"
+    password: "${{secrets.PYTHON_INDEX_PYPI_ORG_PASSWORD}}"
+
+updates:
+- package-ecosystem: pip
+  directory: "/"
+  schedule:
+    interval: daily
+    time: "19:00"
+  open-pull-requests-limit: 10
+  registries:
+  - python-index-pypi-org

From af078d4d9fabe7e7effc4d8a1e258eb756488a27 Mon Sep 17 00:00:00 2001
From: antuarc <carl.antuar@smartservice.qld.gov.au>
Date: Fri, 30 Apr 2021 10:58:02 +1000
Subject: [PATCH 075/276] update 'requests' to handle a wider range of
 dependencies

---
 requirements-dev.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements-dev.txt b/requirements-dev.txt
index 448034eb..1f3526a1 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -13,7 +13,7 @@ python-magic==0.4.18
 messytables==0.15.2
 progressbar==2.5
 SQLAlchemy>=0.6.6
-requests==2.24.0
+requests==2.25.1
 six==1.15.0
 -e git+https://github.com/qld-gov-au/ckanext-data-qld@develop#egg=ckanext-data_qld
 -e git+https://github.com/ckan/ckantoolkit@release-0.0.4#egg=ckantoolkit

From fb4451b28f4038dd6e9d5724261f459399f1556c Mon Sep 17 00:00:00 2001
From: antuarc <carl.antuar@smartservice.qld.gov.au>
Date: Fri, 30 Apr 2021 13:59:13 +1000
Subject: [PATCH 076/276] replace obsolete data_qld combined plugin

---
 .docker/test.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.docker/test.ini b/.docker/test.ini
index c824ab46..c0f3f0dc 100644
--- a/.docker/test.ini
+++ b/.docker/test.ini
@@ -94,7 +94,7 @@ ckan.redis.url = redis://redis:6379
 #       Add ``resource_proxy`` to enable resorce proxying and get around the
 #       same origin policy
 # @todo:setup Cleanup the list to use only required plugins.
-ckan.plugins = stats text_view image_view recline_view datastore data_qld_theme datarequests data_qld ytp_comments qa archiver report
+ckan.plugins = stats text_view image_view recline_view datastore data_qld_theme datarequests data_qld_resources ytp_comments qa archiver report
 
 # Define which views should be created by default
 # (plugins must be loaded in ckan.plugins)

From 0075487ed8bf47d4a3b256a64bbab2410d610852 Mon Sep 17 00:00:00 2001
From: antuarc <carl.antuar@smartservice.qld.gov.au>
Date: Fri, 30 Apr 2021 14:25:37 +1000
Subject: [PATCH 077/276] add data_qld_integration plugin

---
 .docker/test.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.docker/test.ini b/.docker/test.ini
index c0f3f0dc..8535bfd5 100644
--- a/.docker/test.ini
+++ b/.docker/test.ini
@@ -94,7 +94,7 @@ ckan.redis.url = redis://redis:6379
 #       Add ``resource_proxy`` to enable resorce proxying and get around the
 #       same origin policy
 # @todo:setup Cleanup the list to use only required plugins.
-ckan.plugins = stats text_view image_view recline_view datastore data_qld_theme datarequests data_qld_resources ytp_comments qa archiver report
+ckan.plugins = stats text_view image_view recline_view datastore data_qld_theme datarequests data_qld_resources data_qld_integration ytp_comments qa archiver report
 
 # Define which views should be created by default
 # (plugins must be loaded in ckan.plugins)

From f6f98089e715e7890e2af9c1d78019cf3b143544 Mon Sep 17 00:00:00 2001
From: antuarc <carl.antuar@smartservice.qld.gov.au>
Date: Fri, 30 Apr 2021 15:35:39 +1000
Subject: [PATCH 078/276] [QOL-7970] clean up for Flake8 and Python 3

- normalise whitespace and imports
- replace 'dict' and 'set' calls with literals and comprehensions
- fix clashing names
- use 'six' to replace obsolete calls
---
 .flake8                                       |  2 +
 ckanext/datarequests/actions.py               | 30 +++----
 .../datarequests/controllers/ui_controller.py | 26 +++---
 ckanext/datarequests/db.py                    |  2 +-
 ckanext/datarequests/helpers.py               |  4 +-
 ckanext/datarequests/plugin.py                | 27 +++---
 ckanext/datarequests/tests/test_actions.py    | 45 +++-------
 .../datarequests/tests/test_actions_data.py   | 18 ++--
 ckanext/datarequests/tests/test_auth.py       |  6 +-
 ckanext/datarequests/tests/test_db.py         |  7 +-
 ckanext/datarequests/tests/test_helpers.py    |  2 +-
 ckanext/datarequests/tests/test_plugin.py     | 72 ++++++++-------
 .../datarequests/tests/test_ui_controller.py  | 64 +++++++------
 ckanext/datarequests/tests/test_validator.py  |  4 +-
 ckanext/datarequests/validator.py             |  2 +-
 setup.py                                      |  7 +-
 test/features/environment.py                  | 90 +++++++++----------
 test/features/steps/steps.py                  | 30 +++----
 18 files changed, 213 insertions(+), 225 deletions(-)

diff --git a/.flake8 b/.flake8
index f443751e..09a146e3 100644
--- a/.flake8
+++ b/.flake8
@@ -15,5 +15,7 @@ max-complexity = 10
 
 # List ignore rules one per line.
 ignore =
+    E241
+    E266
     E501
     C901
diff --git a/ckanext/datarequests/actions.py b/ckanext/datarequests/actions.py
index e727ae45..bf74d402 100644
--- a/ckanext/datarequests/actions.py
+++ b/ckanext/datarequests/actions.py
@@ -18,16 +18,14 @@
 # along with CKAN Data Requests Extension. If not, see <http://www.gnu.org/licenses/>.
 
 
-import ckan.lib.base as base
-import ckan.model as model
-import ckan.plugins as plugins
 import constants
 import datetime
 import cgi
 import db
 import logging
 import validator
-import ckan.lib.mailer as mailer
+from ckan import model, plugins
+from ckan.lib import base, mailer
 
 from pylons import config
 
@@ -201,7 +199,7 @@ def create_datarequest(context, data_dict):
     :type organization_id: string
 
     :returns: A dict with the data request (id, user_id, title, description,
-        organization_id, open_time, accepted_dataset, close_time, closed, 
+        organization_id, open_time, accepted_dataset, close_time, closed,
         followers)
     :rtype: dict
     '''
@@ -230,7 +228,7 @@ def create_datarequest(context, data_dict):
     datarequest_dict = _dictize_datarequest(data_req)
 
     if datarequest_dict['organization']:
-        users = set([user['id'] for user in datarequest_dict['organization']['users']])
+        users = {user['id'] for user in datarequest_dict['organization']['users']}
         users.discard(context['auth_user_obj'].id)
         _send_mail(users, 'new_datarequest', datarequest_dict)
 
@@ -250,7 +248,7 @@ def show_datarequest(context, data_dict):
     :type id: string
 
     :returns: A dict with the data request (id, user_id, title, description,
-        organization_id, open_time, accepted_dataset, close_time, closed, 
+        organization_id, open_time, accepted_dataset, close_time, closed,
         followers)
     :rtype: dict
     '''
@@ -302,7 +300,7 @@ def update_datarequest(context, data_dict):
     :type organization_id: string
 
     :returns: A dict with the data request (id, user_id, title, description,
-        organization_id, open_time, accepted_dataset, close_time, closed, 
+        organization_id, open_time, accepted_dataset, close_time, closed,
         followers)
     :rtype: dict
     '''
@@ -455,7 +453,7 @@ def list_datarequests(context, data_dict):
                 'display_name': organization.get('display_name'),
                 'count': no_processed_organization_facet[organization_id]
             })
-        except:
+        except Exception:
             pass
 
     state_facet = []
@@ -493,7 +491,7 @@ def delete_datarequest(context, data_dict):
     :type id: string
 
     :returns: A dict with the data request (id, user_id, title, description,
-        organization_id, open_time, accepted_dataset, close_time, closed, 
+        organization_id, open_time, accepted_dataset, close_time, closed,
         followers)
     :rtype: dict
     '''
@@ -538,7 +536,7 @@ def close_datarequest(context, data_dict):
     :type accepted_dataset_id: string
 
     :returns: A dict with the data request (id, user_id, title, description,
-        organization_id, open_time, accepted_dataset, close_time, closed, 
+        organization_id, open_time, accepted_dataset, close_time, closed,
         followers)
     :rtype: dict
 
@@ -821,11 +819,11 @@ def delete_datarequest_comment(context, data_dict):
 
 def follow_datarequest(context, data_dict):
     '''
-    Action to follow a data request. Access rights will be cheked before 
+    Action to follow a data request. Access rights will be cheked before
     following a datarequest and a NotAuthorized exception will be risen if the
     user is not allowed to follow the given datarequest. ValidationError will
     be risen if the datarequest ID is not included or if the user is already
-    following the datarequest. ObjectNotFound will be risen if the given 
+    following the datarequest. ObjectNotFound will be risen if the given
     datarequest does not exist.
 
     :param id: The ID of the datarequest to be followed
@@ -873,11 +871,11 @@ def follow_datarequest(context, data_dict):
 
 def unfollow_datarequest(context, data_dict):
     '''
-    Action to unfollow a data request. Access rights will be cheked before 
+    Action to unfollow a data request. Access rights will be cheked before
     unfollowing a datarequest and a NotAuthorized exception will be risen if
     the user is not allowed to unfollow the given datarequest. ValidationError
-    will be risen if the datarequest ID is not included in the request. 
-    ObjectNotFound will be risen if the user is not following the given 
+    will be risen if the datarequest ID is not included in the request.
+    ObjectNotFound will be risen if the user is not following the given
     datarequest.
 
     :param id: The ID of the datarequest to be unfollowed
diff --git a/ckanext/datarequests/controllers/ui_controller.py b/ckanext/datarequests/controllers/ui_controller.py
index d68f8f7b..03e60427 100644
--- a/ckanext/datarequests/controllers/ui_controller.py
+++ b/ckanext/datarequests/controllers/ui_controller.py
@@ -19,16 +19,16 @@
 
 import logging
 
-import ckan.lib.base as base
-import ckan.model as model
-import ckan.plugins as plugins
-import ckan.lib.helpers as helpers
-import ckanext.datarequests.constants as constants
 import functools
 import re
+import six
 
+from six.moves.urllib import urlencode
+
+from ckan import model, plugins
 from ckan.common import request
-from urllib import urlencode
+from ckan.lib import base, helpers
+from ckanext.datarequests import constants
 
 
 _link = re.compile(r'(?:(https?://)|(www\.))(\S+\b/?)([!"#$%&\'()*+,\-./:;<=>?@[\\\]^_`{|}~]*)(\s|$)', re.I)
@@ -48,7 +48,7 @@ def _get_errors_summary(errors):
 
 
 def _encode_params(params):
-    return [(k, v.encode('utf-8') if isinstance(v, basestring) else str(v))
+    return [(k, v.encode('utf-8') if isinstance(v, six.string_types) else str(v))
             for k, v in params]
 
 
@@ -84,7 +84,7 @@ def _get_context(self):
     def _show_index(self, user_id, organization_id, include_organization_facet, url_func, file_to_render):
 
         def pager_url(state=None, sort=None, q=None, page=None):
-            params = list()
+            params = []
 
             if q:
                 params.append(('q', q))
@@ -220,7 +220,7 @@ def show(self, id):
             context_ignore_auth['ignore_auth'] = True
 
             return tk.render('datarequests/show.html')
-        except tk.ObjectNotFound as e:
+        except tk.ObjectNotFound:
             tk.abort(404, tk._('Data Request %s not found') % id)
         except tk.NotAuthorized as e:
             log.warn(e)
@@ -286,9 +286,11 @@ def close(self, id):
         # Basic intialization
         c.datarequest = {}
 
-        def _return_page(errors={}, errors_summary={}):
-            # Get datasets (if the data req belongs to an organization, only the one that
-            # belongs to the organization are shown)
+        def _return_page(errors=None, errors_summary=None):
+            errors = errors or {}
+            errors_summary = errors_summary or {}
+            # Get datasets (if the data req belongs to an organization,
+            # only the ones that belong to the organization are shown)
             organization_id = c.datarequest.get('organization_id', '')
             if organization_id:
                 base_datasets = tk.get_action('organization_show')({'ignore_auth': True}, {'id': organization_id, 'include_datasets': True})['packages']
diff --git a/ckanext/datarequests/db.py b/ckanext/datarequests/db.py
index 731be6f1..e8306290 100644
--- a/ckanext/datarequests/db.py
+++ b/ckanext/datarequests/db.py
@@ -187,7 +187,7 @@ def get_datarequest_followers_number(cls, **kw):
 
 
 def update_db(model):
-    '''    
+    '''
     A place to make any datarequest table updates via SQL commands
     This is required because adding new columns to sqlalchemy metadata will not get created if the table already exists
     '''
diff --git a/ckanext/datarequests/helpers.py b/ckanext/datarequests/helpers.py
index e547d621..845e2660 100644
--- a/ckanext/datarequests/helpers.py
+++ b/ckanext/datarequests/helpers.py
@@ -17,11 +17,11 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with CKAN Data Requests Extension. If not, see <http://www.gnu.org/licenses/>.
 
-import ckan.model as model
-import ckan.plugins.toolkit as tk
 import db
 
+from ckan import model
 from ckan.common import c
+import ckan.plugins.toolkit as tk
 
 
 def get_comments_number(datarequest_id):
diff --git a/ckanext/datarequests/plugin.py b/ckanext/datarequests/plugin.py
index b3b631dd..05232b5e 100644
--- a/ckanext/datarequests/plugin.py
+++ b/ckanext/datarequests/plugin.py
@@ -25,6 +25,7 @@
 import constants
 import helpers
 import os
+import six
 import sys
 
 from functools import partial
@@ -144,7 +145,7 @@ def update_config_schema(self, schema):
             ignore_missing = tk.get_validator('ignore_missing')
             schema.update({
                 # This is a custom configuration option
-                'ckan.datarequests.closing_circumstances': [ignore_missing, unicode],
+                'ckan.datarequests.closing_circumstances': [ignore_missing, six.text_type],
             })
         return schema
 
@@ -156,64 +157,64 @@ def before_map(self, m):
         # Data Requests index
         m.connect('datarequests_index', "/%s" % constants.DATAREQUESTS_MAIN_PATH,
                   controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
-                  action='index', conditions=dict(method=['GET']))
+                  action='index', conditions={'method': ['GET']})
 
         # Create a Data Request
         m.connect('/%s/new' % constants.DATAREQUESTS_MAIN_PATH,
                   controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
-                  action='new', conditions=dict(method=['GET', 'POST']))
+                  action='new', conditions={'method': ['GET', 'POST']})
 
         # Show a Data Request
         m.connect('show_datarequest', '/%s/{id}' % constants.DATAREQUESTS_MAIN_PATH,
                   controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
-                  action='show', conditions=dict(method=['GET']), ckan_icon=get_question_icon())
+                  action='show', conditions={'method': ['GET']}, ckan_icon=get_question_icon())
 
         # Update a Data Request
         m.connect('/%s/edit/{id}' % constants.DATAREQUESTS_MAIN_PATH,
                   controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
-                  action='update', conditions=dict(method=['GET', 'POST']))
+                  action='update', conditions={'method': ['GET', 'POST']})
 
         # Delete a Data Request
         m.connect('/%s/delete/{id}' % constants.DATAREQUESTS_MAIN_PATH,
                   controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
-                  action='delete', conditions=dict(method=['POST']))
+                  action='delete', conditions={'method': ['POST']})
 
         # Close a Data Request
         m.connect('/%s/close/{id}' % constants.DATAREQUESTS_MAIN_PATH,
                   controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
-                  action='close', conditions=dict(method=['GET', 'POST']))
+                  action='close', conditions={'method': ['GET', 'POST']})
 
         # Data Request that belongs to an organization
         m.connect('organization_datarequests', '/organization/%s/{id}' % constants.DATAREQUESTS_MAIN_PATH,
                   controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
-                  action='organization_datarequests', conditions=dict(method=['GET']),
+                  action='organization_datarequests', conditions={'method': ['GET']},
                   ckan_icon=get_question_icon())
 
         # Data Request that belongs to an user
         m.connect('user_datarequests', '/user/%s/{id}' % constants.DATAREQUESTS_MAIN_PATH,
                   controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
-                  action='user_datarequests', conditions=dict(method=['GET']),
+                  action='user_datarequests', conditions={'method': ['GET']},
                   ckan_icon=get_question_icon())
 
         # Follow & Unfollow
         m.connect('/%s/follow/{id}' % constants.DATAREQUESTS_MAIN_PATH,
                   controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
-                  action='follow', conditions=dict(method=['POST']))
+                  action='follow', conditions={'method': ['POST']})
 
         m.connect('/%s/unfollow/{id}' % constants.DATAREQUESTS_MAIN_PATH,
                   controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
-                  action='unfollow', conditions=dict(method=['POST']))
+                  action='unfollow', conditions={'method': ['POST']})
 
         if self.comments_enabled:
             # Comment, update and view comments (of) a Data Request
             m.connect('comment_datarequest', '/%s/comment/{id}' % constants.DATAREQUESTS_MAIN_PATH,
                       controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
-                      action='comment', conditions=dict(method=['GET', 'POST']), ckan_icon='comment')
+                      action='comment', conditions={'method': ['GET', 'POST']}, ckan_icon='comment')
 
             # Delete data request
             m.connect('/%s/comment/{datarequest_id}/delete/{comment_id}' % constants.DATAREQUESTS_MAIN_PATH,
                       controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
-                      action='delete_comment', conditions=dict(method=['GET', 'POST']))
+                      action='delete_comment', conditions={'method': ['GET', 'POST']})
 
         return m
 
diff --git a/ckanext/datarequests/tests/test_actions.py b/ckanext/datarequests/tests/test_actions.py
index 486cb567..a83b63fd 100644
--- a/ckanext/datarequests/tests/test_actions.py
+++ b/ckanext/datarequests/tests/test_actions.py
@@ -17,8 +17,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with CKAN Data Requests Extension. If not, see <http://www.gnu.org/licenses/>.
 
-import ckanext.datarequests.actions as actions
-import ckanext.datarequests.constants as constants
+from ckanext.datarequests import actions, constants
 import datetime
 import test_actions_data as test_data
 import unittest
@@ -95,7 +94,6 @@ def _check_basic_response(self, datarequest, response, user, organization=None,
         else:
             self.assertIsNone(response['close_time'])
 
-
     ######################################################################
     ################################# AUX ################################
     ######################################################################
@@ -149,7 +147,6 @@ def _test_comment_not_found(self, function, action, request_data):
         actions.tk.check_access.assert_called_once_with(action, self.context, request_data)
         actions.db.Comment.get.assert_called_once_with(id=request_data['id'])
 
-
     ######################################################################
     ######################### GET INVOLVED USERS #########################
     ######################################################################
@@ -175,7 +172,7 @@ def test_get_involved_users_no_org_and_current_user_must_be_discarded(self, list
 
         result = actions._get_datarequest_involved_users(self.context, datarequest)
 
-        self.assertEquals(set(['user-2', 'user-3']), result)
+        self.assertEquals({'user-2', 'user-3'}, result)
 
         actions.db.DataRequestFollower.get.assert_called_once_with(datarequest_id=datarequest_id)
         list_comments_mock.assert_called_once_with({'ignore_auth': True, 'model': self.context['model']}, {'datarequest_id': datarequest_id})
@@ -201,7 +198,7 @@ def test_get_involved_users_no_org_and_current_user_must_not_be_discarded(self,
 
         result = actions._get_datarequest_involved_users(self.context, datarequest)
 
-        self.assertEquals(set(['user-1', 'user-2', 'user-3']), result)
+        self.assertEquals({'user-1', 'user-2', 'user-3'}, result)
 
         actions.db.DataRequestFollower.get.assert_called_once_with(datarequest_id=datarequest_id)
         list_comments_mock.assert_called_once_with({'ignore_auth': True, 'model': self.context['model']}, {'datarequest_id': datarequest_id})
@@ -227,12 +224,11 @@ def test_get_involved_users_org(self, list_comments_mock):
 
         result = actions._get_datarequest_involved_users(self.context, datarequest)
 
-        self.assertEquals(set(['user-1', 'user-2', 'user-3', 'user-4']), result)
+        self.assertEquals({'user-1', 'user-2', 'user-3', 'user-4'}, result)
 
         actions.db.DataRequestFollower.get.assert_called_once_with(datarequest_id=datarequest_id)
         list_comments_mock.assert_called_once_with({'ignore_auth': True, 'model': self.context['model']}, {'datarequest_id': datarequest_id})
 
-
     ######################################################################
     ############################# SEND MAIL ##############################
     ######################################################################
@@ -258,7 +254,7 @@ def test_send_mail_two_users(self, model_mock, base_mock, mailer_mock, config_mo
 
         actions._send_mail(users, action_type, datarequest)
 
-        for i, user in enumerate(users):
+        for i, _ in enumerate(users):
             extra_args = {
                 'datarequest': datarequest,
                 'user': get_users_side_effect[i],
@@ -270,7 +266,6 @@ def test_send_mail_two_users(self, model_mock, base_mock, mailer_mock, config_mo
 
             mailer_mock.mail_user.assert_any_call(get_users_side_effect[i], subject, body)
 
-
     @patch('ckanext.datarequests.actions.config')
     @patch('ckanext.datarequests.actions.mailer')
     @patch('ckanext.datarequests.actions.base')
@@ -302,7 +297,6 @@ def test_send_mail_exception_no_risen(self, model_mock, base_mock, mailer_mock,
 
         mailer_mock.mail_user.assert_any_call(user, subject, body)
 
-
     ######################################################################
     ################################# NEW ################################
     ######################################################################
@@ -364,7 +358,7 @@ def test_create_datarequest_valid(self, send_mail_mock):
 
         self.context['session'].add.assert_called_once_with(datarequest)
         self.context['session'].commit.assert_called_once()
-        send_mail_mock.assert_called_once_with(set(['user_1', 'user_2']), 'new_datarequest', result)
+        send_mail_mock.assert_called_once_with({'user_1', 'user_2'}, 'new_datarequest', result)
 
         # Check the object stored in the database
         self.assertEquals(self.context['auth_user_obj'].id, datarequest.user_id)
@@ -376,7 +370,6 @@ def test_create_datarequest_valid(self, send_mail_mock):
         # Check the returned object
         self._check_basic_response(datarequest, result, default_user, default_org, default_pkg)
 
-
     ######################################################################
     ################################ SHOW ################################
     ######################################################################
@@ -439,7 +432,6 @@ def test_show_datarequest_found_closed(self, organization_id, accepted_dataset_i
 
         self._test_show_datarequest_found(datarequest, org_checked, pkg_checked)
 
-
     ######################################################################
     ############################### UPDATE ###############################
     ######################################################################
@@ -511,7 +503,6 @@ def test_update_datarequest(self, title_checked, organization_id=None, accepted_
         pkg = default_pkg if accepted_dataset_id else None
         self._check_basic_response(datarequest, result, default_user, org, pkg)
 
-
     ######################################################################
     ################################ LIST ################################
     ######################################################################
@@ -539,13 +530,11 @@ def test_list_datarequests_not_authorized(self):
         (test_data.list_datarequests_test_case_17,)
     ])
     def test_list_datarequests(self, test_case):
-
         content = test_case['content']
         expected_ddbb_params = test_case['expected_ddbb_params']
         ddbb_response = test_case['ddbb_response']
         expected_response = test_case['expected_response']
         _organization_show = test_case['organization_show_func']
-        _user_show = test_case.get('user_show_func', None)
 
         # Set the mocks
         actions.db.DataRequest.get_ordered_by_date.return_value = ddbb_response
@@ -576,7 +565,7 @@ def test_list_datarequests(self, test_case):
             organization_show.assert_any_call({'ignore_auth': True}, {'id': content['organization_id']})
             expected_organization_show_calls += 1
 
-        # The reamining ones to include the display name into the facets
+        # The remaining ones to include the display name into the facets
         if 'organization' in expected_response['facets']:
             expected_organization_show_calls += len(expected_response['facets']['organization']['items'])
             for organization_facet in expected_response['facets']['organization']['items']:
@@ -620,7 +609,6 @@ def test_list_datarequests(self, test_case):
             for item in items:
                 self.assertIn(item, response['facets'][facet]['items'])
 
-
     ######################################################################
     ############################### DELETE ###############################
     ######################################################################
@@ -666,7 +654,6 @@ def test_delete_datarequest(self, organization_id, accepted_dataset_id):
         pkg = default_pkg if accepted_dataset_id else None
         self._check_basic_response(datarequest, result, default_user, org, pkg)
 
-
     ######################################################################
     ################################ CLOSE ###############################
     ######################################################################
@@ -704,7 +691,7 @@ def test_close_datarequest(self, data, expected_accepted_ds, organization_id):
         send_mail_patch = patch('ckanext.datarequests.actions._send_mail')
         send_mail_mock = send_mail_patch.start()
         self.addCleanup(send_mail_patch.stop)
-        
+
         get_datarequest_involved_users_patch = patch('ckanext.datarequests.actions._get_datarequest_involved_users')
         get_datarequest_involved_users_mock = get_datarequest_involved_users_patch.start()
         self.addCleanup(get_datarequest_involved_users_patch.stop)
@@ -740,7 +727,6 @@ def test_close_datarequest(self, data, expected_accepted_ds, organization_id):
         send_mail_mock.assert_called_once_with(get_datarequest_involved_users_mock.return_value, 'close_datarequest', result)
         get_datarequest_involved_users_mock.assert_called_once_with(self.context, result)
 
-
     ######################################################################
     ############################### COMMENT ##############################
     ######################################################################
@@ -751,7 +737,7 @@ def test_comment_not_authorized(self):
     def test_comment_no_id(self):
         self._test_no_id(actions.comment_datarequest)
 
-    def test_comment_invalid(self, function=actions.comment_datarequest, check_access=constants.COMMENT_DATAREQUEST, 
+    def test_comment_invalid(self, function=actions.comment_datarequest, check_access=constants.COMMENT_DATAREQUEST,
                              request_data=test_data.comment_request_data):
         '''
         This function is also used to check invalid content when a comment is updated
@@ -810,7 +796,6 @@ def test_comment(self, get_datarequest_involved_users_mock, send_mail_mock):
         send_mail_mock.assert_called_once_with(get_datarequest_involved_users_mock.return_value, 'new_comment', datarequest_dict)
         get_datarequest_involved_users_mock.assert_called_once_with(self.context, datarequest_dict)
 
-
     ######################################################################
     ############################ SHOW COMMENT ############################
     ######################################################################
@@ -839,7 +824,6 @@ def test_comment_show(self):
         # Check that the response is OK
         self._check_comment(comment, result, default_user)
 
-
     ######################################################################
     ############################ LIST COMMENTS ###########################
     ######################################################################
@@ -858,9 +842,7 @@ def test_comment_list_no_id(self):
     ])
     def test_comment_list(self, sort=None, desc=False):
         # Configure mock
-        comments = []
-        for i in range(0, 5):
-            comments.append(test_data._generate_basic_comment())
+        comments = [test_data._generate_basic_comment() for _ in range(0, 5)]
 
         actions.db.Comment.get_ordered_by_date.return_value = comments
 
@@ -885,7 +867,6 @@ def test_comment_list(self, sort=None, desc=False):
         for i in range(0, len(results)):
             self._check_comment(comments[i], results[i], default_user)
 
-
     ######################################################################
     ########################### UPDATE COMMENT ###########################
     ######################################################################
@@ -939,7 +920,6 @@ def test_comment_update(self):
         # Check the result
         self._check_comment(comment, result, default_user)
 
-
     ######################################################################
     ########################### DELETE COMMENT ###########################
     ######################################################################
@@ -1031,8 +1011,8 @@ def test_follow(self):
     def test_unfollow_not_authorized(self):
         self._test_not_authorized(actions.unfollow_datarequest, constants.UNFOLLOW_DATAREQUEST, test_data.follow_data_request_data)
 
-    def test_follow_no_id(self):
-        self._test_no_id(actions.follow_datarequest)
+    def test_unfollow_no_id(self):
+        self._test_no_id(actions.unfollow_datarequest)
 
     def test_unfollow_not_following(self):
         # Configure the mock
@@ -1061,4 +1041,3 @@ def test_unfollow(self):
         self.context['session'].commit.assert_called_once()
 
         self.assertTrue(result)
-
diff --git a/ckanext/datarequests/tests/test_actions_data.py b/ckanext/datarequests/tests/test_actions_data.py
index 6012a63b..490a6dd9 100644
--- a/ckanext/datarequests/tests/test_actions_data.py
+++ b/ckanext/datarequests/tests/test_actions_data.py
@@ -31,6 +31,7 @@
 ############################## FUNCTIONS #############################
 ######################################################################
 
+
 def dictice_ddbb_response(datarequest):
     return {
         'id': datarequest.id,
@@ -62,23 +63,20 @@ def _generate_basic_ddbb_response(number, organizations=None, closed=None):
     an exception will be risen
     '''
     if not organizations:
-        organizations = list()
-        for _ in range(number):
-            organizations.append(None)
+        organizations = [None for _ in range(number)]
 
     if not closed:
-        closed = list()
-        for _ in range(number):
-            closed.append(False)
+        closed = [False for _ in range(number)]
 
     # Check that length of the arrays is correct
     assert number == len(organizations)
     assert number == len(closed)
 
-    response = list()
-    for n in range(number):
-        response.append(_generate_basic_datarequest(organization_id=organizations[n], 
-                                                    closed=closed[n]))
+    response = [
+        _generate_basic_datarequest(
+            organization_id=organizations[n],
+            closed=closed[n]) for n in range(number)
+    ]
 
     return response
 
diff --git a/ckanext/datarequests/tests/test_auth.py b/ckanext/datarequests/tests/test_auth.py
index d3341039..af10631d 100644
--- a/ckanext/datarequests/tests/test_auth.py
+++ b/ckanext/datarequests/tests/test_auth.py
@@ -18,8 +18,7 @@
 # along with CKAN Data Requests Extension. If not, see <http://www.gnu.org/licenses/>.
 
 
-import ckanext.datarequests.constants as constants
-import ckanext.datarequests.auth as auth
+from ckanext.datarequests import auth, constants
 import unittest
 
 from mock import MagicMock
@@ -46,9 +45,10 @@
 }
 
 request_follow = {
-       'datarequest_id': 'example_uuid_v4', 
+    'datarequest_id': 'example_uuid_v4',
 }
 
+
 class AuthTest(unittest.TestCase):
 
     def setUp(self):
diff --git a/ckanext/datarequests/tests/test_db.py b/ckanext/datarequests/tests/test_db.py
index 18b53e42..fe7b04d2 100644
--- a/ckanext/datarequests/tests/test_db.py
+++ b/ckanext/datarequests/tests/test_db.py
@@ -18,7 +18,7 @@
 # along with CKAN Data Requests Extension. If not, see <http://www.gnu.org/licenses/>.
 
 import unittest
-import ckanext.datarequests.db as db
+from ckanext.datarequests import db
 
 from mock import MagicMock
 from nose_parameterized import parameterized
@@ -115,8 +115,8 @@ def _test_get_ordered_by_date(self, table, time_column, params):
         title_column_value = MagicMock()
         description_column_value = MagicMock()
         setattr(table, time_column, time_column_value)
-        setattr(table, 'title', title_column_value)
-        setattr(table, 'description', description_column_value)
+        table.title = title_column_value
+        table.description = description_column_value
 
         # Call the method
         result = table.get_ordered_by_date(**params)
@@ -355,4 +355,3 @@ def test_get_datarequest_followers_number(self):
         query.filter_by.assert_called_once_with(**params)
         model.Session.query.assert_called_once_with(count)
         db.func.count.assert_called_once_with(db.DataRequestFollower.id)
-
diff --git a/ckanext/datarequests/tests/test_helpers.py b/ckanext/datarequests/tests/test_helpers.py
index 147facba..e0e54651 100644
--- a/ckanext/datarequests/tests/test_helpers.py
+++ b/ckanext/datarequests/tests/test_helpers.py
@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with CKAN Data Requests Extension. If not, see <http://www.gnu.org/licenses/>.
 
-import ckanext.datarequests.helpers as helpers
+from ckanext.datarequests import helpers
 import unittest
 
 from mock import MagicMock, patch
diff --git a/ckanext/datarequests/tests/test_plugin.py b/ckanext/datarequests/tests/test_plugin.py
index 3e498d13..dd9b4373 100644
--- a/ckanext/datarequests/tests/test_plugin.py
+++ b/ckanext/datarequests/tests/test_plugin.py
@@ -17,8 +17,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with CKAN Data Requests Extension. If not, see <http://www.gnu.org/licenses/>.
 
-import ckanext.datarequests.plugin as plugin
-import ckanext.datarequests.constants as constants
+from ckanext.datarequests import plugin, constants
 import unittest
 
 from mock import MagicMock, patch
@@ -214,68 +213,81 @@ def test_before_map(self, comments_enabled):
         self.plg_instance.before_map(mapa)
 
         self.assertEquals(mapa_calls, mapa.connect.call_count)
-        mapa.connect.assert_any_call('datarequests_index', "/%s" % dr_basic_path,
+        mapa.connect.assert_any_call(
+            'datarequests_index', "/%s" % dr_basic_path,
             controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
-            action='index', conditions=dict(method=['GET']))
+            action='index', conditions={'method': ['GET']})
 
-        mapa.connect.assert_any_call('/%s/new' % dr_basic_path,
+        mapa.connect.assert_any_call(
+            '/%s/new' % dr_basic_path,
             controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
-            action='new', conditions=dict(method=['GET', 'POST']))
+            action='new', conditions={'method': ['GET', 'POST']})
 
-        mapa.connect.assert_any_call('show_datarequest', '/%s/{id}' % dr_basic_path,
+        mapa.connect.assert_any_call(
+            'show_datarequest', '/%s/{id}' % dr_basic_path,
             controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
-            action='show', conditions=dict(method=['GET']), ckan_icon=mock_icon)
+            action='show', conditions={'method': ['GET']}, ckan_icon=mock_icon)
 
-        mapa.connect.assert_any_call('/%s/edit/{id}' % dr_basic_path,
+        mapa.connect.assert_any_call(
+            '/%s/edit/{id}' % dr_basic_path,
             controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
-            action='update', conditions=dict(method=['GET', 'POST']))
+            action='update', conditions={'method': ['GET', 'POST']})
 
-        mapa.connect.assert_any_call('/%s/delete/{id}' % dr_basic_path,
+        mapa.connect.assert_any_call(
+            '/%s/delete/{id}' % dr_basic_path,
             controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
-            action='delete', conditions=dict(method=['POST']))
+            action='delete', conditions={'method': ['POST']})
 
-        mapa.connect.assert_any_call('/%s/close/{id}' % dr_basic_path,
+        mapa.connect.assert_any_call(
+            '/%s/close/{id}' % dr_basic_path,
             controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
-            action='close', conditions=dict(method=['GET', 'POST']))
+            action='close', conditions={'method': ['GET', 'POST']})
 
-        mapa.connect.assert_any_call('organization_datarequests', 
+        mapa.connect.assert_any_call(
+            'organization_datarequests',
             '/organization/%s/{id}' % dr_basic_path,
             controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
-            action='organization_datarequests', conditions=dict(method=['GET']), 
+            action='organization_datarequests', conditions={'method': ['GET']},
             ckan_icon=mock_icon)
 
-        mapa.connect.assert_any_call('user_datarequests',
+        mapa.connect.assert_any_call(
+            'user_datarequests',
             '/user/%s/{id}' % dr_basic_path,
             controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
-            action='user_datarequests', conditions=dict(method=['GET']), 
+            action='user_datarequests', conditions={'method': ['GET']},
             ckan_icon=mock_icon)
 
-        mapa.connect.assert_any_call('user_datarequests',
+        mapa.connect.assert_any_call(
+            'user_datarequests',
             '/user/%s/{id}' % dr_basic_path,
             controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
-            action='user_datarequests', conditions=dict(method=['GET']), 
+            action='user_datarequests', conditions={'method': ['GET']},
             ckan_icon=mock_icon)
 
-        mapa.connect('/%s/follow/{id}' % dr_basic_path,
+        mapa.connect.assert_any_call(
+            '/%s/follow/{id}' % dr_basic_path,
             controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
-            action='follow', conditions=dict(method=['POST']))
+            action='follow', conditions={'method': ['POST']})
 
-        mapa.connect('/%s/unfollow/{id}' % dr_basic_path,
+        mapa.connect.assert_any_call(
+            '/%s/unfollow/{id}' % dr_basic_path,
             controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
-            action='unfollow', conditions=dict(method=['POST']))
+            action='unfollow', conditions={'method': ['POST']})
 
         if comments_enabled == 'True':
-            mapa.connect.assert_any_call('comment_datarequest', '/%s/comment/{id}' % dr_basic_path,
+            mapa.connect.assert_any_call(
+                'comment_datarequest', '/%s/comment/{id}' % dr_basic_path,
                 controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
-                action='comment', conditions=dict(method=['GET', 'POST']), ckan_icon='comment')
+                action='comment', conditions={'method': ['GET', 'POST']}, ckan_icon='comment')
 
-            mapa.connect.assert_any_call('/%s/comment/{datarequest_id}/delete/{comment_id}' % dr_basic_path,
+            mapa.connect.assert_any_call(
+                '/%s/comment/{datarequest_id}/delete/{comment_id}' % dr_basic_path,
                 controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
-                action='delete_comment', conditions=dict(method=['GET', 'POST']))
+                action='delete_comment', conditions={'method': ['GET', 'POST']})
 
     @parameterized.expand([
-        ('True',  'True'),
-        ('True',  'False'),
+        ('True', 'True'),
+        ('True', 'False'),
         ('False', 'True'),
         ('False', 'False')
     ])
diff --git a/ckanext/datarequests/tests/test_ui_controller.py b/ckanext/datarequests/tests/test_ui_controller.py
index a87d00ee..cdcc5688 100644
--- a/ckanext/datarequests/tests/test_ui_controller.py
+++ b/ckanext/datarequests/tests/test_ui_controller.py
@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with CKAN Data Requests Extension. If not, see <http://www.gnu.org/licenses/>.
 
-import ckanext.datarequests.constants as constants
+from ckanext.datarequests import constants
 import ckanext.datarequests.controllers.ui_controller as controller
 import unittest
 
@@ -83,7 +83,6 @@ def tearDown(self):
         controller.base = self._base
         controller.constants.DATAREQUESTS_PER_PAGE = self._datarequests_per_page
 
-
     ######################################################################
     ################################# AUX ################################
     ######################################################################
@@ -122,7 +121,6 @@ def _get_action(action):
         self.assertEquals(0, controller.tk.render.call_count)
         self.assertIsNone(result)
 
-
     ######################################################################
     ################################# NEW ################################
     ######################################################################
@@ -160,8 +158,8 @@ def test_new_no_post(self, authorized):
 
     @parameterized.expand([
         (False, False),
-        (True,  False),
-        (True,  True)
+        (True, False),
+        (True, True)
     ])
     def test_new_post_content(self, authorized, validation_error):
         datarequest_id = 'this-represents-an-uuidv4()'
@@ -187,7 +185,7 @@ def test_new_post_content(self, authorized, validation_error):
         result = self.controller_instance.new()
 
         # Authorize function has been called
-        controller.tk.check_access.assert_called_once_with(constants.CREATE_DATAREQUEST, 
+        controller.tk.check_access.assert_called_once_with(constants.CREATE_DATAREQUEST,
                                                            self.expected_context, None)
 
         if authorized:
@@ -219,7 +217,6 @@ def test_new_post_content(self, authorized, validation_error):
             controller.tk.abort.assert_called_once_with(403, 'Unauthorized to create a Data Request')
             self.assertEquals(0, controller.tk.render.call_count)
 
-
     ######################################################################
     ################################ SHOW ################################
     ######################################################################
@@ -232,17 +229,17 @@ def test_show_not_found(self):
 
     @parameterized.expand({
         (False, False, None),
-        (False, True,  None),
-        (True,  False, None),
-        (True,  True,  None),
+        (False, True, None),
+        (True, False, None),
+        (True, True, None),
         (False, False, 'uudiv4', False),
-        (False, True,  'uudiv4', False),
-        (True,  False, 'uudiv4', False),
-        (True,  True,  'uudiv4', False),
+        (False, True, 'uudiv4', False),
+        (True, False, 'uudiv4', False),
+        (True, True, 'uudiv4', False),
         (False, False, 'uudiv4', True),
-        (False, True,  'uudiv4', True),
-        (True,  False, 'uudiv4', True),
-        (True,  True,  'uudiv4', True)
+        (False, True, 'uudiv4', True),
+        (True, False, 'uudiv4', True),
+        (True, True, 'uudiv4', True)
     })
     def test_show_found(self, user_show_exception, organization_show_exception, accepted_dataset, package_show_exception=False):
 
@@ -314,7 +311,6 @@ def _get_action(action):
         controller.tk.render.assert_called_once_with('datarequests/show.html')
         self.assertEquals(controller.tk.render.return_value, result)
 
-
     ######################################################################
     ############################### UPDATE ###############################
     ######################################################################
@@ -354,8 +350,8 @@ def test_update_no_post_content(self):
 
     @parameterized.expand([
         (False, False),
-        (True,  False),
-        (True,  True)
+        (True, False),
+        (True, True)
     ])
     def test_update_post_content(self, authorized, validation_error):
         datarequest_id = 'this-represents-an-uuidv4()'
@@ -432,7 +428,6 @@ def _get_action(action):
             controller.tk.abort.assert_called_once_with(403, 'You are not authorized to update the Data Request %s' % datarequest_id)
             self.assertEquals(0, controller.tk.render.call_count)
 
-
     ######################################################################
     ################################ INDEX ###############################
     ######################################################################
@@ -607,7 +602,7 @@ def _get_action(action):
         silly_page = 72
         query_param = 'q={0}&'.format(query) if query else ''
         self.assertEquals("%s?%ssort=%s&page=%d" % (base_url, query_param, expected_sort, silly_page),
-                          page_arguments['url'](q=query,page=silly_page))
+                          page_arguments['url'](q=query, page=silly_page))
 
         # When URL function is called, helpers.url_for is called to get the final URL
         if func == INDEX_FUNCTION:
@@ -636,7 +631,6 @@ def _get_action(action):
         self.assertEquals(controller.tk.render.return_value, result)
         controller.tk.render.assert_called_once_with(expected_render_page, extra_vars={'user_dict': expected_user, 'group_type': 'organization'})
 
-
     ######################################################################
     ############################### DELETE ###############################
     ######################################################################
@@ -678,7 +672,6 @@ def test_delete(self):
             action='index')
         controller.tk.redirect_to.assert_called_once_with(controller.helpers.url_for.return_value)
 
-
     ######################################################################
     ################################ CLOSE ###############################
     ######################################################################
@@ -693,10 +686,14 @@ def test_close_not_found(self):
         (None,),
         ('organization_uuidv4',)
     ])
-    def test_close(self, organization, post_content={}, errors={}, errors_summary={}, close_datarequest=MagicMock()):
+    def test_close(self, organization, post_content=None, errors=None, errors_summary=None, close_datarequest=None):
         controller.tk.response.location = None
         controller.tk.response.status_int = 200
-        controller.request.POST = post_content
+        controller.request.POST = post_content or {}
+        errors = errors or {}
+        errors_summary = errors_summary or {}
+        if not close_datarequest:
+            close_datarequest = MagicMock()
 
         datarequest_id = 'example_uuidv4'
         datarequest = {'id': 'uuid4', 'user_id': 'user_uuid4', 'title': 'example_title'}
@@ -785,7 +782,6 @@ def test_close_post_errors(self, organization):
         self.test_close(organization, post_content, exception.error_dict,
                         {'Accepted Dataset': 'error1, error2'}, close_datarequest)
 
-
     ######################################################################
     ############################### COMMENT ##############################
     ######################################################################
@@ -895,8 +891,11 @@ def _get_action(action):
             controller.tk.get_action.assert_any_call(constants.UPDATE_DATAREQUEST_COMMENT)
 
         if new_comment or update_comment:
-            default_action.assert_called_once_with(self.expected_context, {'datarequest_id': datarequest_id,
-                    'comment': comment, 'id': comment_id if update_comment else ''})
+            default_action.assert_called_once_with(
+                self.expected_context, {
+                    'datarequest_id': datarequest_id,
+                    'comment': comment, 'id': comment_id if update_comment else ''
+                })
 
         if comment_or_update_exception == controller.tk.NotAuthorized:
             action = 'comment' if new_comment else 'update comment'
@@ -912,9 +911,9 @@ def _get_action(action):
             # Check controller.c values
             self.assertEquals(comment_or_update_exception.error_dict, controller.c.errors)
 
-            errors_summary = {}
-            for key, error in comment_or_update_exception.error_dict.items():
-                    errors_summary[key] = ', '.join(error)
+            errors_summary = {
+                key: ', '.join(error)
+                for key, error in comment_or_update_exception.error_dict.items()}
 
             self.assertEquals(errors_summary, controller.c.errors_summary)
 
@@ -931,7 +930,6 @@ def _get_action(action):
             if update_comment:
                 self.assertEquals(comment_id, controller.c.updated_comment['id'])
 
-
     ######################################################################
     ########################### DELETE COMMENT ###########################
     ######################################################################
@@ -944,7 +942,7 @@ def test_delete_comment_not_authorized(self):
         result = self.controller_instance.delete_comment('datarequest_id', comment_id)
 
         # Assertions
-        controller.tk.check_access.assert_called_once_with(constants.DELETE_DATAREQUEST_COMMENT, 
+        controller.tk.check_access.assert_called_once_with(constants.DELETE_DATAREQUEST_COMMENT,
                                                            self.expected_context, {'id': comment_id})
         controller.tk.abort.assert_called_once_with(403, 'You are not authorized to delete this comment')
         self.assertEquals(0, controller.tk.render.call_count)
diff --git a/ckanext/datarequests/tests/test_validator.py b/ckanext/datarequests/tests/test_validator.py
index dbd17e83..2c459f07 100644
--- a/ckanext/datarequests/tests/test_validator.py
+++ b/ckanext/datarequests/tests/test_validator.py
@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with CKAN Data Requests Extension. If not, see <http://www.gnu.org/licenses/>.
 
-import ckanext.datarequests.validator as validator
+from ckanext.datarequests import validator
 import unittest
 import random
 
@@ -141,7 +141,7 @@ def test_close_valid(self):
         package_validator.assert_called_once_with(accepted_ds_id, context)
 
     @parameterized.expand([
-        ({},              'Comment', 'Comments must be a minimum of 1 character long'),
+        ({}, 'Comment', 'Comments must be a minimum of 1 character long'),
         ({'comment': ''}, 'Comment', 'Comments must be a minimum of 1 character long'),
         ({'comment': generate_string(validator.constants.COMMENT_MAX_LENGTH + 1)}, 'Comment',
             'Comments must be a maximum of %d characters long' % validator.constants.COMMENT_MAX_LENGTH)
diff --git a/ckanext/datarequests/validator.py b/ckanext/datarequests/validator.py
index 0510c214..b523df04 100644
--- a/ckanext/datarequests/validator.py
+++ b/ckanext/datarequests/validator.py
@@ -19,7 +19,7 @@
 
 import constants
 import ckan.plugins.toolkit as tk
-import ckanext.datarequests.db as db
+from ckanext.datarequests import db
 import plugin as datarequests
 import datetime
 
diff --git a/setup.py b/setup.py
index dd7a1391..b86b98f8 100644
--- a/setup.py
+++ b/setup.py
@@ -18,7 +18,6 @@
 # along with CKAN Data Requests Extension. If not, see <http://www.gnu.org/licenses/>.
 
 from setuptools import setup, find_packages
-import sys, os
 
 version = '1.1.0'
 
@@ -27,10 +26,10 @@
     version=version,
     description="CKAN Extension - Data Requests",
     long_description='''
-    CKAN extension that allows users to ask for datasets that are not already published in the CKAN instance. 
+    CKAN extension that allows users to ask for datasets that are not already published in the CKAN instance.
     In this way we can set up a Data Market, not only with data supplies but also with data demands.
     ''',
-    classifiers=[], # Get strings from http://pypi.python.org/pypi?%3Aaction=list_classifiers
+    classifiers=[],  # Get strings from http://pypi.python.org/pypi?%3Aaction=list_classifiers
     keywords='',
     author='CoNWeT Lab.',
     author_email='amagan@conwet.com',
@@ -66,4 +65,4 @@
             ('**/templates/**.html', 'ckan', None),
         ],
     }
-)
\ No newline at end of file
+)
diff --git a/test/features/environment.py b/test/features/environment.py
index 4f824347..7ffa0e80 100644
--- a/test/features/environment.py
+++ b/test/features/environment.py
@@ -14,52 +14,52 @@
 
 # @see .docker/scripts/init.sh for credentials.
 PERSONAS = {
-    'SysAdmin': dict(
-        name=u'admin',
-        email=u'admin@localhost',
-        password=u'password'
-    ),
-    'Unathenticated': dict(
-        name=u'',
-        email=u'',
-        password=u''
-    ),
+    'SysAdmin': {
+        'name': u'admin',
+        'email': u'admin@localhost',
+        'password': u'password'
+    },
+    'Unathenticated': {
+        'name': u'',
+        'email': u'',
+        'password': u''
+    },
     # This user will not be assigned to any organisations
-    'CKANUser': dict(
-        name=u'ckan_user',
-        email=u'ckan_user@localhost',
-        password=u'password'
-    ),
-    'TestOrgAdmin': dict(
-        name=u'test_org_admin',
-        email=u'test_org_admin@localhost',
-        password=u'password'
-    ),
-    'TestOrgEditor': dict(
-        name=u'test_org_editor',
-        email=u'test_org_editor@localhost',
-        password=u'password'
-    ),
-    'TestOrgMember': dict(
-        name=u'test_org_member',
-        email=u'test_org_member@localhost',
-        password=u'password'
-    ),
-    'DataRequestOrgAdmin': dict(
-        name=u'dr_admin',
-        email=u'dr_admin@localhost',
-        password=u'password'
-    ),
-    'DataRequestOrgEditor': dict(
-        name=u'dr_editor',
-        email=u'dr_editor@localhost',
-        password=u'password'
-    ),
-    'DataRequestOrgMember': dict(
-        name=u'dr_member',
-        email=u'dr_member@localhost',
-        password=u'password'
-    )
+    'CKANUser': {
+        'name': u'ckan_user',
+        'email': u'ckan_user@localhost',
+        'password': u'password'
+    },
+    'TestOrgAdmin': {
+        'name': u'test_org_admin',
+        'email': u'test_org_admin@localhost',
+        'password': u'password'
+    },
+    'TestOrgEditor': {
+        'name': u'test_org_editor',
+        'email': u'test_org_editor@localhost',
+        'password': u'password'
+    },
+    'TestOrgMember': {
+        'name': u'test_org_member',
+        'email': u'test_org_member@localhost',
+        'password': u'password'
+    },
+    'DataRequestOrgAdmin': {
+        'name': u'dr_admin',
+        'email': u'dr_admin@localhost',
+        'password': u'password'
+    },
+    'DataRequestOrgEditor': {
+        'name': u'dr_editor',
+        'email': u'dr_editor@localhost',
+        'password': u'password'
+    },
+    'DataRequestOrgMember': {
+        'name': u'dr_member',
+        'email': u'dr_member@localhost',
+        'password': u'password'
+    }
 }
 
 
diff --git a/test/features/steps/steps.py b/test/features/steps/steps.py
index 29f55c23..db53b1e4 100644
--- a/test/features/steps/steps.py
+++ b/test/features/steps/steps.py
@@ -7,13 +7,14 @@
 import email
 import quopri
 
+
 @step('I go to homepage')
 def go_to_home(context):
     when_i_visit_url(context, '/')
 
+
 @step('I log in')
 def log_in(context):
-
     assert context.persona
     context.execute_steps(u"""
         When I go to homepage
@@ -22,9 +23,9 @@ def log_in(context):
         Then I should see an element with xpath "//a[contains(string(), 'Log out')]"
     """)
 
-@step('I enter my credentials and login')
-def log_in(context):
 
+@step('I enter my credentials and login')
+def submit_login(context):
     assert context.persona
     context.execute_steps(u"""
         When I fill in "login" with "$name"
@@ -32,29 +33,29 @@ def log_in(context):
         And I press the element with xpath "//button[contains(string(), 'Login')]"
     """)
 
+
 @step('I log in and go to datarequest page')
 def log_in_go_to_datarequest(context):
-
     assert context.persona
     context.execute_steps(u"""
-        When I go to homepage
-        And I click the link with text that contains "Log in"
-        And I log in
+        When I log in
         And I go to datarequest page
     """)
 
+
 @step('I go to datarequest page')
 def go_to_datarequest(context):
     when_i_visit_url(context, '/datarequest')
 
+
 @step('I fill in title with random text')
 def title_random_text(context):
-
     assert context.persona
     context.execute_steps(u"""
         When I fill in "title" with "Test Title {0}"
     """.format(random.randrange(100000)))
 
+
 # The default behaving step does not convert base64 emails
 # Modifed the default step to decode the payload from base64
 @step(u'I should receive a base64 email at "{address}" containing "{text}"')
@@ -62,31 +63,30 @@ def should_receive_base64_email_containing_text(context, address, text):
     def filter_contents(mail):
         mail = email.message_from_string(mail)
         payload = mail.get_payload()
-        payload += "=" * ((4 - len(payload) % 4) % 4) # do fix the padding error issue
+        payload += "=" * ((4 - len(payload) % 4) % 4)  # do fix the padding error issue
         decoded_payload = quopri.decodestring(payload).decode('base64')
-        print ('decoded_payload: ', decoded_payload)
+        print('decoded_payload: ', decoded_payload)
         return text in decoded_payload
 
     assert context.mail.user_messages(address, filter_contents)
 
+
 @step('I log in and go to admin config page')
 def log_in_go_to_admin_config(context):
-
     assert context.persona
     context.execute_steps(u"""
-        When I go to homepage
-        And I click the link with text that contains "Log in"
-        And I log in
+        When I log in
         And I go to admin config page
     """)
 
+
 @step('I go to admin config page')
 def go_to_admin_config(context):
     when_i_visit_url(context, '/ckan-admin/config')
 
+
 @step('I log in and create a datarequest')
 def log_in_create_a_datarequest(context):
-
     assert context.persona
     context.execute_steps(u"""
         When I log in and go to datarequest page

From 6c289e28bb6d220eb10d4a554da3cd7a1dabb77c Mon Sep 17 00:00:00 2001
From: antuarc <carl.antuar@smartservice.qld.gov.au>
Date: Fri, 30 Apr 2021 15:54:34 +1000
Subject: [PATCH 079/276] [QOL-7970] oops fix six module name

---
 ckanext/datarequests/controllers/ui_controller.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ckanext/datarequests/controllers/ui_controller.py b/ckanext/datarequests/controllers/ui_controller.py
index 03e60427..28b88ef2 100644
--- a/ckanext/datarequests/controllers/ui_controller.py
+++ b/ckanext/datarequests/controllers/ui_controller.py
@@ -23,7 +23,7 @@
 import re
 import six
 
-from six.moves.urllib import urlencode
+from six.moves.urllib.parse import urlencode
 
 from ckan import model, plugins
 from ckan.common import request

From 92f2f81d88430bae06c67d4c8b700cd175bd25aa Mon Sep 17 00:00:00 2001
From: antuarc <carl.antuar@smartservice.qld.gov.au>
Date: Fri, 30 Apr 2021 16:23:56 +1000
Subject: [PATCH 080/276] [QOL-7970] update tests to replace 'paster' with
 'ckan' as needed

---
 .ahoy.yml                           |  7 +--
 .docker/scripts/ckan_cli            | 68 +++++++++++++++++++++++++++++
 .docker/scripts/create-test-data.sh | 29 ++++++------
 .docker/scripts/init-ext.sh         |  3 +-
 .docker/scripts/init.sh             | 20 ++++-----
 5 files changed, 98 insertions(+), 29 deletions(-)
 create mode 100644 .docker/scripts/ckan_cli

diff --git a/.ahoy.yml b/.ahoy.yml
index 55010b89..027a2a56 100644
--- a/.ahoy.yml
+++ b/.ahoy.yml
@@ -127,7 +127,7 @@ commands:
       ahoy cli "behave ${*:-/app/test/features}" || \
       [ "${ALLOW_BDD_FAIL:-0}" -eq 1 ]
       ahoy stop-mailmock
-      ahoy stop-ckan-job-worker     
+      ahoy stop-ckan-job-worker
 
 
   start-mailmock:
@@ -147,8 +147,9 @@ commands:
     cmd: |
       ahoy title 'Starting CKAN background job worker'
       ahoy cli "cd /usr/lib/ckan/default/src/ckan && \
-                paster jobs clear --config=/app/ckan/default/production.ini && \
-                paster jobs worker default --config=/app/ckan/default/production.ini"
+                export CKAN_CLI=/app/ckan/default/production.ini &&
+                /app/scripts/ckan_cli jobs clear && \
+                /app/scripts/ckan_cli jobs worker default"
 
   stop-ckan-job-worker:
     usage: Stops CKAN background job worker
diff --git a/.docker/scripts/ckan_cli b/.docker/scripts/ckan_cli
new file mode 100644
index 00000000..88526ff9
--- /dev/null
+++ b/.docker/scripts/ckan_cli
@@ -0,0 +1,68 @@
+#!/bin/sh
+
+# Call either 'ckan' (from CKAN >= 2.9) or 'paster' (from CKAN <= 2.8)
+# with appropriate syntax, depending on what is present on the system.
+# This is intended to smooth the upgrade process from 2.8 to 2.9.
+# Eg:
+#   ckan_cli jobs list
+# could become either:
+#   paster --plugin=ckan jobs list -c /etc/ckan/default/production.ini
+# or:
+#   ckan -c /etc/ckan/default/production.ini jobs list
+
+# This script is aware of the VIRTUAL_ENV environment variable, and will
+# attempt to respect it with similar behaviour to commands like 'pip'.
+# Eg placing this script in a virtualenv 'bin' directory will cause it
+# to call the 'ckan' or 'paster' command in that directory, while
+# placing this script elsewhere will cause it to rely on the VIRTUAL_ENV
+# variable, or if that is not set, the system PATH.
+
+# Since the positioning of the CKAN configuration file is central to the
+# differences between 'paster' and 'ckan', this script needs to be aware
+# of the config file location. It will use the CKAN_INI environment
+# variable if it exists, or default to /etc/ckan/default/production.ini.
+
+# If 'paster' is being used, the default plugin is 'ckan'. A different
+# plugin can be specified by setting the PASTER_PLUGIN environment
+# variable. This variable is irrelevant if using the 'ckan' command.
+
+CKAN_INI="${CKAN_INI:-/etc/ckan/default/production.ini}"
+PASTER_PLUGIN="${PASTER_PLUGIN:-ckan}"
+# First, look for a command alongside this file
+ENV_DIR=$(dirname "$0")
+if [ -f "$ENV_DIR/ckan" ]; then
+    COMMAND=ckan
+elif [ -f "$ENV_DIR/paster" ]; then
+    COMMAND=paster
+elif [ "$VIRTUAL_ENV" != "" ]; then
+    # If command not found alongside this file, check the virtualenv
+    ENV_DIR="$VIRTUAL_ENV/bin"
+    if [ -f "$ENV_DIR/ckan" ]; then
+        COMMAND=ckan
+    elif [ -f "$ENV_DIR/paster" ]; then
+        COMMAND=paster
+    fi
+else
+    # if no virtualenv is active, try the system path
+    if (which ckan > /dev/null 2>&1); then
+        ENV_DIR=$(dirname $(which ckan))
+        COMMAND=ckan
+    elif (which paster > /dev/null 2>&1); then
+        ENV_DIR=$(dirname $(which paster))
+        COMMAND=paster
+    else
+        echo "Unable to locate 'ckan' or 'paster' command" >&2
+        exit 1
+    fi
+fi
+
+if [ "$COMMAND" = "ckan" ]; then
+    echo "Using 'ckan' command from $ENV_DIR..." >&2
+    exec $ENV_DIR/ckan -c ${CKAN_INI} "$@"
+elif [ "$COMMAND" = "paster" ]; then
+    echo "Using 'paster' command from $ENV_DIR..." >&2
+    exec $ENV_DIR/paster --plugin=$PASTER_PLUGIN "$@" -c ${CKAN_INI}
+else
+    echo "Unable to locate 'ckan' or 'paster' command in $ENV_DIR" >&2
+    exit 1
+fi
diff --git a/.docker/scripts/create-test-data.sh b/.docker/scripts/create-test-data.sh
index f707be2c..504f9ac4 100644
--- a/.docker/scripts/create-test-data.sh
+++ b/.docker/scripts/create-test-data.sh
@@ -6,17 +6,16 @@
 set -e
 
 CKAN_ACTION_URL=http://ckan:3000/api/action
-CKAN_INI_FILE=/app/ckan/default/production.ini
+export CKAN_INI=/app/ckan/default/production.ini
 
-. /app/ckan/default/bin/activate \
-    && cd /app/ckan/default/src/ckan
+. /app/ckan/default/bin/activate
 
 # We know the "admin" sysadmin account exists, so we'll use her API KEY to create further data
-API_KEY=$(paster --plugin=ckan user admin -c ${CKAN_INI_FILE} | tr -d '\n' | sed -r 's/^(.*)apikey=(\S*)(.*)/\2/')
+API_KEY=$(/app/scripts/ckan_cli user admin | tr -d '\n' | sed -r 's/^(.*)apikey=(\S*)(.*)/\2/')
 
-# # 
+# #
 ##
-# BEGIN: Add sysadmin config values. 
+# BEGIN: Add sysadmin config values.
 # This needs to be done before closing datarequests as they require the below config values
 #
 echo "Adding ckan.datarequests.closing_circumstances:"
@@ -37,10 +36,10 @@ TEST_ORG_TITLE="Test"
 
 echo "Creating test users for ${TEST_ORG_TITLE} Organisation:"
 
-paster --plugin=ckan user add ckan_user email=ckan_user@localhost password=password -c ${CKAN_INI_FILE}
-paster --plugin=ckan user add test_org_admin email=test_org_admin@localhost password=password -c ${CKAN_INI_FILE}
-paster --plugin=ckan user add test_org_editor email=test_org_editor@localhost password=password -c ${CKAN_INI_FILE}
-paster --plugin=ckan user add test_org_member email=test_org_member@localhost password=password -c ${CKAN_INI_FILE}
+/app/scripts/ckan_cli user add ckan_user email=ckan_user@localhost password=password
+/app/scripts/ckan_cli user add test_org_admin email=test_org_admin@localhost password=password
+/app/scripts/ckan_cli user add test_org_editor email=test_org_editor@localhost password=password
+/app/scripts/ckan_cli user add test_org_member email=test_org_member@localhost password=password
 
 echo "Creating ${TEST_ORG_TITLE} Organisation:"
 
@@ -78,9 +77,9 @@ DR_ORG_TITLE="Open Data Administration (data requests)"
 
 echo "Creating test users for ${DR_ORG_TITLE} Organisation:"
 
-paster --plugin=ckan user add dr_admin email=dr_admin@localhost password=password -c ${CKAN_INI_FILE}
-paster --plugin=ckan user add dr_editor email=dr_editor@localhost password=password -c ${CKAN_INI_FILE}
-paster --plugin=ckan user add dr_member email=dr_member@localhost password=password -c ${CKAN_INI_FILE}
+/app/scripts/ckan_cli user add dr_admin email=dr_admin@localhost password=password
+/app/scripts/ckan_cli user add dr_editor email=dr_editor@localhost password=password
+/app/scripts/ckan_cli user add dr_member email=dr_member@localhost password=password
 
 echo "Creating ${DR_ORG_TITLE} Organisation:"
 
@@ -138,8 +137,8 @@ curl -L -s --header "Authorization: ${API_KEY}" \
 # END.
 #
 
-# Use CKAN's built-in paster command for creating some test datasets...
-paster create-test-data -c ${CKAN_INI_FILE}
+# Use CKAN's built-in commands for creating some test datasets...
+/app/scripts/ckan_cli create-test-data
 
 # Datasets need to be assigned to an organisation
 
diff --git a/.docker/scripts/init-ext.sh b/.docker/scripts/init-ext.sh
index 8354ddfe..73ebd4ad 100755
--- a/.docker/scripts/init-ext.sh
+++ b/.docker/scripts/init-ext.sh
@@ -9,8 +9,9 @@ set -e
 pip install -r "/app/requirements.txt"
 pip install -r "/app/requirements-dev.txt"
 python setup.py develop
+installed_name=$(grep '^\s*name=' setup.py |sed "s|[^']*'\([-a-zA-Z0-9]*\)'.*|\1|")
 
 # Validate that the extension was installed correctly.
-if ! pip list | grep ckanext-datarequests > /dev/null; then echo "Unable to find the extension in the list"; exit 1; fi
+if ! pip list | grep "$installed_name" > /dev/null; then echo "Unable to find the extension in the list"; exit 1; fi
 
 deactivate
diff --git a/.docker/scripts/init.sh b/.docker/scripts/init.sh
index 24b0ca91..2dca5136 100755
--- a/.docker/scripts/init.sh
+++ b/.docker/scripts/init.sh
@@ -7,25 +7,25 @@ set -e
 CKAN_USER_NAME="${CKAN_USER_NAME:-admin}"
 CKAN_USER_PASSWORD="${CKAN_USER_PASSWORD:-password}"
 CKAN_USER_EMAIL="${CKAN_USER_EMAIL:-admin@localhost}"
+export CKAN_INI=/app/ckan/default/production.ini
 
-. /app/ckan/default/bin/activate \
-  && cd /app/ckan/default/src/ckan \
-  && paster db clean -c /app/ckan/default/production.ini \
-  && paster db init -c /app/ckan/default/production.ini \
-  && paster --plugin=ckan user add "${CKAN_USER_NAME}" email="${CKAN_USER_EMAIL}" password="${CKAN_USER_PASSWORD}" -c /app/ckan/default/production.ini \
-  && paster --plugin=ckan sysadmin add "${CKAN_USER_NAME}" -c /app/ckan/default/production.ini
+. /app/ckan/default/bin/activate
+/app/scripts/ckan_cli db clean
+/app/scripts/ckan_cli db init
+/app/scripts/ckan_cli user add "${CKAN_USER_NAME}" email="${CKAN_USER_EMAIL}" password="${CKAN_USER_PASSWORD}"
+/app/scripts/ckan_cli sysadmin add "${CKAN_USER_NAME}"
 
 # Initialise the Comments database tables
-paster --plugin=ckanext-ytp-comments initdb --config=/app/ckan/default/production.ini
+PASTER_PLUGIN=ckanext-ytp-comments /app/scripts/ckan_cli initdb
 
 # Initialise the archiver database tables
-paster --plugin=ckanext-archiver archiver init --config=/app/ckan/default/production.ini
+PASTER_PLUGIN=ckanext-archiver /app/scripts/ckan_cli archiver init
 
 # Initialise the reporting database tables
-paster --plugin=ckanext-report report initdb --config=/app/ckan/default/production.ini
+PASTER_PLUGIN=ckanext-report /app/scripts/ckan_cli report initdb
 
 # Initialise the QA database tables
-paster --plugin=ckanext-qa qa init --config=/app/ckan/default/production.ini
+PASTER_PLUGIN=ckanext-qa /app/scripts/ckan_cli qa init
 
 # Create some base test data
 . /app/scripts/create-test-data.sh

From 92430ea789dd9df080d5866089b597a08756d5ba Mon Sep 17 00:00:00 2001
From: antuarc <carl.antuar@smartservice.qld.gov.au>
Date: Fri, 30 Apr 2021 16:31:19 +1000
Subject: [PATCH 081/276] [QOL-7970] oops make ckan_cli executable

---
 .docker/Dockerfile.ckan | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.docker/Dockerfile.ckan b/.docker/Dockerfile.ckan
index e95d8f7a..5324f7e3 100644
--- a/.docker/Dockerfile.ckan
+++ b/.docker/Dockerfile.ckan
@@ -30,7 +30,8 @@ RUN fix-permissions /app/ckan \
     && chmod +x /app/scripts/create-test-data.sh \
     && chmod +x /app/scripts/init.sh \
     && chmod +x /app/scripts/init-ext.sh \
-    && chmod +x /app/scripts/serve.sh
+    && chmod +x /app/scripts/serve.sh \
+    && chmod +x /app/scripts/ckan_cli
 
 # Add current extension and files.
 COPY ckanext /app/ckanext

From b4da33fde0bb239765a179b5d710e350346a15af Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Thu, 6 May 2021 10:58:40 +1000
Subject: [PATCH 082/276] [QOL-7970] oops fix CKAN_INI variable name

---
 .ahoy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.ahoy.yml b/.ahoy.yml
index 027a2a56..aab8def3 100644
--- a/.ahoy.yml
+++ b/.ahoy.yml
@@ -147,7 +147,7 @@ commands:
     cmd: |
       ahoy title 'Starting CKAN background job worker'
       ahoy cli "cd /usr/lib/ckan/default/src/ckan && \
-                export CKAN_CLI=/app/ckan/default/production.ini &&
+                export CKAN_INI=/app/ckan/default/production.ini &&
                 /app/scripts/ckan_cli jobs clear && \
                 /app/scripts/ckan_cli jobs worker default"
 

From dbaa9b0159b8cc593d8dec9ee8098541338b1de7 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Thu, 6 May 2021 11:51:06 +1000
Subject: [PATCH 083/276] refactor - don't directly call parameterized tests

---
 ckanext/datarequests/tests/test_ui_controller.py | 7 +++++--
 ckanext/datarequests/tests/test_validator.py     | 3 +++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ckanext/datarequests/tests/test_ui_controller.py b/ckanext/datarequests/tests/test_ui_controller.py
index a87d00ee..72bb5c06 100644
--- a/ckanext/datarequests/tests/test_ui_controller.py
+++ b/ckanext/datarequests/tests/test_ui_controller.py
@@ -187,7 +187,7 @@ def test_new_post_content(self, authorized, validation_error):
         result = self.controller_instance.new()
 
         # Authorize function has been called
-        controller.tk.check_access.assert_called_once_with(constants.CREATE_DATAREQUEST, 
+        controller.tk.check_access.assert_called_once_with(constants.CREATE_DATAREQUEST,
                                                            self.expected_context, None)
 
         if authorized:
@@ -693,6 +693,9 @@ def test_close_not_found(self):
         (None,),
         ('organization_uuidv4',)
     ])
+    def test_close_datarequest(self, organization):
+        self.test_close(organization)
+
     def test_close(self, organization, post_content={}, errors={}, errors_summary={}, close_datarequest=MagicMock()):
         controller.tk.response.location = None
         controller.tk.response.status_int = 200
@@ -944,7 +947,7 @@ def test_delete_comment_not_authorized(self):
         result = self.controller_instance.delete_comment('datarequest_id', comment_id)
 
         # Assertions
-        controller.tk.check_access.assert_called_once_with(constants.DELETE_DATAREQUEST_COMMENT, 
+        controller.tk.check_access.assert_called_once_with(constants.DELETE_DATAREQUEST_COMMENT,
                                                            self.expected_context, {'id': comment_id})
         controller.tk.abort.assert_called_once_with(403, 'You are not authorized to delete this comment')
         self.assertEquals(0, controller.tk.render.call_count)
diff --git a/ckanext/datarequests/tests/test_validator.py b/ckanext/datarequests/tests/test_validator.py
index dbd17e83..f2fd2312 100644
--- a/ckanext/datarequests/tests/test_validator.py
+++ b/ckanext/datarequests/tests/test_validator.py
@@ -146,6 +146,9 @@ def test_close_valid(self):
         ({'comment': generate_string(validator.constants.COMMENT_MAX_LENGTH + 1)}, 'Comment',
             'Comments must be a maximum of %d characters long' % validator.constants.COMMENT_MAX_LENGTH)
     ])
+    def test_comment_invalid_good_datarequest(self, request_data, field, message):
+        self.test_comment_invalid(request_data, field, message)
+
     def test_comment_invalid(self, request_data, field, message):
         context = {}
         request_data['datarequest_id'] = 'exmaple'

From 3a5c5274fe71dc362cb7d2f65ee1ca396f50fc13 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Thu, 6 May 2021 12:12:21 +1000
Subject: [PATCH 084/276] oops rename extracted helper methods so they don't
 get run directly as tests

---
 ckanext/datarequests/tests/test_ui_controller.py | 6 +++---
 ckanext/datarequests/tests/test_validator.py     | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ckanext/datarequests/tests/test_ui_controller.py b/ckanext/datarequests/tests/test_ui_controller.py
index 72bb5c06..8a6d4bd0 100644
--- a/ckanext/datarequests/tests/test_ui_controller.py
+++ b/ckanext/datarequests/tests/test_ui_controller.py
@@ -694,9 +694,9 @@ def test_close_not_found(self):
         ('organization_uuidv4',)
     ])
     def test_close_datarequest(self, organization):
-        self.test_close(organization)
+        self._test_close(organization)
 
-    def test_close(self, organization, post_content={}, errors={}, errors_summary={}, close_datarequest=MagicMock()):
+    def _test_close(self, organization, post_content={}, errors={}, errors_summary={}, close_datarequest=MagicMock()):
         controller.tk.response.location = None
         controller.tk.response.status_int = 200
         controller.request.POST = post_content
@@ -785,7 +785,7 @@ def test_close_post_errors(self, organization):
         close_datarequest = MagicMock(side_effect=exception)
 
         # Execute the test
-        self.test_close(organization, post_content, exception.error_dict,
+        self._test_close(organization, post_content, exception.error_dict,
                         {'Accepted Dataset': 'error1, error2'}, close_datarequest)
 
 
diff --git a/ckanext/datarequests/tests/test_validator.py b/ckanext/datarequests/tests/test_validator.py
index f2fd2312..62ddca81 100644
--- a/ckanext/datarequests/tests/test_validator.py
+++ b/ckanext/datarequests/tests/test_validator.py
@@ -147,9 +147,9 @@ def test_close_valid(self):
             'Comments must be a maximum of %d characters long' % validator.constants.COMMENT_MAX_LENGTH)
     ])
     def test_comment_invalid_good_datarequest(self, request_data, field, message):
-        self.test_comment_invalid(request_data, field, message)
+        self._test_comment_invalid(request_data, field, message)
 
-    def test_comment_invalid(self, request_data, field, message):
+    def _test_comment_invalid(self, request_data, field, message):
         context = {}
         request_data['datarequest_id'] = 'exmaple'
 
@@ -163,7 +163,7 @@ def test_comment_invalid_datarequest(self):
         show_datarequest = validator.tk.get_action.return_value
         show_datarequest.side_effect = self._tk.ObjectNotFound('Store Not found')
 
-        self.test_comment_invalid({'datarequest_id': 'non_existing_dr'}, 'Data Request',
+        self._test_comment_invalid({'datarequest_id': 'non_existing_dr'}, 'Data Request',
                                   'Data Request not found')
 
     def test_comment_valid(self):

From 815becfe8e51180f452abe8e31aab90d43f57c2b Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Thu, 6 May 2021 12:55:33 +1000
Subject: [PATCH 085/276] [QOL-7970] replace obsolete 'nose-parameterized'

---
 ckanext/datarequests/tests/test_actions.py       | 2 +-
 ckanext/datarequests/tests/test_auth.py          | 2 +-
 ckanext/datarequests/tests/test_db.py            | 2 +-
 ckanext/datarequests/tests/test_plugin.py        | 2 +-
 ckanext/datarequests/tests/test_ui_controller.py | 2 +-
 ckanext/datarequests/tests/test_validator.py     | 2 +-
 requirements-dev.txt                             | 3 +--
 setup.py                                         | 2 +-
 8 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/ckanext/datarequests/tests/test_actions.py b/ckanext/datarequests/tests/test_actions.py
index a83b63fd..e4af8808 100644
--- a/ckanext/datarequests/tests/test_actions.py
+++ b/ckanext/datarequests/tests/test_actions.py
@@ -23,7 +23,7 @@
 import unittest
 
 from mock import MagicMock, patch
-from nose_parameterized import parameterized
+from parameterized import parameterized
 
 
 class ActionsTest(unittest.TestCase):
diff --git a/ckanext/datarequests/tests/test_auth.py b/ckanext/datarequests/tests/test_auth.py
index af10631d..1bc27a00 100644
--- a/ckanext/datarequests/tests/test_auth.py
+++ b/ckanext/datarequests/tests/test_auth.py
@@ -22,7 +22,7 @@
 import unittest
 
 from mock import MagicMock
-from nose_parameterized import parameterized
+from parameterized import parameterized
 
 # Needed for the test
 context = {
diff --git a/ckanext/datarequests/tests/test_db.py b/ckanext/datarequests/tests/test_db.py
index fe7b04d2..53c427af 100644
--- a/ckanext/datarequests/tests/test_db.py
+++ b/ckanext/datarequests/tests/test_db.py
@@ -21,7 +21,7 @@
 from ckanext.datarequests import db
 
 from mock import MagicMock
-from nose_parameterized import parameterized
+from parameterized import parameterized
 
 
 class DBTest(unittest.TestCase):
diff --git a/ckanext/datarequests/tests/test_plugin.py b/ckanext/datarequests/tests/test_plugin.py
index dd9b4373..3fc67088 100644
--- a/ckanext/datarequests/tests/test_plugin.py
+++ b/ckanext/datarequests/tests/test_plugin.py
@@ -21,7 +21,7 @@
 import unittest
 
 from mock import MagicMock, patch
-from nose_parameterized import parameterized
+from parameterized import parameterized
 
 TOTAL_ACTIONS = 13
 COMMENTS_ACTIONS = 5
diff --git a/ckanext/datarequests/tests/test_ui_controller.py b/ckanext/datarequests/tests/test_ui_controller.py
index ebd401c5..7819f122 100644
--- a/ckanext/datarequests/tests/test_ui_controller.py
+++ b/ckanext/datarequests/tests/test_ui_controller.py
@@ -22,7 +22,7 @@
 import unittest
 
 from mock import MagicMock
-from nose_parameterized import parameterized
+from parameterized import parameterized
 
 
 INDEX_FUNCTION = 'index'
diff --git a/ckanext/datarequests/tests/test_validator.py b/ckanext/datarequests/tests/test_validator.py
index 72a6bf91..10fd5521 100644
--- a/ckanext/datarequests/tests/test_validator.py
+++ b/ckanext/datarequests/tests/test_validator.py
@@ -22,7 +22,7 @@
 import random
 
 from mock import MagicMock
-from nose_parameterized import parameterized
+from parameterized import parameterized
 
 
 def generate_string(length):
diff --git a/requirements-dev.txt b/requirements-dev.txt
index baf92481..c6544865 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -4,7 +4,7 @@ behaving==1.5.6
 flake8==3.8.3
 nose==1.3.7
 mock
-nose_parameterized==0.6.0
+parameterized==0.8.1
 profanityfilter
 lxml==4.6.3
 splinter>=0.13.0
@@ -24,4 +24,3 @@ six==1.15.0
 -e git+https://github.com/qld-gov-au/ckanext-qa@develop#egg=ckanext-qa
 -e git+https://github.com/qld-gov-au/ckanext-archiver.git@develop#egg=ckanext-archiver
 -e git+https://github.com/qld-gov-au/ckanext-report.git@0.1#egg=ckanext-report
-
diff --git a/setup.py b/setup.py
index f4fb0f78..51f12ebb 100644
--- a/setup.py
+++ b/setup.py
@@ -45,7 +45,7 @@
         # -*- Extra requirements: -*-
     ],
     tests_require=[
-        'nose_parameterized==0.6.0',
+        'parameterized==0.8.1',
         'selenium==3.141.0',
         'coveralls==2.1.2'
     ],

From 1bbd8442422ebe6b4d8e11ed7f9c625a66111263 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Thu, 6 May 2021 12:56:45 +1000
Subject: [PATCH 086/276] [QOL-7970] fix indentation

---
 ckanext/datarequests/tests/test_ui_controller.py | 2 +-
 ckanext/datarequests/tests/test_validator.py     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ckanext/datarequests/tests/test_ui_controller.py b/ckanext/datarequests/tests/test_ui_controller.py
index 7819f122..2b9b3fff 100644
--- a/ckanext/datarequests/tests/test_ui_controller.py
+++ b/ckanext/datarequests/tests/test_ui_controller.py
@@ -783,7 +783,7 @@ def test_close_post_errors(self, organization):
 
         # Execute the test
         self._test_close(organization, post_content, exception.error_dict,
-                        {'Accepted Dataset': 'error1, error2'}, close_datarequest)
+                         {'Accepted Dataset': 'error1, error2'}, close_datarequest)
 
     ######################################################################
     ############################### COMMENT ##############################
diff --git a/ckanext/datarequests/tests/test_validator.py b/ckanext/datarequests/tests/test_validator.py
index 10fd5521..f6cbeffb 100644
--- a/ckanext/datarequests/tests/test_validator.py
+++ b/ckanext/datarequests/tests/test_validator.py
@@ -164,7 +164,7 @@ def test_comment_invalid_datarequest(self):
         show_datarequest.side_effect = self._tk.ObjectNotFound('Store Not found')
 
         self._test_comment_invalid({'datarequest_id': 'non_existing_dr'}, 'Data Request',
-                                  'Data Request not found')
+                                   'Data Request not found')
 
     def test_comment_valid(self):
         show_datarequest = validator.tk.get_action.return_value

From 7943f6229cca9ebf298da7da24fdc5899c9f0d91 Mon Sep 17 00:00:00 2001
From: antuarc <carl.antuar@smartservice.qld.gov.au>
Date: Fri, 14 May 2021 12:11:51 +1000
Subject: [PATCH 087/276] [QOL-7970] add route names so we can use url_for
 consistently with Pylons or Flask

---
 ckanext/datarequests/plugin.py             | 72 +++++++++++-----------
 ckanext/datarequests/templates/header.html |  2 +-
 ckanext/datarequests/tests/test_plugin.py  | 33 +++++++---
 3 files changed, 61 insertions(+), 46 deletions(-)

diff --git a/ckanext/datarequests/plugin.py b/ckanext/datarequests/plugin.py
index 05232b5e..863f4fcd 100644
--- a/ckanext/datarequests/plugin.py
+++ b/ckanext/datarequests/plugin.py
@@ -153,70 +153,70 @@ def update_config_schema(self, schema):
     ############################## IROUTES ###############################
     ######################################################################
 
-    def before_map(self, m):
+    def before_map(self, mapper):
+        from routes.mapper import SubMapper
+        controller_map = SubMapper(
+            mapper, controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI')
+
+        m = SubMapper(controller_map, path_prefix="/" + constants.DATAREQUESTS_MAIN_PATH)
+
         # Data Requests index
-        m.connect('datarequests_index', "/%s" % constants.DATAREQUESTS_MAIN_PATH,
-                  controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
-                  action='index', conditions={'method': ['GET']})
+        m.connect('datarequests_index', '', action='index', conditions={'method': ['GET']})
+        m.connect('datarequest.index', '', action='index', conditions={'method': ['GET']})
 
         # Create a Data Request
-        m.connect('/%s/new' % constants.DATAREQUESTS_MAIN_PATH,
-                  controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
-                  action='new', conditions={'method': ['GET', 'POST']})
+        m.connect('datarequest.new', '/new', action='new', conditions={'method': ['GET', 'POST']})
 
         # Show a Data Request
-        m.connect('show_datarequest', '/%s/{id}' % constants.DATAREQUESTS_MAIN_PATH,
-                  controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
+        m.connect('show_datarequest', '/{id}',
+                  action='show', conditions={'method': ['GET']}, ckan_icon=get_question_icon())
+        m.connect('datarequest.show', '/{id}',
                   action='show', conditions={'method': ['GET']}, ckan_icon=get_question_icon())
 
         # Update a Data Request
-        m.connect('/%s/edit/{id}' % constants.DATAREQUESTS_MAIN_PATH,
-                  controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
+        m.connect('datarequest.update', '/edit/{id}',
                   action='update', conditions={'method': ['GET', 'POST']})
 
         # Delete a Data Request
-        m.connect('/%s/delete/{id}' % constants.DATAREQUESTS_MAIN_PATH,
-                  controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
+        m.connect('datarequest.delete', '/delete/{id}',
                   action='delete', conditions={'method': ['POST']})
 
         # Close a Data Request
-        m.connect('/%s/close/{id}' % constants.DATAREQUESTS_MAIN_PATH,
-                  controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
+        m.connect('datarequest.close', '/close/{id}',
                   action='close', conditions={'method': ['GET', 'POST']})
 
-        # Data Request that belongs to an organization
-        m.connect('organization_datarequests', '/organization/%s/{id}' % constants.DATAREQUESTS_MAIN_PATH,
-                  controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
-                  action='organization_datarequests', conditions={'method': ['GET']},
-                  ckan_icon=get_question_icon())
-
-        # Data Request that belongs to an user
-        m.connect('user_datarequests', '/user/%s/{id}' % constants.DATAREQUESTS_MAIN_PATH,
-                  controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
-                  action='user_datarequests', conditions={'method': ['GET']},
-                  ckan_icon=get_question_icon())
-
         # Follow & Unfollow
-        m.connect('/%s/follow/{id}' % constants.DATAREQUESTS_MAIN_PATH,
-                  controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
+        m.connect('datarequest.follow', '/follow/{id}',
                   action='follow', conditions={'method': ['POST']})
 
-        m.connect('/%s/unfollow/{id}' % constants.DATAREQUESTS_MAIN_PATH,
-                  controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
+        m.connect('datarequest.unfollow', '/unfollow/{id}',
                   action='unfollow', conditions={'method': ['POST']})
 
         if self.comments_enabled:
             # Comment, update and view comments (of) a Data Request
-            m.connect('comment_datarequest', '/%s/comment/{id}' % constants.DATAREQUESTS_MAIN_PATH,
-                      controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
+            m.connect('comment_datarequest', '/comment/{id}',
+                      action='comment', conditions={'method': ['GET', 'POST']}, ckan_icon='comment')
+            m.connect('datarequest.comment', '/comment/{id}',
                       action='comment', conditions={'method': ['GET', 'POST']}, ckan_icon='comment')
 
             # Delete data request
-            m.connect('/%s/comment/{datarequest_id}/delete/{comment_id}' % constants.DATAREQUESTS_MAIN_PATH,
-                      controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
+            m.connect('datarequest.delete_comment', '/comment/{datarequest_id}/delete/{comment_id}',
                       action='delete_comment', conditions={'method': ['GET', 'POST']})
 
-        return m
+        list_datarequests_map = SubMapper(
+            controller_map, conditions={'method': ['GET']}, ckan_icon=get_question_icon())
+
+        # Data Requests that belong to an organization
+        list_datarequests_map.connect(
+            'organization_datarequests', '/organization/%s/{id}' % constants.DATAREQUESTS_MAIN_PATH,
+            action='organization_datarequests')
+
+        # Data Requests that belong to a user
+        list_datarequests_map.connect(
+            'user_datarequests', '/user/%s/{id}' % constants.DATAREQUESTS_MAIN_PATH,
+            action='user_datarequests')
+
+        return mapper
 
     ######################################################################
     ######################### ITEMPLATESHELPER ###########################
diff --git a/ckanext/datarequests/templates/header.html b/ckanext/datarequests/templates/header.html
index 73494271..1319faf2 100644
--- a/ckanext/datarequests/templates/header.html
+++ b/ckanext/datarequests/templates/header.html
@@ -5,7 +5,7 @@
     ('search', _('Datasets')),
     ('organizations_index', _('Organizations')),
     ('group_index', _('Groups')),
-    ('datarequests_index', _('Data Requests') + h.get_open_datarequests_badge()),
+    ('datarequest.index', _('Data Requests') + h.get_open_datarequests_badge()),
     ('about', _('About'))
   ) }}
 {% endblock %}
diff --git a/ckanext/datarequests/tests/test_plugin.py b/ckanext/datarequests/tests/test_plugin.py
index 3fc67088..a3f4b78b 100644
--- a/ckanext/datarequests/tests/test_plugin.py
+++ b/ckanext/datarequests/tests/test_plugin.py
@@ -195,8 +195,8 @@ def test_update_config(self):
     ])
     def test_before_map(self, comments_enabled):
 
-        urls_set = 12
-        mapa_calls = urls_set if comments_enabled == 'True' else urls_set - 2
+        urls_set = 15
+        mapa_calls = urls_set if comments_enabled == 'True' else urls_set - 3
 
         # Configure config and get instance
         plugin.config.get.return_value = comments_enabled
@@ -219,7 +219,12 @@ def test_before_map(self, comments_enabled):
             action='index', conditions={'method': ['GET']})
 
         mapa.connect.assert_any_call(
-            '/%s/new' % dr_basic_path,
+            'datarequest.index', "/%s" % dr_basic_path,
+            controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
+            action='index', conditions={'method': ['GET']})
+
+        mapa.connect.assert_any_call(
+            'datarequest.new', '/%s/new' % dr_basic_path,
             controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
             action='new', conditions={'method': ['GET', 'POST']})
 
@@ -229,17 +234,22 @@ def test_before_map(self, comments_enabled):
             action='show', conditions={'method': ['GET']}, ckan_icon=mock_icon)
 
         mapa.connect.assert_any_call(
-            '/%s/edit/{id}' % dr_basic_path,
+            'datarequest.show', '/%s/{id}' % dr_basic_path,
+            controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
+            action='show', conditions={'method': ['GET']}, ckan_icon=mock_icon)
+
+        mapa.connect.assert_any_call(
+            'datarequest.update', '/%s/edit/{id}' % dr_basic_path,
             controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
             action='update', conditions={'method': ['GET', 'POST']})
 
         mapa.connect.assert_any_call(
-            '/%s/delete/{id}' % dr_basic_path,
+            'datarequest.delete', '/%s/delete/{id}' % dr_basic_path,
             controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
             action='delete', conditions={'method': ['POST']})
 
         mapa.connect.assert_any_call(
-            '/%s/close/{id}' % dr_basic_path,
+            'datarequest.close', '/%s/close/{id}' % dr_basic_path,
             controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
             action='close', conditions={'method': ['GET', 'POST']})
 
@@ -265,12 +275,12 @@ def test_before_map(self, comments_enabled):
             ckan_icon=mock_icon)
 
         mapa.connect.assert_any_call(
-            '/%s/follow/{id}' % dr_basic_path,
+            'datarequest.follow', '/%s/follow/{id}' % dr_basic_path,
             controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
             action='follow', conditions={'method': ['POST']})
 
         mapa.connect.assert_any_call(
-            '/%s/unfollow/{id}' % dr_basic_path,
+            'datarequest.unfollow', '/%s/unfollow/{id}' % dr_basic_path,
             controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
             action='unfollow', conditions={'method': ['POST']})
 
@@ -281,7 +291,12 @@ def test_before_map(self, comments_enabled):
                 action='comment', conditions={'method': ['GET', 'POST']}, ckan_icon='comment')
 
             mapa.connect.assert_any_call(
-                '/%s/comment/{datarequest_id}/delete/{comment_id}' % dr_basic_path,
+                'datarequest.comment', '/%s/comment/{id}' % dr_basic_path,
+                controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
+                action='comment', conditions={'method': ['GET', 'POST']}, ckan_icon='comment')
+
+            mapa.connect.assert_any_call(
+                'datarequest.delete_comment', '/%s/comment/{datarequest_id}/delete/{comment_id}' % dr_basic_path,
                 controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
                 action='delete_comment', conditions={'method': ['GET', 'POST']})
 

From 96bc749c336a0394db4e0b0bbed93d8c6f3cb60e Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Wed, 9 Jun 2021 13:11:29 +1000
Subject: [PATCH 088/276] [QOL-8053] synchronise CI config with Open Data theme
 and add Github Actions workflow

---
 .ahoy.yml                           |  6 ++++--
 .docker/Dockerfile.ckan             | 26 ++++++++++++--------------
 .docker/Dockerfile.solr             |  3 ---
 .docker/scripts/create-test-data.sh | 22 +++++++++++-----------
 .docker/scripts/init-ext.sh         | 13 ++++++-------
 .docker/scripts/init.sh             | 26 +++++++++++++++-----------
 .docker/scripts/serve.sh            | 10 +++++++---
 .docker/test.ini                    |  1 +
 .github/workflows/test.yml          | 27 +++++++++++++++++++++++++++
 .gitignore                          |  1 +
 docker-compose.yml                  |  6 ++----
 requirements-dev.txt                |  3 ++-
 12 files changed, 88 insertions(+), 56 deletions(-)
 delete mode 100644 .docker/Dockerfile.solr
 create mode 100644 .github/workflows/test.yml

diff --git a/.ahoy.yml b/.ahoy.yml
index aab8def3..a328468f 100644
--- a/.ahoy.yml
+++ b/.ahoy.yml
@@ -14,7 +14,7 @@ commands:
       ahoy up -- --build --force-recreate
       ahoy install-dev
       ahoy install-site
-      # ahoy title "Build complete"
+      ahoy title "Build complete"
       ahoy doctor
       ahoy info 1
 
@@ -31,6 +31,8 @@ commands:
     usage: Build and start Docker containers.
     cmd: |
       docker-compose up -d "$@"
+      sleep 10
+      docker-compose logs
       ahoy cli "dockerize -wait tcp://ckan:3000 -timeout 1m"
       if docker-compose logs | grep -q "\[Error\]"; then docker-compose logs; exit 1; fi
       if docker-compose logs | grep -q "Exception"; then docker-compose logs; exit 1; fi
@@ -63,7 +65,7 @@ commands:
 
   cli:
     usage: Start a shell inside CLI container or run a command.
-    cmd: if \[ "${#}" -ne 0 \]; then docker exec -i $(docker-compose ps -q ckan) sh -c ". /app/ckan/default/bin/activate; $*"; else docker exec -it $(docker-compose ps -q ckan) sh -c ". /app/ckan/default/bin/activate && sh"; fi
+    cmd: if \[ "${#}" -ne 0 \]; then docker exec $(docker-compose ps -q ckan) sh -c ". /app/ckan/default/bin/activate; $*"; else docker exec $(docker-compose ps -q ckan) sh -c ". /app/ckan/default/bin/activate && sh"; fi
 
   doctor:
     usage: Find problems with current project setup.
diff --git a/.docker/Dockerfile.ckan b/.docker/Dockerfile.ckan
index 5324f7e3..bf8b7dfc 100644
--- a/.docker/Dockerfile.ckan
+++ b/.docker/Dockerfile.ckan
@@ -1,9 +1,11 @@
-FROM amazeeio/python:2.7-ckan-v0.23.1
+FROM amazeeio/python:2.7-ckan-21.6.0
 
-WORKDIR /app
+ENV WORKDIR=/app
 
 ARG SITE_URL
 ENV SITE_URL="${SITE_URL}"
+ENV APP_DIR=/app/ckan/default
+ENV CKAN_INI=/app/ckan/default/production.ini
 
 ENV DOCKERIZE_VERSION v0.6.1
 RUN apk add --no-cache curl && curl -s -L -O https://github.com/jwilder/dockerize/releases/download/${DOCKERIZE_VERSION}/dockerize-alpine-linux-amd64-${DOCKERIZE_VERSION}.tar.gz \
@@ -11,14 +13,14 @@ RUN apk add --no-cache curl && curl -s -L -O https://github.com/jwilder/dockeriz
     && rm dockerize-alpine-linux-amd64-${DOCKERIZE_VERSION}.tar.gz
 
 # Install CKAN.
-ENV CKAN_VERSION 2.8.3
-RUN . /app/ckan/default/bin/activate \
-    && cd /app/ckan/default \
+ENV CKAN_VERSION 2.8.8
+RUN . ${APP_DIR}/bin/activate \
+    && cd ${APP_DIR} \
     && pip install setuptools==36.1 \
     && pip install -e "git+https://github.com/ckan/ckan.git@ckan-${CKAN_VERSION}#egg=ckan" \
-    && sed -i "s/psycopg2==2.4.5/psycopg2==2.7.7/g" "/app/ckan/default/src/ckan/requirements.txt" \
-    && pip install -r "/app/ckan/default/src/ckan/requirements.txt" \
-    && ln -s "/app/ckan/default/src/ckan/who.ini" "/app/ckan/default/who.ini" \
+    && sed -i "s/psycopg2==2.4.5/psycopg2==2.7.7/g" "${APP_DIR}/src/ckan/requirements.txt" \
+    && pip install -r "${APP_DIR}/src/ckan/requirements.txt" \
+    && ln -s "${APP_DIR}/src/ckan/who.ini" "${APP_DIR}/who.ini" \
     && deactivate \
     && ln -s /app/ckan /usr/lib/ckan
 
@@ -27,15 +29,11 @@ COPY .docker/test.ini /app/ckan/default/production.ini
 COPY .docker/scripts /app/scripts
 
 RUN fix-permissions /app/ckan \
-    && chmod +x /app/scripts/create-test-data.sh \
-    && chmod +x /app/scripts/init.sh \
-    && chmod +x /app/scripts/init-ext.sh \
-    && chmod +x /app/scripts/serve.sh \
-    && chmod +x /app/scripts/ckan_cli
+    && chmod +x /app/scripts/*.sh
 
 # Add current extension and files.
 COPY ckanext /app/ckanext
-COPY requirements.txt requirements-dev.txt setup.cfg setup.py /app/
+COPY requirements.txt requirements-dev.txt setup.cfg setup.py .flake8 /app/
 
 # Init current extension.
 RUN /app/scripts/init-ext.sh
diff --git a/.docker/Dockerfile.solr b/.docker/Dockerfile.solr
deleted file mode 100644
index 2c0ef416..00000000
--- a/.docker/Dockerfile.solr
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM amazeeio/solr:6.6-ckan-v0.23.1
-
-# @todo: Support customisations to solr configuration.
diff --git a/.docker/scripts/create-test-data.sh b/.docker/scripts/create-test-data.sh
index 504f9ac4..fdd2e404 100644
--- a/.docker/scripts/create-test-data.sh
+++ b/.docker/scripts/create-test-data.sh
@@ -6,12 +6,12 @@
 set -e
 
 CKAN_ACTION_URL=http://ckan:3000/api/action
-export CKAN_INI=/app/ckan/default/production.ini
+CKAN_CLI=$WORKDIR/scripts/ckan_cli
 
-. /app/ckan/default/bin/activate
+. ${APP_DIR}/bin/activate
 
 # We know the "admin" sysadmin account exists, so we'll use her API KEY to create further data
-API_KEY=$(/app/scripts/ckan_cli user admin | tr -d '\n' | sed -r 's/^(.*)apikey=(\S*)(.*)/\2/')
+API_KEY=$($CKAN_CLI user admin | tr -d '\n' | sed -r 's/^(.*)apikey=(\S*)(.*)/\2/')
 
 # #
 ##
@@ -36,10 +36,10 @@ TEST_ORG_TITLE="Test"
 
 echo "Creating test users for ${TEST_ORG_TITLE} Organisation:"
 
-/app/scripts/ckan_cli user add ckan_user email=ckan_user@localhost password=password
-/app/scripts/ckan_cli user add test_org_admin email=test_org_admin@localhost password=password
-/app/scripts/ckan_cli user add test_org_editor email=test_org_editor@localhost password=password
-/app/scripts/ckan_cli user add test_org_member email=test_org_member@localhost password=password
+$CKAN_CLI user add ckan_user email=ckan_user@localhost password=password
+$CKAN_CLI user add test_org_admin email=test_org_admin@localhost password=password
+$CKAN_CLI user add test_org_editor email=test_org_editor@localhost password=password
+$CKAN_CLI user add test_org_member email=test_org_member@localhost password=password
 
 echo "Creating ${TEST_ORG_TITLE} Organisation:"
 
@@ -77,9 +77,9 @@ DR_ORG_TITLE="Open Data Administration (data requests)"
 
 echo "Creating test users for ${DR_ORG_TITLE} Organisation:"
 
-/app/scripts/ckan_cli user add dr_admin email=dr_admin@localhost password=password
-/app/scripts/ckan_cli user add dr_editor email=dr_editor@localhost password=password
-/app/scripts/ckan_cli user add dr_member email=dr_member@localhost password=password
+$CKAN_CLI user add dr_admin email=dr_admin@localhost password=password
+$CKAN_CLI user add dr_editor email=dr_editor@localhost password=password
+$CKAN_CLI user add dr_member email=dr_member@localhost password=password
 
 echo "Creating ${DR_ORG_TITLE} Organisation:"
 
@@ -138,7 +138,7 @@ curl -L -s --header "Authorization: ${API_KEY}" \
 #
 
 # Use CKAN's built-in commands for creating some test datasets...
-/app/scripts/ckan_cli create-test-data
+$CKAN_CLI create-test-data
 
 # Datasets need to be assigned to an organisation
 
diff --git a/.docker/scripts/init-ext.sh b/.docker/scripts/init-ext.sh
index 73ebd4ad..8cf19e79 100755
--- a/.docker/scripts/init-ext.sh
+++ b/.docker/scripts/init-ext.sh
@@ -4,14 +4,13 @@
 #
 set -e
 
-. /app/ckan/default/bin/activate
-
-pip install -r "/app/requirements.txt"
-pip install -r "/app/requirements-dev.txt"
-python setup.py develop
+PIP="${APP_DIR}/bin/pip"
+cd $WORKDIR
+$PIP install -r "requirements.txt"
+$PIP install -r "requirements-dev.txt"
+$APP_DIR/bin/python setup.py develop
 installed_name=$(grep '^\s*name=' setup.py |sed "s|[^']*'\([-a-zA-Z0-9]*\)'.*|\1|")
 
 # Validate that the extension was installed correctly.
-if ! pip list | grep "$installed_name" > /dev/null; then echo "Unable to find the extension in the list"; exit 1; fi
+if ! $PIP list | grep "$installed_name" > /dev/null; then echo "Unable to find the extension in the list"; exit 1; fi
 
-deactivate
diff --git a/.docker/scripts/init.sh b/.docker/scripts/init.sh
index 2dca5136..bb11c541 100755
--- a/.docker/scripts/init.sh
+++ b/.docker/scripts/init.sh
@@ -5,27 +5,31 @@
 set -e
 
 CKAN_USER_NAME="${CKAN_USER_NAME:-admin}"
+CKAN_DISPLAY_NAME="${CKAN_DISPLAY_NAME:-Administrator}"
 CKAN_USER_PASSWORD="${CKAN_USER_PASSWORD:-password}"
 CKAN_USER_EMAIL="${CKAN_USER_EMAIL:-admin@localhost}"
-export CKAN_INI=/app/ckan/default/production.ini
 
-. /app/ckan/default/bin/activate
-/app/scripts/ckan_cli db clean
-/app/scripts/ckan_cli db init
-/app/scripts/ckan_cli user add "${CKAN_USER_NAME}" email="${CKAN_USER_EMAIL}" password="${CKAN_USER_PASSWORD}"
-/app/scripts/ckan_cli sysadmin add "${CKAN_USER_NAME}"
+. ${APP_DIR}/bin/activate
+CKAN_CLI=$WORKDIR/scripts/ckan_cli
+$CKAN_CLI db clean
+$CKAN_CLI db init
+$CKAN_CLI user add "${CKAN_USER_NAME}"\
+ fullname="${CKAN_DISPLAY_NAME}"\
+ email="${CKAN_USER_EMAIL}"\
+ password="${CKAN_USER_PASSWORD}"
+$CKAN_CLI sysadmin add "${CKAN_USER_NAME}"
 
 # Initialise the Comments database tables
-PASTER_PLUGIN=ckanext-ytp-comments /app/scripts/ckan_cli initdb
+PASTER_PLUGIN=ckanext-ytp-comments $CKAN_CLI initdb
 
 # Initialise the archiver database tables
-PASTER_PLUGIN=ckanext-archiver /app/scripts/ckan_cli archiver init
+PASTER_PLUGIN=ckanext-archiver $CKAN_CLI archiver init
 
 # Initialise the reporting database tables
-PASTER_PLUGIN=ckanext-report /app/scripts/ckan_cli report initdb
+PASTER_PLUGIN=ckanext-report $CKAN_CLI report initdb
 
 # Initialise the QA database tables
-PASTER_PLUGIN=ckanext-qa /app/scripts/ckan_cli qa init
+PASTER_PLUGIN=ckanext-qa $CKAN_CLI qa init
 
 # Create some base test data
-. /app/scripts/create-test-data.sh
+. $WORKDIR/scripts/create-test-data.sh
diff --git a/.docker/scripts/serve.sh b/.docker/scripts/serve.sh
index 6880ed6d..d95eeb70 100755
--- a/.docker/scripts/serve.sh
+++ b/.docker/scripts/serve.sh
@@ -4,7 +4,11 @@ set -e
 dockerize -wait tcp://postgres:5432 -timeout 1m
 dockerize -wait tcp://solr:8983 -timeout 1m
 
-sed -i "s@SITE_URL@${SITE_URL}@g" /app/ckan/default/production.ini
+sed -i "s@SITE_URL@${SITE_URL}@g" $CKAN_INI
 
-. /app/ckan/default/bin/activate \
-    && paster serve /app/ckan/default/production.ini
+. ${APP_DIR}/bin/activate
+if (which ckan > /dev/null); then
+    ckan -c ${CKAN_INI} run
+else
+    paster serve ${CKAN_INI}
+fi
diff --git a/.docker/test.ini b/.docker/test.ini
index 8535bfd5..5bdbfc86 100644
--- a/.docker/test.ini
+++ b/.docker/test.ini
@@ -64,6 +64,7 @@ ckan.auth.user_delete_organizations = true
 ckan.auth.create_user_via_api = false
 ckan.auth.create_user_via_web = true
 ckan.auth.roles_that_cascade_to_sub_groups = admin
+ckan.auth.public_user_details = False
 
 
 ## Search Settings
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
new file mode 100644
index 00000000..0f930485
--- /dev/null
+++ b/.github/workflows/test.yml
@@ -0,0 +1,27 @@
+---
+#based on https://raw.githubusercontent.com/ckan/ckanext-scheming/master/.github/workflows/test.yml
+# alternative https://github.com/ckan/ckan/blob/master/contrib/cookiecutter/ckan_extension/%7B%7Bcookiecutter.project%7D%7D/.github/workflows/test.yml
+name: Tests
+on:
+  push:
+
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+
+    name: Data Requests build
+    runs-on: ubuntu-latest
+    container: integratedexperts/ci-builder
+
+    steps:
+      - uses: actions/checkout@v2
+        timeout-minutes: 2
+
+      - name: Build
+        run: .circleci/build.sh
+        timeout-minutes: 10
+
+      - name: Test
+        run: .circleci/test.sh
+        timeout-minutes: 15
diff --git a/.gitignore b/.gitignore
index 12dfca6f..5a643340 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,3 +50,4 @@ docs/_build/
 .env.local
 /test/screenshots
 !/test/screenshots/.gitkeep
+.idea
diff --git a/docker-compose.yml b/docker-compose.yml
index 44824d17..5d1be01a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -69,7 +69,7 @@ services:
       <<: *default-environment
 
   redis:
-    image: amazeeio/redis
+    image: redis:3
     <<: *default-user
     environment:
       <<: *default-environment
@@ -78,9 +78,7 @@ services:
       - default
 
   solr:
-    build:
-      context: .
-      dockerfile: .docker/Dockerfile.solr
+    image: ckan/ckan-solr-dev:2.8
     user: '8983'
     ports:
       - "8983"
diff --git a/requirements-dev.txt b/requirements-dev.txt
index c6544865..1d2cec9c 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,6 +1,7 @@
 beautifulsoup4==4.9.1
 behave==1.2.6
-behaving==1.5.6
+behaving==2.0.0
+Appium-Python-Client<=0.52
 flake8==3.8.3
 nose==1.3.7
 mock

From 60eb94c8bcbd87acc740cf07f91b6df0f49f8538 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Wed, 9 Jun 2021 13:24:31 +1000
Subject: [PATCH 089/276] [QOL-8053] make ckan_cli script executable

---
 .docker/Dockerfile.ckan | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.docker/Dockerfile.ckan b/.docker/Dockerfile.ckan
index bf8b7dfc..9fd13d89 100644
--- a/.docker/Dockerfile.ckan
+++ b/.docker/Dockerfile.ckan
@@ -29,7 +29,9 @@ COPY .docker/test.ini /app/ckan/default/production.ini
 COPY .docker/scripts /app/scripts
 
 RUN fix-permissions /app/ckan \
-    && chmod +x /app/scripts/*.sh
+    && chmod +x /app/scripts/*.sh\
+    && chmod +x /app/scripts/ckan_cli
+
 
 # Add current extension and files.
 COPY ckanext /app/ckanext

From 8c3173d3e65eda3fc2be24313dc8c69cdcd2e005 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Wed, 16 Jun 2021 10:07:10 +1000
Subject: [PATCH 090/276] [QOL-8053] sync CI config with other repos

- standardise directories
- re-initialise data between unit and integration tests
- specify CKAN config for Nose tests
- upload screenshots after failed BDD tests
---
 .ahoy.yml                           | 39 ++++++++-----------
 .circleci/process-artifacts.sh      |  2 +-
 .circleci/test.sh                   |  3 +-
 .docker/Dockerfile.ckan             | 40 ++++++++++----------
 .docker/scripts/create-test-data.sh | 58 +++++++++++++++--------------
 .docker/scripts/init-ext.sh         | 16 +++++---
 .docker/scripts/init.sh             | 25 +++++++------
 .docker/scripts/serve.sh            |  4 +-
 .docker/test.ini                    |  2 +-
 .env                                |  2 +-
 .flake8                             |  1 +
 .github/workflows/test.yml          | 13 +++++++
 docker-compose.yml                  |  8 ++--
 13 files changed, 118 insertions(+), 95 deletions(-)

diff --git a/.ahoy.yml b/.ahoy.yml
index a328468f..47feeb3a 100644
--- a/.ahoy.yml
+++ b/.ahoy.yml
@@ -10,14 +10,19 @@ commands:
       ahoy title "Building project"
       ahoy pre-flight
       ahoy clean
-      (docker network prune -f > /dev/null && docker network inspect amazeeio-network > /dev/null || docker network create amazeeio-network)
+      ahoy build-network
       ahoy up -- --build --force-recreate
-      ahoy install-dev
       ahoy install-site
       ahoy title "Build complete"
       ahoy doctor
       ahoy info 1
 
+  build-network:
+    usage: Ensure that the amazeeio network exists.
+    cmd: |
+      docker network prune -f > /dev/null
+      docker network inspect amazeeio-network > /dev/null || docker network create amazeeio-network
+
   info:
     usage: Print information about this project.
     cmd: |
@@ -41,7 +46,7 @@ commands:
 
   down:
     usage: Stop Docker containers and remove container, images, volumes and networks.
-    cmd: "if [ -f \"docker-compose.yml\" ]; then docker-compose down --volumes; fi"
+    cmd: 'if [ -f "docker-compose.yml" ]; then docker-compose down --volumes; fi'
 
   start:
     usage: Start existing Docker containers.
@@ -57,7 +62,7 @@ commands:
 
   logs:
     usage: Show Docker logs.
-    cmd: docker-compose logs -f "$@"
+    cmd: docker-compose logs "$@"
 
   pull:
     usage: Pull latest docker images.
@@ -65,18 +70,17 @@ commands:
 
   cli:
     usage: Start a shell inside CLI container or run a command.
-    cmd: if \[ "${#}" -ne 0 \]; then docker exec $(docker-compose ps -q ckan) sh -c ". /app/ckan/default/bin/activate; $*"; else docker exec $(docker-compose ps -q ckan) sh -c ". /app/ckan/default/bin/activate && sh"; fi
+    cmd: if \[ "${#}" -ne 0 \]; then docker exec $(docker-compose ps -q ckan) sh -c '. ${VENV_DIR}/bin/activate; cd $APP_DIR;'" $*"; else docker exec $(docker-compose ps -q ckan) sh -c '. ${VENV_DIR}/bin/activate && cd $APP_DIR && sh'; fi
 
   doctor:
     usage: Find problems with current project setup.
     cmd: .docker/scripts/doctor.sh "$@"
 
-
   install-site:
     usage: Install a site.
     cmd: |
       ahoy title "Installing a fresh site"
-      ahoy cli "/app/scripts/init.sh"
+      ahoy cli "./scripts/init.sh"
 
   clean:
     usage: Remove containers and all build files.
@@ -95,15 +99,6 @@ commands:
       git ls-files --others -i --exclude-from=.git/info/exclude | xargs rm -Rf
       find . -type d -not -path "./.git/*" -empty -delete
 
-  install-dev:
-    usage: Install dependencies.
-    cmd: |
-      docker cp -L requirements-dev.txt $(docker-compose ps -q ckan):/app/.
-      docker cp -L .flake8 $(docker-compose ps -q ckan):/app/.
-      docker cp -L test $(docker-compose ps -q ckan):/app/.
-      ahoy cli "pip install -r /app/requirements-dev.txt"
-    hide: true
-
   flush-redis:
     usage: Flush Redis cache.
     cmd: docker exec -i $(docker-compose ps -q redis) redis-cli flushall > /dev/null
@@ -111,13 +106,13 @@ commands:
   lint:
     usage: Lint code.
     cmd: |
-      ahoy cli "flake8 ${@:-/app/ckanext}" || \
+      ahoy cli "flake8 ${@:-ckanext}" || \
       [ "${ALLOW_LINT_FAIL:-0}" -eq 1 ]
 
   test-unit:
     usage: Run unit tests.
     cmd: |
-      ahoy cli "nosetests" || \
+      ahoy cli 'nosetests --with-pylons=${CKAN_INI}' || \
       [ "${ALLOW_UNIT_FAIL:-0}" -eq 1 ]
 
   test-bdd:
@@ -126,7 +121,7 @@ commands:
       ahoy start-ckan-job-worker &
       ahoy start-mailmock &
       sleep 5 &&
-      ahoy cli "behave ${*:-/app/test/features}" || \
+      ahoy cli "behave ${*:-test/features}" || \
       [ "${ALLOW_BDD_FAIL:-0}" -eq 1 ]
       ahoy stop-mailmock
       ahoy stop-ckan-job-worker
@@ -148,10 +143,8 @@ commands:
     usage: Starts CKAN background job worker
     cmd: |
       ahoy title 'Starting CKAN background job worker'
-      ahoy cli "cd /usr/lib/ckan/default/src/ckan && \
-                export CKAN_INI=/app/ckan/default/production.ini &&
-                /app/scripts/ckan_cli jobs clear && \
-                /app/scripts/ckan_cli jobs worker default"
+      ahoy cli "ckan_cli jobs clear && \
+                ckan_cli jobs worker default"
 
   stop-ckan-job-worker:
     usage: Stops CKAN background job worker
diff --git a/.circleci/process-artifacts.sh b/.circleci/process-artifacts.sh
index 8fbc3d20..dc988af6 100755
--- a/.circleci/process-artifacts.sh
+++ b/.circleci/process-artifacts.sh
@@ -6,7 +6,7 @@ set -e
 
 # Create screenshots directory in case it was not created before. This is to
 # avoid this script to fail when copying artifacts.
-ahoy cli "mkdir -p /app/test/screenshots"
+ahoy cli "mkdir -p test/screenshots"
 
 # Copy from the app container to the build host for storage.
 mkdir -p /tmp/artifacts/behave/screenshots
diff --git a/.circleci/test.sh b/.circleci/test.sh
index e96dfb22..a2d91da7 100755
--- a/.circleci/test.sh
+++ b/.circleci/test.sh
@@ -11,4 +11,5 @@ echo "==> Run Unit tests"
 ahoy test-unit
 
 echo "==> Run BDD tests"
-ahoy test-bdd
+ahoy install-site
+ahoy test-bdd || (ahoy logs; exit 1)
diff --git a/.docker/Dockerfile.ckan b/.docker/Dockerfile.ckan
index 9fd13d89..4812b8ad 100644
--- a/.docker/Dockerfile.ckan
+++ b/.docker/Dockerfile.ckan
@@ -1,44 +1,46 @@
 FROM amazeeio/python:2.7-ckan-21.6.0
 
-ENV WORKDIR=/app
-
 ARG SITE_URL
 ENV SITE_URL="${SITE_URL}"
-ENV APP_DIR=/app/ckan/default
+ENV VENV_DIR=/app/ckan/default
+ENV APP_DIR=/app
 ENV CKAN_INI=/app/ckan/default/production.ini
 
+WORKDIR "${APP_DIR}"
+
 ENV DOCKERIZE_VERSION v0.6.1
-RUN apk add --no-cache curl && curl -s -L -O https://github.com/jwilder/dockerize/releases/download/${DOCKERIZE_VERSION}/dockerize-alpine-linux-amd64-${DOCKERIZE_VERSION}.tar.gz \
+RUN apk add --no-cache curl
+    && curl -s -L -O https://github.com/jwilder/dockerize/releases/download/${DOCKERIZE_VERSION}/dockerize-alpine-linux-amd64-${DOCKERIZE_VERSION}.tar.gz \
     && tar -C /usr/local/bin -xzvf dockerize-alpine-linux-amd64-${DOCKERIZE_VERSION}.tar.gz \
     && rm dockerize-alpine-linux-amd64-${DOCKERIZE_VERSION}.tar.gz
 
 # Install CKAN.
 ENV CKAN_VERSION 2.8.8
-RUN . ${APP_DIR}/bin/activate \
-    && cd ${APP_DIR} \
+
+RUN . ${VENV_DIR}/bin/activate \
     && pip install setuptools==36.1 \
     && pip install -e "git+https://github.com/ckan/ckan.git@ckan-${CKAN_VERSION}#egg=ckan" \
-    && sed -i "s/psycopg2==2.4.5/psycopg2==2.7.7/g" "${APP_DIR}/src/ckan/requirements.txt" \
-    && pip install -r "${APP_DIR}/src/ckan/requirements.txt" \
-    && ln -s "${APP_DIR}/src/ckan/who.ini" "${APP_DIR}/who.ini" \
+    && sed -i "s/psycopg2==2.4.5/psycopg2==2.7.7/g" "${VENV_DIR}/src/ckan/requirements.txt" \
+    && pip install -r "${VENV_DIR}/src/ckan/requirements.txt" \
+    && ln -s "${VENV_DIR}/src/ckan/who.ini" "${VENV_DIR}/who.ini" \
     && deactivate \
-    && ln -s /app/ckan /usr/lib/ckan
+    && ln -s ${APP_DIR}/ckan /usr/lib/ckan \
+    && fix-permissions ${APP_DIR}/ckan
 
-COPY .docker/test.ini /app/ckan/default/production.ini
+COPY .docker/test.ini $CKAN_INI
 
-COPY .docker/scripts /app/scripts
+# Add current extension and files.
+COPY . ${APP_DIR}/
 
-RUN fix-permissions /app/ckan \
-    && chmod +x /app/scripts/*.sh\
-    && chmod +x /app/scripts/ckan_cli
+COPY .docker/scripts ${APP_DIR}/scripts
 
+COPY .docker/scripts/ckan_cli ${VENV_DIR}/bin/
 
-# Add current extension and files.
-COPY ckanext /app/ckanext
-COPY requirements.txt requirements-dev.txt setup.cfg setup.py .flake8 /app/
+RUN chmod +x ${APP_DIR}/scripts/*.sh\
+    && chmod +x ${VENV_DIR}/bin/ckan_cli
 
 # Init current extension.
-RUN /app/scripts/init-ext.sh
+RUN ${APP_DIR}/scripts/init-ext.sh
 
 ENTRYPOINT ["/sbin/tini", "--", "/lagoon/entrypoints.sh"]
 CMD ["/app/scripts/serve.sh"]
diff --git a/.docker/scripts/create-test-data.sh b/.docker/scripts/create-test-data.sh
index fdd2e404..b4ae99c2 100644
--- a/.docker/scripts/create-test-data.sh
+++ b/.docker/scripts/create-test-data.sh
@@ -6,12 +6,13 @@
 set -e
 
 CKAN_ACTION_URL=http://ckan:3000/api/action
-CKAN_CLI=$WORKDIR/scripts/ckan_cli
 
-. ${APP_DIR}/bin/activate
+if [ "$VENV_DIR" != "" ]; then
+  . ${VENV_DIR}/bin/activate
+fi
 
 # We know the "admin" sysadmin account exists, so we'll use her API KEY to create further data
-API_KEY=$($CKAN_CLI user admin | tr -d '\n' | sed -r 's/^(.*)apikey=(\S*)(.*)/\2/')
+API_KEY=$(ckan_cli user admin | tr -d '\n' | sed -r 's/^(.*)apikey=(\S*)(.*)/\2/')
 
 # #
 ##
@@ -20,7 +21,8 @@ API_KEY=$($CKAN_CLI user admin | tr -d '\n' | sed -r 's/^(.*)apikey=(\S*)(.*)/\2
 #
 echo "Adding ckan.datarequests.closing_circumstances:"
 
-curl -L -s --header "Authorization: ${API_KEY}" --header "Content-Type: application/json" \
+curl -LsH "Authorization: ${API_KEY}" \
+    --header "Content-Type: application/json" \
     --data '{"ckan.datarequests.closing_circumstances":"Released as open data|nominate_dataset\nOpen dataset already exists|nominate_dataset\nPartially released|nominate_dataset\nTo be released as open data at a later date|nominate_approximate_date\nData openly available elsewhere\nNot suitable for release as open data\nRequested data not available/cannot be compiled\nRequestor initiated closure"}' \
     ${CKAN_ACTION_URL}/config_option_update
 
@@ -36,15 +38,15 @@ TEST_ORG_TITLE="Test"
 
 echo "Creating test users for ${TEST_ORG_TITLE} Organisation:"
 
-$CKAN_CLI user add ckan_user email=ckan_user@localhost password=password
-$CKAN_CLI user add test_org_admin email=test_org_admin@localhost password=password
-$CKAN_CLI user add test_org_editor email=test_org_editor@localhost password=password
-$CKAN_CLI user add test_org_member email=test_org_member@localhost password=password
+ckan_cli user add ckan_user email=ckan_user@localhost password=password
+ckan_cli user add test_org_admin email=test_org_admin@localhost password=password
+ckan_cli user add test_org_editor email=test_org_editor@localhost password=password
+ckan_cli user add test_org_member email=test_org_member@localhost password=password
 
 echo "Creating ${TEST_ORG_TITLE} Organisation:"
 
 TEST_ORG=$( \
-    curl -L -s --header "Authorization: ${API_KEY}" \
+    curl -LsH "Authorization: ${API_KEY}" \
     --data "name=${TEST_ORG_NAME}&title=${TEST_ORG_TITLE}" \
     ${CKAN_ACTION_URL}/organization_create
 )
@@ -53,15 +55,15 @@ TEST_ORG_ID=$(echo $TEST_ORG | sed -r 's/^(.*)"id": "(.*)",(.*)/\2/')
 
 echo "Assigning test users to ${TEST_ORG_TITLE} Organisation:"
 
-curl -L -s --header "Authorization: ${API_KEY}" \
+curl -LsH "Authorization: ${API_KEY}" \
     --data "id=${TEST_ORG_ID}&object=test_org_admin&object_type=user&capacity=admin" \
     ${CKAN_ACTION_URL}/member_create
 
-curl -L -s --header "Authorization: ${API_KEY}" \
+curl -LsH "Authorization: ${API_KEY}" \
     --data "id=${TEST_ORG_ID}&object=test_org_editor&object_type=user&capacity=editor" \
     ${CKAN_ACTION_URL}/member_create
 
-curl -L -s --header "Authorization: ${API_KEY}" \
+curl -LsH "Authorization: ${API_KEY}" \
     --data "id=${TEST_ORG_ID}&object=test_org_member&object_type=user&capacity=member" \
     ${CKAN_ACTION_URL}/member_create
 ##
@@ -77,14 +79,14 @@ DR_ORG_TITLE="Open Data Administration (data requests)"
 
 echo "Creating test users for ${DR_ORG_TITLE} Organisation:"
 
-$CKAN_CLI user add dr_admin email=dr_admin@localhost password=password
-$CKAN_CLI user add dr_editor email=dr_editor@localhost password=password
-$CKAN_CLI user add dr_member email=dr_member@localhost password=password
+ckan_cli user add dr_admin email=dr_admin@localhost password=password
+ckan_cli user add dr_editor email=dr_editor@localhost password=password
+ckan_cli user add dr_member email=dr_member@localhost password=password
 
 echo "Creating ${DR_ORG_TITLE} Organisation:"
 
 DR_ORG=$( \
-    curl -L -s --header "Authorization: ${API_KEY}" \
+    curl -LsH "Authorization: ${API_KEY}" \
     --data "name=${DR_ORG_NAME}&title=${DR_ORG_TITLE}" \
     ${CKAN_ACTION_URL}/organization_create
 )
@@ -93,30 +95,29 @@ DR_ORG_ID=$(echo $DR_ORG | sed -r 's/^(.*)"id": "(.*)",(.*)/\2/')
 
 echo "Assigning test users to ${DR_ORG_TITLE} Organisation:"
 
-curl -L -s --header "Authorization: ${API_KEY}" \
+curl -LsH "Authorization: ${API_KEY}" \
     --data "id=${DR_ORG_ID}&object=dr_admin&object_type=user&capacity=admin" \
     ${CKAN_ACTION_URL}/member_create
 
-curl -L -s --header "Authorization: ${API_KEY}" \
+curl -LsH "Authorization: ${API_KEY}" \
     --data "id=${DR_ORG_ID}&object=dr_editor&object_type=user&capacity=editor" \
     ${CKAN_ACTION_URL}/member_create
 
-curl -L -s --header "Authorization: ${API_KEY}" \
+curl -LsH "Authorization: ${API_KEY}" \
     --data "id=${DR_ORG_ID}&object=dr_member&object_type=user&capacity=member" \
     ${CKAN_ACTION_URL}/member_create
 
 
 echo "Creating test Data Request:"
 
-curl -L -s --header "Authorization: ${API_KEY}" \
+curl -LsH "Authorization: ${API_KEY}" \
     --data "title=Test Request&description=This is an example&organization_id=${DR_ORG_ID}" \
     ${CKAN_ACTION_URL}/create_datarequest
 
 echo "Creating closed Data Request:"
 
 Closed_DR=$( \
-    curl -L -s \
-    --header "Authorization: ${API_KEY}" \
+    curl -LsH "Authorization: ${API_KEY}" \
     --data "title=Closed Request&description=This is an example&organization_id=${DR_ORG_ID}" \
     ${CKAN_ACTION_URL}/create_datarequest \
 )
@@ -129,7 +130,7 @@ echo $CLOSE_DR_ID
 
 echo "Closing Data Request:"
 
-curl -L -s --header "Authorization: ${API_KEY}" \
+curl -LsH "Authorization: ${API_KEY}" \
     --data "id=${CLOSE_DR_ID}&close_circumstance=Requestor initiated closure" \
     ${CKAN_ACTION_URL}/close_datarequest
 
@@ -138,21 +139,24 @@ curl -L -s --header "Authorization: ${API_KEY}" \
 #
 
 # Use CKAN's built-in commands for creating some test datasets...
-$CKAN_CLI create-test-data
+ckan_cli create-test-data
 
 # Datasets need to be assigned to an organisation
 
 echo "Assigning test Datasets to Organisation open-data-administration-data-requests..."
 
-curl -L -s -q --header "Authorization: ${API_KEY}" \
+curl -LsH "Authorization: ${API_KEY}" \
     --data "id=annakarenina&owner_org=${DR_ORG_ID}" \
     ${CKAN_ACTION_URL}/package_patch >> /dev/null
 
-curl -L -s -q --header "Authorization: ${API_KEY}" \
+curl -LsH "Authorization: ${API_KEY}" \
     --data "id=warandpeace&owner_org=${DR_ORG_ID}" \
     ${CKAN_ACTION_URL}/package_patch >> /dev/null
 ##
 # END.
 #
 
-deactivate
+
+if [ "$VENV_DIR" != "" ]; then
+  deactivate
+fi
diff --git a/.docker/scripts/init-ext.sh b/.docker/scripts/init-ext.sh
index 8cf19e79..c6b00ec9 100755
--- a/.docker/scripts/init-ext.sh
+++ b/.docker/scripts/init-ext.sh
@@ -4,13 +4,17 @@
 #
 set -e
 
-PIP="${APP_DIR}/bin/pip"
-cd $WORKDIR
-$PIP install -r "requirements.txt"
-$PIP install -r "requirements-dev.txt"
-$APP_DIR/bin/python setup.py develop
+if [ "$VENV_DIR" != "" ]; then
+  . ${VENV_DIR}/bin/activate
+fi
+pip install -r "requirements-dev.txt"
+pip install -r "requirements.txt"
+python setup.py develop
 installed_name=$(grep '^\s*name=' setup.py |sed "s|[^']*'\([-a-zA-Z0-9]*\)'.*|\1|")
 
 # Validate that the extension was installed correctly.
-if ! $PIP list | grep "$installed_name" > /dev/null; then echo "Unable to find the extension in the list"; exit 1; fi
+if ! pip list | grep "$installed_name" > /dev/null; then echo "Unable to find the extension in the list"; exit 1; fi
 
+if [ "$VENV_DIR" != "" ]; then
+  deactivate
+fi
diff --git a/.docker/scripts/init.sh b/.docker/scripts/init.sh
index bb11c541..76da76ae 100755
--- a/.docker/scripts/init.sh
+++ b/.docker/scripts/init.sh
@@ -9,27 +9,30 @@ CKAN_DISPLAY_NAME="${CKAN_DISPLAY_NAME:-Administrator}"
 CKAN_USER_PASSWORD="${CKAN_USER_PASSWORD:-password}"
 CKAN_USER_EMAIL="${CKAN_USER_EMAIL:-admin@localhost}"
 
-. ${APP_DIR}/bin/activate
-CKAN_CLI=$WORKDIR/scripts/ckan_cli
-$CKAN_CLI db clean
-$CKAN_CLI db init
-$CKAN_CLI user add "${CKAN_USER_NAME}"\
+if [ "$VENV_DIR" != "" ]; then
+  . ${VENV_DIR}/bin/activate
+fi
+ckan_cli db clean
+ckan_cli db init
+ckan_cli user add "${CKAN_USER_NAME}"\
  fullname="${CKAN_DISPLAY_NAME}"\
  email="${CKAN_USER_EMAIL}"\
  password="${CKAN_USER_PASSWORD}"
-$CKAN_CLI sysadmin add "${CKAN_USER_NAME}"
+ckan_cli sysadmin add "${CKAN_USER_NAME}"
 
 # Initialise the Comments database tables
-PASTER_PLUGIN=ckanext-ytp-comments $CKAN_CLI initdb
+PASTER_PLUGIN=ckanext-ytp-comments ckan_cli initdb
+PASTER_PLUGIN=ckanext-ytp-comments ckan_cli updatedb
+PASTER_PLUGIN=ckanext-ytp-comments ckan_cli init_notifications_db
 
 # Initialise the archiver database tables
-PASTER_PLUGIN=ckanext-archiver $CKAN_CLI archiver init
+PASTER_PLUGIN=ckanext-archiver ckan_cli archiver init
 
 # Initialise the reporting database tables
-PASTER_PLUGIN=ckanext-report $CKAN_CLI report initdb
+PASTER_PLUGIN=ckanext-report ckan_cli report initdb
 
 # Initialise the QA database tables
-PASTER_PLUGIN=ckanext-qa $CKAN_CLI qa init
+PASTER_PLUGIN=ckanext-qa ckan_cli qa init
 
 # Create some base test data
-. $WORKDIR/scripts/create-test-data.sh
+. $APP_DIR/scripts/create-test-data.sh
diff --git a/.docker/scripts/serve.sh b/.docker/scripts/serve.sh
index d95eeb70..48eab40b 100755
--- a/.docker/scripts/serve.sh
+++ b/.docker/scripts/serve.sh
@@ -6,7 +6,9 @@ dockerize -wait tcp://solr:8983 -timeout 1m
 
 sed -i "s@SITE_URL@${SITE_URL}@g" $CKAN_INI
 
-. ${APP_DIR}/bin/activate
+if [ "$VENV_DIR" != "" ]; then
+  . ${VENV_DIR}/bin/activate
+fi
 if (which ckan > /dev/null); then
     ckan -c ${CKAN_INI} run
 else
diff --git a/.docker/test.ini b/.docker/test.ini
index 5bdbfc86..3a7332a8 100644
--- a/.docker/test.ini
+++ b/.docker/test.ini
@@ -92,7 +92,7 @@ ckan.redis.url = redis://redis:6379
 
 # Note: Add ``datastore`` to enable the CKAN DataStore
 #       Add ``datapusher`` to enable DataPusher
-#       Add ``resource_proxy`` to enable resorce proxying and get around the
+#       Add ``resource_proxy`` to enable resource proxying and get around the
 #       same origin policy
 # @todo:setup Cleanup the list to use only required plugins.
 ckan.plugins = stats text_view image_view recline_view datastore data_qld_theme datarequests data_qld_resources data_qld_integration ytp_comments qa archiver report
diff --git a/.env b/.env
index a209c7f7..8aeda729 100644
--- a/.env
+++ b/.env
@@ -13,7 +13,7 @@
 PROJECT="ckanext-datarequests"
 
 # Docker Compose project name. All containers will have this name.
-COMPOSE_PROJECT_NAME="ckanext-datarequests"
+COMPOSE_PROJECT_NAME="$PROJECT"
 
 # Flag to allow code linting failures.
 ALLOW_LINT_FAIL=1
diff --git a/.flake8 b/.flake8
index 09a146e3..9653307b 100644
--- a/.flake8
+++ b/.flake8
@@ -19,3 +19,4 @@ ignore =
     E266
     E501
     C901
+    W503
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 0f930485..5d96e918 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -25,3 +25,16 @@ jobs:
       - name: Test
         run: .circleci/test.sh
         timeout-minutes: 15
+
+      - name: Retrieve screenshots
+        if: failure()
+        run: .circleci/process-artifacts.sh
+        timeout-minutes: 1
+
+      - name: Upload screenshots
+        if: failure()
+        uses: actions/upload-artifact@v2
+        with:
+          name: screenshots
+          path: /tmp/artifacts/behave/screenshots
+        timeout-minutes: 1
diff --git a/docker-compose.yml b/docker-compose.yml
index 5d1be01a..ae390e50 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '2.3'
 
 x-project:
-  &project ckanext-datarequests
+  &project "${PROJECT}"
 
 x-volumes:
   &default-volumes
@@ -29,7 +29,7 @@ services:
       context: .
       dockerfile: .docker/Dockerfile.ckan
       args:
-        SITE_URL: http://ckanext-datarequests.docker.amazee.io
+        SITE_URL: "http://${PROJECT}.docker.amazee.io"
     depends_on:
       - postgres
       - solr
@@ -43,8 +43,8 @@ services:
     environment:
       <<: *default-environment
       AMAZEEIO_HTTP_PORT: 3000
-      LAGOON_LOCALDEV_URL: http://ckanext-datarequests.docker.amazee.io
-      AMAZEEIO_URL: ckanext-datarequests.docker.amazee.io
+      LAGOON_LOCALDEV_URL: "http://${PROJECT}.docker.amazee.io"
+      AMAZEEIO_URL: "${PROJECT}.docker.amazee.io"
 
   postgres:
     image: amazeeio/postgres-ckan

From 2827a13f47da162b2b0ebef4ec477df43b52c47a Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Wed, 16 Jun 2021 10:09:24 +1000
Subject: [PATCH 091/276] [QOL-8053] oops fix Dockerfile syntax

- also install build-base just for consistency
---
 .docker/Dockerfile.ckan | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.docker/Dockerfile.ckan b/.docker/Dockerfile.ckan
index 4812b8ad..789bf9e1 100644
--- a/.docker/Dockerfile.ckan
+++ b/.docker/Dockerfile.ckan
@@ -9,7 +9,7 @@ ENV CKAN_INI=/app/ckan/default/production.ini
 WORKDIR "${APP_DIR}"
 
 ENV DOCKERIZE_VERSION v0.6.1
-RUN apk add --no-cache curl
+RUN apk add --no-cache curl build-base \
     && curl -s -L -O https://github.com/jwilder/dockerize/releases/download/${DOCKERIZE_VERSION}/dockerize-alpine-linux-amd64-${DOCKERIZE_VERSION}.tar.gz \
     && tar -C /usr/local/bin -xzvf dockerize-alpine-linux-amd64-${DOCKERIZE_VERSION}.tar.gz \
     && rm dockerize-alpine-linux-amd64-${DOCKERIZE_VERSION}.tar.gz

From edcf960cb014a44faca31c25d54c7fd27945ca74 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Wed, 16 Jun 2021 10:43:58 +1000
Subject: [PATCH 092/276] [QOL-8053] restart test containers after resetting DB

---
 .circleci/test.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.circleci/test.sh b/.circleci/test.sh
index a2d91da7..6bb34b45 100755
--- a/.circleci/test.sh
+++ b/.circleci/test.sh
@@ -12,4 +12,6 @@ ahoy test-unit
 
 echo "==> Run BDD tests"
 ahoy install-site
+ahoy down
+ahoy up
 ahoy test-bdd || (ahoy logs; exit 1)

From cb061a46f6a4e14d9ad39ffeaab566cc0d2eeee5 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Wed, 16 Jun 2021 11:39:57 +1000
Subject: [PATCH 093/276] [QOL-8053] remove DB reset between tests

---
 .circleci/test.sh | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.circleci/test.sh b/.circleci/test.sh
index 6bb34b45..9c584d9b 100755
--- a/.circleci/test.sh
+++ b/.circleci/test.sh
@@ -11,7 +11,4 @@ echo "==> Run Unit tests"
 ahoy test-unit
 
 echo "==> Run BDD tests"
-ahoy install-site
-ahoy down
-ahoy up
 ahoy test-bdd || (ahoy logs; exit 1)

From f7307369d7b30cae2550f38c2778ab01806a715c Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Wed, 16 Jun 2021 12:04:13 +1000
Subject: [PATCH 094/276] [QOL-8053] move user creation to 'test data' script
 and run it before BDD tests

---
 .circleci/test.sh                   |  1 +
 .docker/scripts/create-test-data.sh | 11 +++++++++++
 .docker/scripts/init.sh             | 10 ----------
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/.circleci/test.sh b/.circleci/test.sh
index 9c584d9b..46edb117 100755
--- a/.circleci/test.sh
+++ b/.circleci/test.sh
@@ -11,4 +11,5 @@ echo "==> Run Unit tests"
 ahoy test-unit
 
 echo "==> Run BDD tests"
+ahoy cli "./scripts/create-test-data.sh"
 ahoy test-bdd || (ahoy logs; exit 1)
diff --git a/.docker/scripts/create-test-data.sh b/.docker/scripts/create-test-data.sh
index b4ae99c2..d1c8ffb9 100644
--- a/.docker/scripts/create-test-data.sh
+++ b/.docker/scripts/create-test-data.sh
@@ -11,6 +11,17 @@ if [ "$VENV_DIR" != "" ]; then
   . ${VENV_DIR}/bin/activate
 fi
 
+CKAN_USER_NAME="${CKAN_USER_NAME:-admin}"
+CKAN_DISPLAY_NAME="${CKAN_DISPLAY_NAME:-Administrator}"
+CKAN_USER_PASSWORD="${CKAN_USER_PASSWORD:-password}"
+CKAN_USER_EMAIL="${CKAN_USER_EMAIL:-admin@localhost}"
+
+ckan_cli user add "${CKAN_USER_NAME}"\
+ fullname="${CKAN_DISPLAY_NAME}"\
+ email="${CKAN_USER_EMAIL}"\
+ password="${CKAN_USER_PASSWORD}"
+ckan_cli sysadmin add "${CKAN_USER_NAME}"
+
 # We know the "admin" sysadmin account exists, so we'll use her API KEY to create further data
 API_KEY=$(ckan_cli user admin | tr -d '\n' | sed -r 's/^(.*)apikey=(\S*)(.*)/\2/')
 
diff --git a/.docker/scripts/init.sh b/.docker/scripts/init.sh
index 76da76ae..681f3fe3 100755
--- a/.docker/scripts/init.sh
+++ b/.docker/scripts/init.sh
@@ -4,21 +4,11 @@
 #
 set -e
 
-CKAN_USER_NAME="${CKAN_USER_NAME:-admin}"
-CKAN_DISPLAY_NAME="${CKAN_DISPLAY_NAME:-Administrator}"
-CKAN_USER_PASSWORD="${CKAN_USER_PASSWORD:-password}"
-CKAN_USER_EMAIL="${CKAN_USER_EMAIL:-admin@localhost}"
-
 if [ "$VENV_DIR" != "" ]; then
   . ${VENV_DIR}/bin/activate
 fi
 ckan_cli db clean
 ckan_cli db init
-ckan_cli user add "${CKAN_USER_NAME}"\
- fullname="${CKAN_DISPLAY_NAME}"\
- email="${CKAN_USER_EMAIL}"\
- password="${CKAN_USER_PASSWORD}"
-ckan_cli sysadmin add "${CKAN_USER_NAME}"
 
 # Initialise the Comments database tables
 PASTER_PLUGIN=ckanext-ytp-comments ckan_cli initdb

From 5c101becbb2383a0ea3e9116fd50acfb07d57881 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Wed, 16 Jun 2021 12:26:11 +1000
Subject: [PATCH 095/276] [QOL-8053] adjust user creation

- robustly handle account already existing
- include full name when creating accounts
---
 .docker/scripts/create-test-data.sh | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/.docker/scripts/create-test-data.sh b/.docker/scripts/create-test-data.sh
index d1c8ffb9..b85108f4 100644
--- a/.docker/scripts/create-test-data.sh
+++ b/.docker/scripts/create-test-data.sh
@@ -16,10 +16,14 @@ CKAN_DISPLAY_NAME="${CKAN_DISPLAY_NAME:-Administrator}"
 CKAN_USER_PASSWORD="${CKAN_USER_PASSWORD:-password}"
 CKAN_USER_EMAIL="${CKAN_USER_EMAIL:-admin@localhost}"
 
-ckan_cli user add "${CKAN_USER_NAME}"\
- fullname="${CKAN_DISPLAY_NAME}"\
- email="${CKAN_USER_EMAIL}"\
- password="${CKAN_USER_PASSWORD}"
+add_user_if_needed () {
+    ckan_cli user "$1" | grep "$1" || ckan_cli user add "$1"\
+        fullname="$2"\
+        email="$3"\
+        password="$4"
+}
+
+add_user_if_needed "$CKAN_USER_NAME" "$CKAN_DISPLAY_NAME" "$CKAN_USER_PASSWORD" "$CKAN_USER_EMAIL"
 ckan_cli sysadmin add "${CKAN_USER_NAME}"
 
 # We know the "admin" sysadmin account exists, so we'll use her API KEY to create further data
@@ -49,10 +53,10 @@ TEST_ORG_TITLE="Test"
 
 echo "Creating test users for ${TEST_ORG_TITLE} Organisation:"
 
-ckan_cli user add ckan_user email=ckan_user@localhost password=password
-ckan_cli user add test_org_admin email=test_org_admin@localhost password=password
-ckan_cli user add test_org_editor email=test_org_editor@localhost password=password
-ckan_cli user add test_org_member email=test_org_member@localhost password=password
+add_user_if_needed ckan "CKAN User"_ckan_user@localhost password
+add_user_if_needed test_org_admin "Test Admin" test_org_admin@localhost password
+add_user_if_needed test_org_editor "Test Editor" test_org_editor@localhost password
+add_user_if_needed test_org_member "Test Member" test_org_member@localhost password
 
 echo "Creating ${TEST_ORG_TITLE} Organisation:"
 
@@ -90,9 +94,9 @@ DR_ORG_TITLE="Open Data Administration (data requests)"
 
 echo "Creating test users for ${DR_ORG_TITLE} Organisation:"
 
-ckan_cli user add dr_admin email=dr_admin@localhost password=password
-ckan_cli user add dr_editor email=dr_editor@localhost password=password
-ckan_cli user add dr_member email=dr_member@localhost password=password
+add_user_if_needed dr_admin "Data Request Admin" dr_admin@localhost password
+add_user_if_needed dr_editor "Data Request Editor" dr_editor@localhost password
+add_user_if_needed dr_member "Data Request Member" dr_member@localhost password
 
 echo "Creating ${DR_ORG_TITLE} Organisation:"
 

From 5b9935bd337028cc3090d87ea105d44bc9493f3e Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Wed, 16 Jun 2021 12:38:06 +1000
Subject: [PATCH 096/276] [QOL-8053] add debugging message for user creation

---
 .docker/scripts/create-test-data.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.docker/scripts/create-test-data.sh b/.docker/scripts/create-test-data.sh
index b85108f4..cac3fde3 100644
--- a/.docker/scripts/create-test-data.sh
+++ b/.docker/scripts/create-test-data.sh
@@ -17,6 +17,7 @@ CKAN_USER_PASSWORD="${CKAN_USER_PASSWORD:-password}"
 CKAN_USER_EMAIL="${CKAN_USER_EMAIL:-admin@localhost}"
 
 add_user_if_needed () {
+    echo "Adding user '$2' ($1) with email address [$4]"
     ckan_cli user "$1" | grep "$1" || ckan_cli user add "$1"\
         fullname="$2"\
         email="$3"\

From 392c7f8992db2873d5eeaa4a43a0f87e6b5c1924 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Wed, 16 Jun 2021 12:53:22 +1000
Subject: [PATCH 097/276] [QOL-8053] oops fix user creation argument order

---
 .docker/scripts/create-test-data.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.docker/scripts/create-test-data.sh b/.docker/scripts/create-test-data.sh
index cac3fde3..2899d09b 100644
--- a/.docker/scripts/create-test-data.sh
+++ b/.docker/scripts/create-test-data.sh
@@ -17,14 +17,14 @@ CKAN_USER_PASSWORD="${CKAN_USER_PASSWORD:-password}"
 CKAN_USER_EMAIL="${CKAN_USER_EMAIL:-admin@localhost}"
 
 add_user_if_needed () {
-    echo "Adding user '$2' ($1) with email address [$4]"
+    echo "Adding user '$2' ($1) with email address [$3]"
     ckan_cli user "$1" | grep "$1" || ckan_cli user add "$1"\
         fullname="$2"\
         email="$3"\
         password="$4"
 }
 
-add_user_if_needed "$CKAN_USER_NAME" "$CKAN_DISPLAY_NAME" "$CKAN_USER_PASSWORD" "$CKAN_USER_EMAIL"
+add_user_if_needed "$CKAN_USER_NAME" "$CKAN_DISPLAY_NAME" "$CKAN_USER_EMAIL" "$CKAN_USER_PASSWORD"
 ckan_cli sysadmin add "${CKAN_USER_NAME}"
 
 # We know the "admin" sysadmin account exists, so we'll use her API KEY to create further data

From 1cbfa60a8ad0fe18dc1cf9ec9d490622866dbe0c Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Wed, 16 Jun 2021 13:03:45 +1000
Subject: [PATCH 098/276] [QOL-8053] oops fix unwanted underscore

---
 .docker/scripts/create-test-data.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.docker/scripts/create-test-data.sh b/.docker/scripts/create-test-data.sh
index 2899d09b..0268ab59 100644
--- a/.docker/scripts/create-test-data.sh
+++ b/.docker/scripts/create-test-data.sh
@@ -54,7 +54,7 @@ TEST_ORG_TITLE="Test"
 
 echo "Creating test users for ${TEST_ORG_TITLE} Organisation:"
 
-add_user_if_needed ckan "CKAN User"_ckan_user@localhost password
+add_user_if_needed ckan "CKAN User" ckan_user@localhost password
 add_user_if_needed test_org_admin "Test Admin" test_org_admin@localhost password
 add_user_if_needed test_org_editor "Test Editor" test_org_editor@localhost password
 add_user_if_needed test_org_member "Test Member" test_org_member@localhost password

From 0d59338ddf6d0931f8d33cda7f58e051f8dd5e9a Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Wed, 23 Jun 2021 09:28:27 +1000
Subject: [PATCH 099/276] [QOL-8053] revert double creation of test data and
 debug email sending

---
 .ahoy.yml                      | 2 +-
 .circleci/process-artifacts.sh | 5 +++--
 .circleci/test.sh              | 1 -
 .github/workflows/test.yml     | 8 ++++++++
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/.ahoy.yml b/.ahoy.yml
index 47feeb3a..433d35e1 100644
--- a/.ahoy.yml
+++ b/.ahoy.yml
@@ -131,7 +131,7 @@ commands:
     usage: Starts email mock server used for email BDD tests
     cmd: |
       ahoy title 'Starting mailmock'
-      ahoy cli "cd /app/ckan/default/bin/ && ./mailmock -p 8025 -o /app/test/emails --no-stdout" # for debugging mailmock email output remove --no-stdout
+      ahoy cli 'cd ${VENV_DIR}/bin/ && ./mailmock -p 8025 -o ${APP_DIR}/test/emails --no-stdout' # for debugging mailmock email output remove --no-stdout
 
   stop-mailmock:
     usage: Stops email mock server used for email BDD tests
diff --git a/.circleci/process-artifacts.sh b/.circleci/process-artifacts.sh
index dc988af6..8144b742 100755
--- a/.circleci/process-artifacts.sh
+++ b/.circleci/process-artifacts.sh
@@ -6,8 +6,9 @@ set -e
 
 # Create screenshots directory in case it was not created before. This is to
 # avoid this script to fail when copying artifacts.
-ahoy cli "mkdir -p test/screenshots"
+ahoy cli "mkdir -p test/screenshots test/emails"
 
 # Copy from the app container to the build host for storage.
-mkdir -p /tmp/artifacts/behave/screenshots
+mkdir -p /tmp/artifacts/behave/screenshots /tmp/artifacts/behave/emails
 docker cp "$(docker-compose ps -q ckan)":/app/test/screenshots /tmp/artifacts/behave
+docker cp "$(docker-compose ps -q ckan)":/app/test/emails /tmp/artifacts/emails
diff --git a/.circleci/test.sh b/.circleci/test.sh
index 46edb117..9c584d9b 100755
--- a/.circleci/test.sh
+++ b/.circleci/test.sh
@@ -11,5 +11,4 @@ echo "==> Run Unit tests"
 ahoy test-unit
 
 echo "==> Run BDD tests"
-ahoy cli "./scripts/create-test-data.sh"
 ahoy test-bdd || (ahoy logs; exit 1)
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 5d96e918..6edc9d45 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -38,3 +38,11 @@ jobs:
           name: screenshots
           path: /tmp/artifacts/behave/screenshots
         timeout-minutes: 1
+
+      - name: Upload emails
+        if: failure()
+        uses: actions/upload-artifact@v2
+        with:
+          name: emails
+          path: /tmp/artifacts/behave/emails
+        timeout-minutes: 1

From af3874d1c4af0818803f969d2d9117d48d12dba0 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Wed, 23 Jun 2021 09:54:51 +1000
Subject: [PATCH 100/276] [QOL-8053] debug config location in ckan_cli script

---
 .docker/scripts/ckan_cli | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.docker/scripts/ckan_cli b/.docker/scripts/ckan_cli
index 88526ff9..fcc045fd 100644
--- a/.docker/scripts/ckan_cli
+++ b/.docker/scripts/ckan_cli
@@ -57,10 +57,10 @@ else
 fi
 
 if [ "$COMMAND" = "ckan" ]; then
-    echo "Using 'ckan' command from $ENV_DIR..." >&2
+    echo "Using 'ckan' command from $ENV_DIR with config ${CKAN_INI}..." >&2
     exec $ENV_DIR/ckan -c ${CKAN_INI} "$@"
 elif [ "$COMMAND" = "paster" ]; then
-    echo "Using 'paster' command from $ENV_DIR..." >&2
+    echo "Using 'paster' command from $ENV_DIR with config ${CKAN_INI}..." >&2
     exec $ENV_DIR/paster --plugin=$PASTER_PLUGIN "$@" -c ${CKAN_INI}
 else
     echo "Unable to locate 'ckan' or 'paster' command in $ENV_DIR" >&2

From 16265e4378aa889d64ce8bb71ed430f51e24b2fc Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Wed, 23 Jun 2021 09:55:16 +1000
Subject: [PATCH 101/276] [QOL-8053] avoid double quotes in potential
 screenshot names

---
 test/features/datarequest.feature | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/test/features/datarequest.feature b/test/features/datarequest.feature
index 89dfb7fe..6842f4fa 100644
--- a/test/features/datarequest.feature
+++ b/test/features/datarequest.feature
@@ -31,7 +31,7 @@ Feature: Datarequest
         And I should see "Description cannot be empty" within 1 seconds
 
 
-    Scenario Outline: Sysadmin or Admin users of the assigned organisation for a data request can see a "Re-open" button on the data request detail page for closed data requests
+    Scenario Outline: Sysadmin or Admin users of the assigned organisation for a data request can see a 'Re-open' button on the data request detail page for closed data requests
         Given "<User>" as the persona
         When I log in and go to datarequest page
         And I press "Closed Request"
@@ -43,7 +43,7 @@ Feature: Datarequest
         | DataRequestOrgAdmin   |
 
 
-    Scenario Outline: Non-admin users should not see "Re-open" button on the data request detail page for closed data requests
+    Scenario Outline: Non-admin users should not see 'Re-open' button on the data request detail page for closed data requests
         Given "<User>" as the persona
         When I log in and go to datarequest page
         And I press "Closed Request"
@@ -59,7 +59,7 @@ Feature: Datarequest
         | TestOrgMember         |
 
 
-    Scenario Outline: Data request creator, Sysadmin and Admin users of the assigned organisation for a data request can see a "Close" button on the data request detail page for opened data requests
+    Scenario Outline: Data request creator, Sysadmin and Admin users of the assigned organisation for a data request can see a 'Close' button on the data request detail page for opened data requests
         Given "<User>" as the persona
         When I log in and go to datarequest page
         And I press "Test Request"
@@ -71,7 +71,7 @@ Feature: Datarequest
         | DataRequestOrgAdmin   |
 
 
-    Scenario Outline: Non admin users cannot not see a "Close" button on the data request detail page for opened data requests
+    Scenario Outline: Non admin users cannot see a 'Close' button on the data request detail page for opened data requests
         Given "<User>" as the persona
         When I log in and go to datarequest page
         And I press "Test Request"
@@ -134,4 +134,4 @@ Feature: Datarequest
         Then I should receive an email at "admin@localhost" with subject "Queensland Government Open Data - Data Request"
         And I should receive a base64 email at "admin@localhost" containing "A data request that was assigned to your organisation has been re-assigned to another organisation."
         And I should receive an email at "test_org_admin@localhost" with subject "Queensland Government Open Data - Data Request"
-        And I should receive a base64 email at "test_org_admin@localhost" containing "A new data request has been added and assigned to your organisation."
\ No newline at end of file
+        And I should receive a base64 email at "test_org_admin@localhost" containing "A new data request has been added and assigned to your organisation."

From f24d77d08d15328c4cf98a5d578e20eff69adc49 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Wed, 23 Jun 2021 09:55:41 +1000
Subject: [PATCH 102/276] [QOL-8053] fix logging reference to use specific log
 instead of module

---
 ckanext/datarequests/actions.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ckanext/datarequests/actions.py b/ckanext/datarequests/actions.py
index bf74d402..bf8c86d2 100644
--- a/ckanext/datarequests/actions.py
+++ b/ckanext/datarequests/actions.py
@@ -175,7 +175,7 @@ def _send_mail(user_ids, action_type, datarequest):
             mailer.mail_user(user_data, subject, body)
 
         except Exception:
-            logging.exception("Error sending notification to {0}".format(user_id))
+            log.exception("Error sending notification to {0}".format(user_id))
 
 
 def create_datarequest(context, data_dict):

From e04af7f9382a6912a37619bd4b90821c026af83d Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Wed, 23 Jun 2021 10:09:22 +1000
Subject: [PATCH 103/276] [QOL-8053] debug mailmock

---
 .ahoy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.ahoy.yml b/.ahoy.yml
index 433d35e1..2283d3b6 100644
--- a/.ahoy.yml
+++ b/.ahoy.yml
@@ -131,7 +131,7 @@ commands:
     usage: Starts email mock server used for email BDD tests
     cmd: |
       ahoy title 'Starting mailmock'
-      ahoy cli 'cd ${VENV_DIR}/bin/ && ./mailmock -p 8025 -o ${APP_DIR}/test/emails --no-stdout' # for debugging mailmock email output remove --no-stdout
+      ahoy cli 'mailmock -p 8025 -o ${APP_DIR}/test/emails' # for debugging mailmock email output remove --no-stdout
 
   stop-mailmock:
     usage: Stops email mock server used for email BDD tests

From 1cdea0d130bb9e48cc6e92203bbff87e2f6f6c5b Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Wed, 23 Jun 2021 11:35:13 +1000
Subject: [PATCH 104/276] [QOL-8053] fix artefact paths

---
 .ahoy.yml                           | 7 +++----
 .circleci/process-artifacts.sh      | 6 +++---
 .docker/scripts/create-test-data.sh | 1 -
 .github/workflows/test.yml          | 2 +-
 .gitignore                          | 1 +
 test/features/environment.py        | 3 ++-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.ahoy.yml b/.ahoy.yml
index 2283d3b6..22e6eabf 100644
--- a/.ahoy.yml
+++ b/.ahoy.yml
@@ -126,7 +126,6 @@ commands:
       ahoy stop-mailmock
       ahoy stop-ckan-job-worker
 
-
   start-mailmock:
     usage: Starts email mock server used for email BDD tests
     cmd: |
@@ -144,7 +143,7 @@ commands:
     cmd: |
       ahoy title 'Starting CKAN background job worker'
       ahoy cli "ckan_cli jobs clear && \
-                ckan_cli jobs worker default"
+                ckan_cli jobs worker"
 
   stop-ckan-job-worker:
     usage: Stops CKAN background job worker
@@ -186,5 +185,5 @@ entrypoint:
     export LAGOON_LOCALDEV_URL=http://ckanext-datarequests.docker.amazee.io
     [ -f .env ] && [ -s .env ] && export $(grep -v '^#' .env | xargs) && if [ -f .env.local ] && [ -s .env.local ]; then export $(grep -v '^#' .env.local | xargs); fi
     bash -e -c "$0" "$@"
-  - '{{cmd}}'
-  - '{{name}}'
+  - "{{cmd}}"
+  - "{{name}}"
diff --git a/.circleci/process-artifacts.sh b/.circleci/process-artifacts.sh
index 8144b742..6fec2b2b 100755
--- a/.circleci/process-artifacts.sh
+++ b/.circleci/process-artifacts.sh
@@ -9,6 +9,6 @@ set -e
 ahoy cli "mkdir -p test/screenshots test/emails"
 
 # Copy from the app container to the build host for storage.
-mkdir -p /tmp/artifacts/behave/screenshots /tmp/artifacts/behave/emails
-docker cp "$(docker-compose ps -q ckan)":/app/test/screenshots /tmp/artifacts/behave
-docker cp "$(docker-compose ps -q ckan)":/app/test/emails /tmp/artifacts/emails
+mkdir -p /tmp/artifacts/behave
+docker cp "$(docker-compose ps -q ckan)":/app/test/screenshots /tmp/artifacts/behave/
+docker cp "$(docker-compose ps -q ckan)":/app/test/emails /tmp/artifacts/behave/
diff --git a/.docker/scripts/create-test-data.sh b/.docker/scripts/create-test-data.sh
index 0268ab59..9f0dce26 100644
--- a/.docker/scripts/create-test-data.sh
+++ b/.docker/scripts/create-test-data.sh
@@ -1,4 +1,3 @@
-
 #!/usr/bin/env sh
 ##
 # Create some example content for extension BDD tests.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 6edc9d45..15663df9 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -10,7 +10,7 @@ jobs:
     strategy:
       fail-fast: false
 
-    name: Data Requests build
+    name: Continuous Integration build
     runs-on: ubuntu-latest
     container: integratedexperts/ci-builder
 
diff --git a/.gitignore b/.gitignore
index 5a643340..b834defd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,6 +40,7 @@ nosetests.xml
 coverage.xml
 
 # Translations
+*.mo
 *.pot
 
 # Django stuff:
diff --git a/test/features/environment.py b/test/features/environment.py
index 7ffa0e80..0a66e80d 100644
--- a/test/features/environment.py
+++ b/test/features/environment.py
@@ -19,7 +19,7 @@
         'email': u'admin@localhost',
         'password': u'password'
     },
-    'Unathenticated': {
+    'Unauthenticated': {
         'name': u'',
         'email': u'',
         'password': u''
@@ -70,6 +70,7 @@ def before_all(context):
     context.attachment_dir = os.path.join(ROOT_PATH, 'test/fixtures')
     # The path where emails can be found.
     context.mail_path = os.path.join(ROOT_PATH, 'test/emails')
+
     # Set base url for all relative links.
     context.base_url = BASE_URL
 

From 9cd72297d1c8bde4a9570654edf7e0e0c5045075 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Wed, 23 Jun 2021 11:53:46 +1000
Subject: [PATCH 105/276] [QOL-8053] fix CKAN username

---
 .docker/scripts/create-test-data.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.docker/scripts/create-test-data.sh b/.docker/scripts/create-test-data.sh
index 9f0dce26..8feb8026 100644
--- a/.docker/scripts/create-test-data.sh
+++ b/.docker/scripts/create-test-data.sh
@@ -53,7 +53,7 @@ TEST_ORG_TITLE="Test"
 
 echo "Creating test users for ${TEST_ORG_TITLE} Organisation:"
 
-add_user_if_needed ckan "CKAN User" ckan_user@localhost password
+add_user_if_needed ckan_user "CKAN User" ckan_user@localhost password
 add_user_if_needed test_org_admin "Test Admin" test_org_admin@localhost password
 add_user_if_needed test_org_editor "Test Editor" test_org_editor@localhost password
 add_user_if_needed test_org_member "Test Member" test_org_member@localhost password

From 4c7139a68c50aca8436467f2ff6e38bdbcd6d9e3 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Wed, 23 Jun 2021 12:22:07 +1000
Subject: [PATCH 106/276] [QOL-8053] capture default email directory for
 artefact upload

---
 .circleci/process-artifacts.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.circleci/process-artifacts.sh b/.circleci/process-artifacts.sh
index 6fec2b2b..56522cbf 100755
--- a/.circleci/process-artifacts.sh
+++ b/.circleci/process-artifacts.sh
@@ -10,5 +10,7 @@ ahoy cli "mkdir -p test/screenshots test/emails"
 
 # Copy from the app container to the build host for storage.
 mkdir -p /tmp/artifacts/behave
-docker cp "$(docker-compose ps -q ckan)":/app/test/screenshots /tmp/artifacts/behave/
-docker cp "$(docker-compose ps -q ckan)":/app/test/emails /tmp/artifacts/behave/
+CONTAINER="$(docker-compose ps -q ckan)"
+docker cp "$CONTAINER":test/screenshots /tmp/artifacts/behave/
+docker cp "$CONTAINER":test/emails /tmp/artifacts/behave/
+docker cp "$CONTAINER:mail/*" /tmp/artifacts/behave/emails/

From 190e64aec2d8be98041273091a3048a0f5bced2c Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Wed, 23 Jun 2021 12:39:52 +1000
Subject: [PATCH 107/276] [QOL-8053] revert 'docker cp' syntax

---
 .circleci/process-artifacts.sh | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/.circleci/process-artifacts.sh b/.circleci/process-artifacts.sh
index 56522cbf..c46225a6 100755
--- a/.circleci/process-artifacts.sh
+++ b/.circleci/process-artifacts.sh
@@ -10,7 +10,6 @@ ahoy cli "mkdir -p test/screenshots test/emails"
 
 # Copy from the app container to the build host for storage.
 mkdir -p /tmp/artifacts/behave
-CONTAINER="$(docker-compose ps -q ckan)"
-docker cp "$CONTAINER":test/screenshots /tmp/artifacts/behave/
-docker cp "$CONTAINER":test/emails /tmp/artifacts/behave/
-docker cp "$CONTAINER:mail/*" /tmp/artifacts/behave/emails/
+docker cp "$(docker-compose ps -q ckan)":test/screenshots /tmp/artifacts/behave/
+docker cp "$(docker-compose ps -q ckan)":test/emails /tmp/artifacts/behave/
+docker cp "$(docker-compose ps -q ckan)":"mail/*" /tmp/artifacts/behave/emails/

From 5c94651537955035db398c5f1ab667e8dceebce4 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Wed, 23 Jun 2021 12:53:31 +1000
Subject: [PATCH 108/276] [QOL-8053] use full path within container for 'docker
 cp'

---
 .circleci/process-artifacts.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.circleci/process-artifacts.sh b/.circleci/process-artifacts.sh
index c46225a6..e674014b 100755
--- a/.circleci/process-artifacts.sh
+++ b/.circleci/process-artifacts.sh
@@ -10,6 +10,6 @@ ahoy cli "mkdir -p test/screenshots test/emails"
 
 # Copy from the app container to the build host for storage.
 mkdir -p /tmp/artifacts/behave
-docker cp "$(docker-compose ps -q ckan)":test/screenshots /tmp/artifacts/behave/
-docker cp "$(docker-compose ps -q ckan)":test/emails /tmp/artifacts/behave/
-docker cp "$(docker-compose ps -q ckan)":"mail/*" /tmp/artifacts/behave/emails/
+docker cp "$(docker-compose ps -q ckan)":/app/test/screenshots /tmp/artifacts/behave/
+docker cp "$(docker-compose ps -q ckan)":/app/test/emails /tmp/artifacts/behave/
+docker cp "$(docker-compose ps -q ckan)":"/app/mail/*" /tmp/artifacts/behave/emails/

From aff9a31c1f47cb4e9cbfbe600a4a43be9e44eddc Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Wed, 23 Jun 2021 13:08:08 +1000
Subject: [PATCH 109/276] [QOL-8053] fix mail path

---
 .circleci/process-artifacts.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/process-artifacts.sh b/.circleci/process-artifacts.sh
index e674014b..61d3ee0a 100755
--- a/.circleci/process-artifacts.sh
+++ b/.circleci/process-artifacts.sh
@@ -6,10 +6,10 @@ set -e
 
 # Create screenshots directory in case it was not created before. This is to
 # avoid this script to fail when copying artifacts.
-ahoy cli "mkdir -p test/screenshots test/emails"
+ahoy cli "mkdir -p test/screenshots test/emails mail"
 
 # Copy from the app container to the build host for storage.
 mkdir -p /tmp/artifacts/behave
 docker cp "$(docker-compose ps -q ckan)":/app/test/screenshots /tmp/artifacts/behave/
 docker cp "$(docker-compose ps -q ckan)":/app/test/emails /tmp/artifacts/behave/
-docker cp "$(docker-compose ps -q ckan)":"/app/mail/*" /tmp/artifacts/behave/emails/
+docker cp "$(docker-compose ps -q ckan)":/app/mail /tmp/artifacts/behave/emails/

From ec5f1fce867fcf49c29627996ba0be35441e32fb Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Wed, 23 Jun 2021 13:49:12 +1000
Subject: [PATCH 110/276] [QOL-8053] debug BDD test directory

---
 .circleci/test.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/test.sh b/.circleci/test.sh
index 9c584d9b..782f3cd9 100755
--- a/.circleci/test.sh
+++ b/.circleci/test.sh
@@ -11,4 +11,4 @@ echo "==> Run Unit tests"
 ahoy test-unit
 
 echo "==> Run BDD tests"
-ahoy test-bdd || (ahoy logs; exit 1)
+ahoy test-bdd || (ahoy cli 'ls -l $APP_DIR/*'; ahoy logs; exit 1)

From 1e6cafc1db67aad8a4189cbeb5609c54f88c9864 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Wed, 23 Jun 2021 14:02:51 +1000
Subject: [PATCH 111/276] [QOL-8053] debug BDD test directory

---
 .circleci/test.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/test.sh b/.circleci/test.sh
index 782f3cd9..739aa5d3 100755
--- a/.circleci/test.sh
+++ b/.circleci/test.sh
@@ -11,4 +11,4 @@ echo "==> Run Unit tests"
 ahoy test-unit
 
 echo "==> Run BDD tests"
-ahoy test-bdd || (ahoy cli 'ls -l $APP_DIR/*'; ahoy logs; exit 1)
+ahoy test-bdd || (ahoy cli 'ls -l $APP_DIR/test/*'; ahoy logs; exit 1)

From 07f65586936074a980c6b4af05bad7c681d062b2 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Wed, 23 Jun 2021 14:34:31 +1000
Subject: [PATCH 112/276] [QOL-8053] update Redis container for tests

- test output shows a Redis error that might be resolved in a newer container version
---
 docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index ae390e50..2a2577ba 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -69,7 +69,7 @@ services:
       <<: *default-environment
 
   redis:
-    image: redis:3
+    image: redis:6
     <<: *default-user
     environment:
       <<: *default-environment

From cd1a7cce82ae34e4e810561a8f89d76921967aab Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Wed, 23 Jun 2021 15:07:38 +1000
Subject: [PATCH 113/276] [QOL-8053] use Alpine-based Redis container

- Redis errors might be coming from AppArmor which Alpine may not have
---
 docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 2a2577ba..15417d94 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -69,7 +69,7 @@ services:
       <<: *default-environment
 
   redis:
-    image: redis:6
+    image: redis:6-alpine
     <<: *default-user
     environment:
       <<: *default-environment

From 7f70c2f8ff475b8e20117e673ddbccccb663894b Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Wed, 23 Jun 2021 15:24:58 +1000
Subject: [PATCH 114/276] [QOL-8053] update Redis database to match core
 settings

---
 .docker/test.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.docker/test.ini b/.docker/test.ini
index 3a7332a8..bb09f062 100644
--- a/.docker/test.ini
+++ b/.docker/test.ini
@@ -76,7 +76,7 @@ solr_url = http://solr:8983/solr/ckan
 ## Redis Settings
 
 # URL to your Redis instance, including the database to be used.
-ckan.redis.url = redis://redis:6379
+ckan.redis.url = redis://redis:6379/1
 
 
 ## CORS Settings

From fbf381285023e385ae113a2a69e7dfac9f05a779 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Wed, 23 Jun 2021 15:36:32 +1000
Subject: [PATCH 115/276] [QOL-8053] use local Redis instead of container

---
 .docker/Dockerfile.ckan | 2 +-
 .docker/test.ini        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.docker/Dockerfile.ckan b/.docker/Dockerfile.ckan
index 789bf9e1..da3ab0ed 100644
--- a/.docker/Dockerfile.ckan
+++ b/.docker/Dockerfile.ckan
@@ -9,7 +9,7 @@ ENV CKAN_INI=/app/ckan/default/production.ini
 WORKDIR "${APP_DIR}"
 
 ENV DOCKERIZE_VERSION v0.6.1
-RUN apk add --no-cache curl build-base \
+RUN apk add --no-cache curl redis build-base \
     && curl -s -L -O https://github.com/jwilder/dockerize/releases/download/${DOCKERIZE_VERSION}/dockerize-alpine-linux-amd64-${DOCKERIZE_VERSION}.tar.gz \
     && tar -C /usr/local/bin -xzvf dockerize-alpine-linux-amd64-${DOCKERIZE_VERSION}.tar.gz \
     && rm dockerize-alpine-linux-amd64-${DOCKERIZE_VERSION}.tar.gz
diff --git a/.docker/test.ini b/.docker/test.ini
index bb09f062..d4cb7abb 100644
--- a/.docker/test.ini
+++ b/.docker/test.ini
@@ -76,7 +76,7 @@ solr_url = http://solr:8983/solr/ckan
 ## Redis Settings
 
 # URL to your Redis instance, including the database to be used.
-ckan.redis.url = redis://redis:6379/1
+ckan.redis.url = redis://localhost:6379/1
 
 
 ## CORS Settings
@@ -159,7 +159,7 @@ smtp.mail_from = info@test.ckan.net
 
 ## Harvester settings
 ckan.harvest.mq.type = redis
-ckan.harvest.mq.hostname = redis
+ckan.harvest.mq.hostname = localhost
 ckan.harvest.mq.port = 6379
 ckan.harvest.mq.redis_db = 0
 

From e84834b939d33138ce2d24097a1dcccfa97a181a Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Wed, 23 Jun 2021 15:52:59 +1000
Subject: [PATCH 116/276] [QOL-8053] ensure local Redis is started

---
 .docker/Dockerfile.ckan  | 2 ++
 .docker/scripts/serve.sh | 1 +
 2 files changed, 3 insertions(+)

diff --git a/.docker/Dockerfile.ckan b/.docker/Dockerfile.ckan
index da3ab0ed..427d9342 100644
--- a/.docker/Dockerfile.ckan
+++ b/.docker/Dockerfile.ckan
@@ -14,6 +14,8 @@ RUN apk add --no-cache curl redis build-base \
     && tar -C /usr/local/bin -xzvf dockerize-alpine-linux-amd64-${DOCKERIZE_VERSION}.tar.gz \
     && rm dockerize-alpine-linux-amd64-${DOCKERIZE_VERSION}.tar.gz
 
+RUN rc-service redis start
+
 # Install CKAN.
 ENV CKAN_VERSION 2.8.8
 
diff --git a/.docker/scripts/serve.sh b/.docker/scripts/serve.sh
index 48eab40b..9f8e827c 100755
--- a/.docker/scripts/serve.sh
+++ b/.docker/scripts/serve.sh
@@ -3,6 +3,7 @@ set -e
 
 dockerize -wait tcp://postgres:5432 -timeout 1m
 dockerize -wait tcp://solr:8983 -timeout 1m
+dockerize -wait tcp://localhost:6379 -timeout 1m
 
 sed -i "s@SITE_URL@${SITE_URL}@g" $CKAN_INI
 

From 1913e4c1d7a6043516b9f41a360fbbef43900a38 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Wed, 23 Jun 2021 16:05:45 +1000
Subject: [PATCH 117/276] [QOL-8053] start test Redis in serve script instead
 of Dockerfile

---
 .docker/Dockerfile.ckan  | 2 --
 .docker/scripts/serve.sh | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.docker/Dockerfile.ckan b/.docker/Dockerfile.ckan
index 427d9342..da3ab0ed 100644
--- a/.docker/Dockerfile.ckan
+++ b/.docker/Dockerfile.ckan
@@ -14,8 +14,6 @@ RUN apk add --no-cache curl redis build-base \
     && tar -C /usr/local/bin -xzvf dockerize-alpine-linux-amd64-${DOCKERIZE_VERSION}.tar.gz \
     && rm dockerize-alpine-linux-amd64-${DOCKERIZE_VERSION}.tar.gz
 
-RUN rc-service redis start
-
 # Install CKAN.
 ENV CKAN_VERSION 2.8.8
 
diff --git a/.docker/scripts/serve.sh b/.docker/scripts/serve.sh
index 9f8e827c..43aa2d95 100755
--- a/.docker/scripts/serve.sh
+++ b/.docker/scripts/serve.sh
@@ -1,6 +1,8 @@
 #!/usr/bin/env sh
 set -e
 
+redis-server &
+
 dockerize -wait tcp://postgres:5432 -timeout 1m
 dockerize -wait tcp://solr:8983 -timeout 1m
 dockerize -wait tcp://localhost:6379 -timeout 1m

From a52dab8c37e9b0220d5a9a7c5482189178455f88 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Wed, 23 Jun 2021 16:20:06 +1000
Subject: [PATCH 118/276] [QOL-8053] locate emails on disk if any

---
 .circleci/test.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/test.sh b/.circleci/test.sh
index 739aa5d3..58b4d173 100755
--- a/.circleci/test.sh
+++ b/.circleci/test.sh
@@ -11,4 +11,4 @@ echo "==> Run Unit tests"
 ahoy test-unit
 
 echo "==> Run BDD tests"
-ahoy test-bdd || (ahoy cli 'ls -l $APP_DIR/test/*'; ahoy logs; exit 1)
+ahoy test-bdd || (ahoy cli 'find / -type d -name "*mail*"'; ahoy logs; exit 1)

From f71f2bcb4555283188a29975afa7984e879c2c20 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Wed, 23 Jun 2021 16:25:33 +1000
Subject: [PATCH 119/276] [QOL-8053] don't try to match email subjects

---
 test/features/datarequest.feature | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/features/datarequest.feature b/test/features/datarequest.feature
index 6842f4fa..20185d1f 100644
--- a/test/features/datarequest.feature
+++ b/test/features/datarequest.feature
@@ -91,9 +91,9 @@ Feature: Datarequest
         Given "TestOrgEditor" as the persona
         When I log in and create a datarequest 
         When I wait for 3 seconds
-        Then I should receive an email at "dr_admin@localhost" with subject "Queensland Government Open Data - Data Request"
+        #Then I should receive an email at "dr_admin@localhost" with subject "Queensland Government Open Data - Data Request"
         And I should receive a base64 email at "dr_admin@localhost" containing "A new data request has been added and assigned to your organisation."
-        And I should receive an email at "admin@localhost" with subject "Queensland Government Open Data - Data Request"
+        #And I should receive an email at "admin@localhost" with subject "Queensland Government Open Data - Data Request"
         And I should receive a base64 email at "admin@localhost" containing "A new data request has been added and assigned to your organisation."
 
 

From 60d04de5aedd6a3a9b9e562644ac2882654ec965 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Wed, 23 Jun 2021 17:00:58 +1000
Subject: [PATCH 120/276] [QOL-8053] don't try to match email subjects since
 they have encoding issues

---
 test/features/datarequest.feature | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/test/features/datarequest.feature b/test/features/datarequest.feature
index 20185d1f..b2fedf9b 100644
--- a/test/features/datarequest.feature
+++ b/test/features/datarequest.feature
@@ -91,9 +91,7 @@ Feature: Datarequest
         Given "TestOrgEditor" as the persona
         When I log in and create a datarequest 
         When I wait for 3 seconds
-        #Then I should receive an email at "dr_admin@localhost" with subject "Queensland Government Open Data - Data Request"
-        And I should receive a base64 email at "dr_admin@localhost" containing "A new data request has been added and assigned to your organisation."
-        #And I should receive an email at "admin@localhost" with subject "Queensland Government Open Data - Data Request"
+        Then I should receive a base64 email at "dr_admin@localhost" containing "A new data request has been added and assigned to your organisation."
         And I should receive a base64 email at "admin@localhost" containing "A new data request has been added and assigned to your organisation."
 
 
@@ -104,8 +102,7 @@ Feature: Datarequest
         And I select "Requestor initiated closure" from "close_circumstance" 
         And I press the element with xpath "//button[contains(string(), 'Close data request')]"
         When I wait for 3 seconds
-        Then I should receive an email at "dr_admin@localhost" with subject "Queensland Government Open Data - Data Request"
-        And I should receive a base64 email at "dr_admin@localhost" containing "Your data request has been closed."
+        Then I should receive a base64 email at "dr_admin@localhost" containing "Your data request has been closed."
 
 
     Scenario: Re-Opening a data request will email the Admin users of the organisation and creator
@@ -116,9 +113,7 @@ Feature: Datarequest
         And I press the element with xpath "//button[contains(string(), 'Close data request')]"
         And I press the element with xpath "//a[@class='btn btn-success' and contains(string(), ' Re-open')]"
         When I wait for 3 seconds
-        Then I should receive an email at "dr_admin@localhost" with subject "Queensland Government Open Data - Data Request"
-        And I should receive a base64 email at "dr_admin@localhost" containing "Your data request has been re-opened."
-        And I should receive an email at "admin@localhost" with subject "Queensland Government Open Data - Data Request"
+        Then I should receive a base64 email at "dr_admin@localhost" containing "Your data request has been re-opened."
         And I should receive a base64 email at "admin@localhost" containing "A data request assigned to your organisation has been re-opened."
 
 
@@ -131,7 +126,5 @@ Feature: Datarequest
         Then I execute the script "document.getElementById('field-organizations').value = document.getElementById('field-organizations').options[1].value"
         And I press the element with xpath "//button[contains(string(), 'Update data request')]"
         When I wait for 3 seconds
-        Then I should receive an email at "admin@localhost" with subject "Queensland Government Open Data - Data Request"
-        And I should receive a base64 email at "admin@localhost" containing "A data request that was assigned to your organisation has been re-assigned to another organisation."
-        And I should receive an email at "test_org_admin@localhost" with subject "Queensland Government Open Data - Data Request"
+        Then I should receive a base64 email at "admin@localhost" containing "A data request that was assigned to your organisation has been re-assigned to another organisation."
         And I should receive a base64 email at "test_org_admin@localhost" containing "A new data request has been added and assigned to your organisation."

From 8d1f997ae285697c421b56d36d2cd7ceb3f1a4d6 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Wed, 23 Jun 2021 17:03:01 +1000
Subject: [PATCH 121/276] [QOL-8053] revert mailmock/Redis debugging changes

---
 .ahoy.yml                      | 2 +-
 .circleci/process-artifacts.sh | 4 +---
 .circleci/test.sh              | 2 +-
 .docker/Dockerfile.ckan        | 2 +-
 .docker/scripts/serve.sh       | 4 +---
 .docker/test.ini               | 4 ++--
 .github/workflows/test.yml     | 8 --------
 7 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/.ahoy.yml b/.ahoy.yml
index 22e6eabf..5413ff7b 100644
--- a/.ahoy.yml
+++ b/.ahoy.yml
@@ -130,7 +130,7 @@ commands:
     usage: Starts email mock server used for email BDD tests
     cmd: |
       ahoy title 'Starting mailmock'
-      ahoy cli 'mailmock -p 8025 -o ${APP_DIR}/test/emails' # for debugging mailmock email output remove --no-stdout
+      ahoy cli 'mailmock -p 8025 -o ${APP_DIR}/test/emails --no-stdout' # for debugging mailmock email output remove --no-stdout
 
   stop-mailmock:
     usage: Stops email mock server used for email BDD tests
diff --git a/.circleci/process-artifacts.sh b/.circleci/process-artifacts.sh
index 61d3ee0a..55bdbef9 100755
--- a/.circleci/process-artifacts.sh
+++ b/.circleci/process-artifacts.sh
@@ -6,10 +6,8 @@ set -e
 
 # Create screenshots directory in case it was not created before. This is to
 # avoid this script to fail when copying artifacts.
-ahoy cli "mkdir -p test/screenshots test/emails mail"
+ahoy cli "mkdir -p test/screenshots"
 
 # Copy from the app container to the build host for storage.
 mkdir -p /tmp/artifacts/behave
 docker cp "$(docker-compose ps -q ckan)":/app/test/screenshots /tmp/artifacts/behave/
-docker cp "$(docker-compose ps -q ckan)":/app/test/emails /tmp/artifacts/behave/
-docker cp "$(docker-compose ps -q ckan)":/app/mail /tmp/artifacts/behave/emails/
diff --git a/.circleci/test.sh b/.circleci/test.sh
index 58b4d173..9c584d9b 100755
--- a/.circleci/test.sh
+++ b/.circleci/test.sh
@@ -11,4 +11,4 @@ echo "==> Run Unit tests"
 ahoy test-unit
 
 echo "==> Run BDD tests"
-ahoy test-bdd || (ahoy cli 'find / -type d -name "*mail*"'; ahoy logs; exit 1)
+ahoy test-bdd || (ahoy logs; exit 1)
diff --git a/.docker/Dockerfile.ckan b/.docker/Dockerfile.ckan
index da3ab0ed..789bf9e1 100644
--- a/.docker/Dockerfile.ckan
+++ b/.docker/Dockerfile.ckan
@@ -9,7 +9,7 @@ ENV CKAN_INI=/app/ckan/default/production.ini
 WORKDIR "${APP_DIR}"
 
 ENV DOCKERIZE_VERSION v0.6.1
-RUN apk add --no-cache curl redis build-base \
+RUN apk add --no-cache curl build-base \
     && curl -s -L -O https://github.com/jwilder/dockerize/releases/download/${DOCKERIZE_VERSION}/dockerize-alpine-linux-amd64-${DOCKERIZE_VERSION}.tar.gz \
     && tar -C /usr/local/bin -xzvf dockerize-alpine-linux-amd64-${DOCKERIZE_VERSION}.tar.gz \
     && rm dockerize-alpine-linux-amd64-${DOCKERIZE_VERSION}.tar.gz
diff --git a/.docker/scripts/serve.sh b/.docker/scripts/serve.sh
index 43aa2d95..10f3dead 100755
--- a/.docker/scripts/serve.sh
+++ b/.docker/scripts/serve.sh
@@ -1,11 +1,9 @@
 #!/usr/bin/env sh
 set -e
 
-redis-server &
-
 dockerize -wait tcp://postgres:5432 -timeout 1m
 dockerize -wait tcp://solr:8983 -timeout 1m
-dockerize -wait tcp://localhost:6379 -timeout 1m
+dockerize -wait tcp://redis:6379 -timeout 1m
 
 sed -i "s@SITE_URL@${SITE_URL}@g" $CKAN_INI
 
diff --git a/.docker/test.ini b/.docker/test.ini
index d4cb7abb..3a7332a8 100644
--- a/.docker/test.ini
+++ b/.docker/test.ini
@@ -76,7 +76,7 @@ solr_url = http://solr:8983/solr/ckan
 ## Redis Settings
 
 # URL to your Redis instance, including the database to be used.
-ckan.redis.url = redis://localhost:6379/1
+ckan.redis.url = redis://redis:6379
 
 
 ## CORS Settings
@@ -159,7 +159,7 @@ smtp.mail_from = info@test.ckan.net
 
 ## Harvester settings
 ckan.harvest.mq.type = redis
-ckan.harvest.mq.hostname = localhost
+ckan.harvest.mq.hostname = redis
 ckan.harvest.mq.port = 6379
 ckan.harvest.mq.redis_db = 0
 
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 15663df9..89fa60d7 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -38,11 +38,3 @@ jobs:
           name: screenshots
           path: /tmp/artifacts/behave/screenshots
         timeout-minutes: 1
-
-      - name: Upload emails
-        if: failure()
-        uses: actions/upload-artifact@v2
-        with:
-          name: emails
-          path: /tmp/artifacts/behave/emails
-        timeout-minutes: 1

From 657db1e570f1330d7203695b62162ba97dee8fda Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Thu, 24 Jun 2021 10:30:48 +1000
Subject: [PATCH 122/276] [QOL-8053] refactor

- Extract helper functions to a separate module to avoid circular dependency during initialisation
---
 ckanext/datarequests/actions.py           |  4 +-
 ckanext/datarequests/common.py            | 43 +++++++++++++
 ckanext/datarequests/db.py                |  2 +-
 ckanext/datarequests/plugin.py            | 50 ++++-----------
 ckanext/datarequests/tests/test_common.py | 77 +++++++++++++++++++++++
 ckanext/datarequests/tests/test_plugin.py | 50 +--------------
 ckanext/datarequests/validator.py         |  9 ++-
 7 files changed, 140 insertions(+), 95 deletions(-)
 create mode 100644 ckanext/datarequests/common.py
 create mode 100644 ckanext/datarequests/tests/test_common.py

diff --git a/ckanext/datarequests/actions.py b/ckanext/datarequests/actions.py
index bf8c86d2..73b0dcb0 100644
--- a/ckanext/datarequests/actions.py
+++ b/ckanext/datarequests/actions.py
@@ -18,16 +18,16 @@
 # along with CKAN Data Requests Extension. If not, see <http://www.gnu.org/licenses/>.
 
 
-import constants
 import datetime
 import cgi
 import db
 import logging
 import validator
 from ckan import model, plugins
+from ckan.common import config
 from ckan.lib import base, mailer
+from ckanext.datarequests import constants
 
-from pylons import config
 
 c = plugins.toolkit.c
 log = logging.getLogger(__name__)
diff --git a/ckanext/datarequests/common.py b/ckanext/datarequests/common.py
new file mode 100644
index 00000000..997a4bcd
--- /dev/null
+++ b/ckanext/datarequests/common.py
@@ -0,0 +1,43 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (c) 2021 Queensland Government
+
+# This file is part of CKAN Data Requests Extension.
+
+# CKAN Data Requests Extension is free software: you can redistribute it and/or
+# modify it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# CKAN Data Requests Extension is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+
+# You should have received a copy of the GNU Affero General Public License
+# along with CKAN Data Requests Extension. If not, see <http://www.gnu.org/licenses/>.
+
+from ckan.common import config
+import ckan.lib.helpers as h
+
+
+def get_config_bool_value(config_name, default_value=False):
+    value = config.get(config_name, default_value)
+    value = value if type(value) == bool else value != 'False'
+    return value
+
+
+def is_fontawesome_4():
+    if hasattr(h, 'ckan_version'):
+        ckan_version = float(h.ckan_version()[0:3])
+        return ckan_version >= 2.7
+    else:
+        return False
+
+
+def get_plus_icon():
+    return 'plus-square' if is_fontawesome_4() else 'plus-sign-alt'
+
+
+def get_question_icon():
+    return 'question-circle' if is_fontawesome_4() else 'question-sign'
diff --git a/ckanext/datarequests/db.py b/ckanext/datarequests/db.py
index e8306290..94538466 100644
--- a/ckanext/datarequests/db.py
+++ b/ckanext/datarequests/db.py
@@ -17,11 +17,11 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with CKAN Data Requests Extension. If not, see <http://www.gnu.org/licenses/>.
 
-import constants
 import sqlalchemy as sa
 import uuid
 import logging
 import ckan.plugins.toolkit as tk
+from ckanext.datarequests import constants
 
 from sqlalchemy import func, MetaData, DDL
 from sqlalchemy.sql.expression import or_
diff --git a/ckanext/datarequests/plugin.py b/ckanext/datarequests/plugin.py
index 863f4fcd..6312a6d4 100644
--- a/ckanext/datarequests/plugin.py
+++ b/ckanext/datarequests/plugin.py
@@ -17,41 +17,15 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with CKAN Data Requests Extension. If not, see <http://www.gnu.org/licenses/>.
 
-import ckan.lib.helpers as h
-import ckan.plugins as p
-import ckan.plugins.toolkit as tk
-import auth
-import actions
-import constants
-import helpers
 import os
 import six
 import sys
 
-from functools import partial
-from pylons import config
-
-
-def get_config_bool_value(config_name, default_value=False):
-    value = config.get(config_name, default_value)
-    value = value if type(value) == bool else value != 'False'
-    return value
-
-
-def is_fontawesome_4():
-    if hasattr(h, 'ckan_version'):
-        ckan_version = float(h.ckan_version()[0:3])
-        return ckan_version >= 2.7
-    else:
-        return False
-
-
-def get_plus_icon():
-    return 'plus-square' if is_fontawesome_4() else 'plus-sign-alt'
-
+import ckan.plugins as p
+import ckan.plugins.toolkit as tk
+from ckanext.datarequests import auth, actions, common, constants, helpers
 
-def get_question_icon():
-    return 'question-circle' if is_fontawesome_4() else 'question-sign'
+from functools import partial
 
 
 class DataRequestsPlugin(p.SingletonPlugin):
@@ -69,11 +43,11 @@ class DataRequestsPlugin(p.SingletonPlugin):
         pass
 
     def __init__(self, name=None):
-        self.comments_enabled = get_config_bool_value('ckan.datarequests.comments', True)
-        self._show_datarequests_badge = get_config_bool_value('ckan.datarequests.show_datarequests_badge')
+        self.comments_enabled = common.get_config_bool_value('ckan.datarequests.comments', True)
+        self._show_datarequests_badge = common.get_config_bool_value('ckan.datarequests.show_datarequests_badge')
         self.name = 'datarequests'
-        self.is_description_required = get_config_bool_value('ckan.datarequests.description_required', False)
-        self.closing_circumstances_enabled = get_config_bool_value('ckan.datarequests.enable_closing_circumstances', False)
+        self.is_description_required = common.get_config_bool_value('ckan.datarequests.description_required', False)
+        self.closing_circumstances_enabled = common.get_config_bool_value('ckan.datarequests.enable_closing_circumstances', False)
 
     ######################################################################
     ############################## IACTIONS ##############################
@@ -169,9 +143,9 @@ def before_map(self, mapper):
 
         # Show a Data Request
         m.connect('show_datarequest', '/{id}',
-                  action='show', conditions={'method': ['GET']}, ckan_icon=get_question_icon())
+                  action='show', conditions={'method': ['GET']}, ckan_icon=common.get_question_icon())
         m.connect('datarequest.show', '/{id}',
-                  action='show', conditions={'method': ['GET']}, ckan_icon=get_question_icon())
+                  action='show', conditions={'method': ['GET']}, ckan_icon=common.get_question_icon())
 
         # Update a Data Request
         m.connect('datarequest.update', '/edit/{id}',
@@ -204,7 +178,7 @@ def before_map(self, mapper):
                       action='delete_comment', conditions={'method': ['GET', 'POST']})
 
         list_datarequests_map = SubMapper(
-            controller_map, conditions={'method': ['GET']}, ckan_icon=get_question_icon())
+            controller_map, conditions={'method': ['GET']}, ckan_icon=common.get_question_icon())
 
         # Data Requests that belong to an organization
         list_datarequests_map.connect(
@@ -229,7 +203,7 @@ def get_helpers(self):
             'get_comments_badge': helpers.get_comments_badge,
             'get_open_datarequests_number': helpers.get_open_datarequests_number,
             'get_open_datarequests_badge': partial(helpers.get_open_datarequests_badge, self._show_datarequests_badge),
-            'get_plus_icon': get_plus_icon,
+            'get_plus_icon': common.get_plus_icon,
             'is_following_datarequest': helpers.is_following_datarequest,
             'is_description_required': self.is_description_required,
             'closing_circumstances_enabled': self.closing_circumstances_enabled,
diff --git a/ckanext/datarequests/tests/test_common.py b/ckanext/datarequests/tests/test_common.py
new file mode 100644
index 00000000..1cd069c9
--- /dev/null
+++ b/ckanext/datarequests/tests/test_common.py
@@ -0,0 +1,77 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (c) 2015 CoNWeT Lab., Universidad Politécnica de Madrid
+
+# This file is part of CKAN Data Requests Extension.
+
+# CKAN Data Requests Extension is free software: you can redistribute it and/or
+# modify it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# CKAN Data Requests Extension is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+
+# You should have received a copy of the GNU Affero General Public License
+# along with CKAN Data Requests Extension. If not, see <http://www.gnu.org/licenses/>.
+
+from ckanext.datarequests import common
+import unittest
+
+from mock import patch
+
+
+class DataRequestCommonTest(unittest.TestCase):
+
+    def setUp(self):
+        self.h_patch = patch('ckanext.datarequests.common.h')
+        self.h_mock = self.h_patch.start()
+
+    def tearDown(self):
+        self.h_patch.stop()
+
+    def test_is_fontawesome_4_false_ckan_version_does_not_exist(self):
+        delattr(self.h_mock, 'ckan_version')
+        self.assertFalse(common.is_fontawesome_4())
+
+    def test_is_fontawesome_4_false_old_ckan_version(self):
+        self.h_mock.ckan_version.return_value = '2.6.0'
+        self.assertFalse(common.is_fontawesome_4())
+
+    def test_is_fontawesome_4_true_new_ckan_version(self):
+        self.h_mock.ckan_version.return_value = '2.7.0'
+        self.assertTrue(common.is_fontawesome_4())
+
+    def test_get_plus_icon_new(self):
+
+        is_fontawesome_4_patch = patch('ckanext.datarequests.common.is_fontawesome_4', return_value=True)
+        is_fontawesome_4_patch.start()
+        self.addCleanup(is_fontawesome_4_patch.stop)
+
+        self.assertEquals('plus-square', common.get_plus_icon())
+
+    def test_get_plus_icon_old(self):
+
+        is_fontawesome_4_patch = patch('ckanext.datarequests.common.is_fontawesome_4', return_value=False)
+        is_fontawesome_4_patch.start()
+        self.addCleanup(is_fontawesome_4_patch.stop)
+
+        self.assertEquals('plus-sign-alt', common.get_plus_icon())
+
+    def test_get_question_icon_new(self):
+
+        is_fontawesome_4_patch = patch('ckanext.datarequests.common.is_fontawesome_4', return_value=True)
+        is_fontawesome_4_patch.start()
+        self.addCleanup(is_fontawesome_4_patch.stop)
+
+        self.assertEquals('question-circle', common.get_question_icon())
+
+    def test_get_question_icon_old(self):
+
+        is_fontawesome_4_patch = patch('ckanext.datarequests.common.is_fontawesome_4', return_value=False)
+        is_fontawesome_4_patch.start()
+        self.addCleanup(is_fontawesome_4_patch.stop)
+
+        self.assertEquals('question-sign', common.get_question_icon())
diff --git a/ckanext/datarequests/tests/test_plugin.py b/ckanext/datarequests/tests/test_plugin.py
index a3f4b78b..63e21e8b 100644
--- a/ckanext/datarequests/tests/test_plugin.py
+++ b/ckanext/datarequests/tests/test_plugin.py
@@ -49,9 +49,6 @@ def setUp(self):
         self.partial_patch = patch('ckanext.datarequests.plugin.partial')
         self.partial_mock = self.partial_patch.start()
 
-        self.h_patch = patch('ckanext.datarequests.plugin.h')
-        self.h_mock = self.h_patch.start()
-
         self.create_datarequest = constants.CREATE_DATAREQUEST
         self.show_datarequest = constants.SHOW_DATAREQUEST
         self.update_datarequest = constants.UPDATE_DATAREQUEST
@@ -72,51 +69,6 @@ def tearDown(self):
         self.config_patch.stop()
         self.helpers_patch.stop()
         self.partial_patch.stop()
-        self.h_patch.stop()
-
-    def test_is_fontawesome_4_false_ckan_version_does_not_exist(self):
-        delattr(self.h_mock, 'ckan_version')
-        self.assertFalse(plugin.is_fontawesome_4())
-
-    def test_is_fontawesome_4_false_old_ckan_version(self):
-        self.h_mock.ckan_version.return_value = '2.6.0'
-        self.assertFalse(plugin.is_fontawesome_4())
-
-    def test_is_fontawesome_4_true_new_ckan_version(self):
-        self.h_mock.ckan_version.return_value = '2.7.0'
-        self.assertTrue(plugin.is_fontawesome_4())
-
-    def test_get_plus_icon_new(self):
-
-        is_fontawesome_4_patch = patch('ckanext.datarequests.plugin.is_fontawesome_4', return_value=True)
-        is_fontawesome_4_patch.start()
-        self.addCleanup(is_fontawesome_4_patch.stop)
-
-        self.assertEquals('plus-square', plugin.get_plus_icon())
-
-    def test_get_plus_icon_old(self):
-
-        is_fontawesome_4_patch = patch('ckanext.datarequests.plugin.is_fontawesome_4', return_value=False)
-        is_fontawesome_4_patch.start()
-        self.addCleanup(is_fontawesome_4_patch.stop)
-
-        self.assertEquals('plus-sign-alt', plugin.get_plus_icon())
-
-    def test_get_question_icon_new(self):
-
-        is_fontawesome_4_patch = patch('ckanext.datarequests.plugin.is_fontawesome_4', return_value=True)
-        is_fontawesome_4_patch.start()
-        self.addCleanup(is_fontawesome_4_patch.stop)
-
-        self.assertEquals('question-circle', plugin.get_question_icon())
-
-    def test_get_question_icon_old(self):
-
-        is_fontawesome_4_patch = patch('ckanext.datarequests.plugin.is_fontawesome_4', return_value=False)
-        is_fontawesome_4_patch.start()
-        self.addCleanup(is_fontawesome_4_patch.stop)
-
-        self.assertEquals('question-sign', plugin.get_question_icon())
 
     @parameterized.expand([
         ('True',),
@@ -203,7 +155,7 @@ def test_before_map(self, comments_enabled):
         self.plg_instance = plugin.DataRequestsPlugin()
 
         mock_icon = 'icon'
-        get_question_icon_patch = patch('ckanext.datarequests.plugin.get_question_icon', return_value=mock_icon)
+        get_question_icon_patch = patch('ckanext.datarequests.common.get_question_icon', return_value=mock_icon)
         get_question_icon_patch.start()
         self.addCleanup(get_question_icon_patch.stop)
 
diff --git a/ckanext/datarequests/validator.py b/ckanext/datarequests/validator.py
index b523df04..a723b1d5 100644
--- a/ckanext/datarequests/validator.py
+++ b/ckanext/datarequests/validator.py
@@ -17,12 +17,11 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with CKAN Data Requests Extension. If not, see <http://www.gnu.org/licenses/>.
 
-import constants
-import ckan.plugins.toolkit as tk
-from ckanext.datarequests import db
-import plugin as datarequests
 import datetime
 
+import ckan.plugins.toolkit as tk
+from ckanext.datarequests import db, common, constants
+
 
 def validate_datarequest(context, request_data):
 
@@ -43,7 +42,7 @@ def validate_datarequest(context, request_data):
             errors[tk._('Title')] = [tk._('That title is already in use')]
 
     # Check description
-    if datarequests.get_config_bool_value('ckan.datarequests.description_required', False) and not request_data['description']:
+    if common.get_config_bool_value('ckan.datarequests.description_required', False) and not request_data['description']:
         errors[tk._('Description')] = [tk._('Description cannot be empty')]
 
     if len(request_data['description']) > constants.DESCRIPTION_MAX_LENGTH:

From 44c0fff6954176367b5b1673330b42c2d40ab266 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Thu, 24 Jun 2021 11:02:28 +1000
Subject: [PATCH 123/276] [QOL-7970] oops fix config location

---
 ckanext/datarequests/tests/test_plugin.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ckanext/datarequests/tests/test_plugin.py b/ckanext/datarequests/tests/test_plugin.py
index 63e21e8b..eae58063 100644
--- a/ckanext/datarequests/tests/test_plugin.py
+++ b/ckanext/datarequests/tests/test_plugin.py
@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with CKAN Data Requests Extension. If not, see <http://www.gnu.org/licenses/>.
 
-from ckanext.datarequests import plugin, constants
+from ckanext.datarequests import common, plugin, constants
 import unittest
 
 from mock import MagicMock, patch
@@ -40,7 +40,7 @@ def setUp(self):
         self.tk_patch = patch('ckanext.datarequests.plugin.tk')
         self.tk_mock = self.tk_patch.start()
 
-        self.config_patch = patch('ckanext.datarequests.plugin.config')
+        self.config_patch = patch('ckanext.datarequests.common.config')
         self.config_mock = self.config_patch.start()
 
         self.helpers_patch = patch('ckanext.datarequests.plugin.helpers')
@@ -79,7 +79,7 @@ def test_get_actions(self, comments_enabled):
         actions_len = TOTAL_ACTIONS if comments_enabled == 'True' else ACTIONS_NO_COMMENTS
 
         # Configure config and create instance
-        plugin.config.get.return_value = comments_enabled
+        common.config.get.return_value = comments_enabled
         self.plg_instance = plugin.DataRequestsPlugin()
 
         # Get actions
@@ -110,7 +110,7 @@ def test_get_auth_functions(self, comments_enabled):
         auth_functions_len = TOTAL_ACTIONS if comments_enabled == 'True' else ACTIONS_NO_COMMENTS
 
         # Configure config and create instance
-        plugin.config.get.return_value = comments_enabled
+        common.config.get.return_value = comments_enabled
         self.plg_instance = plugin.DataRequestsPlugin()
 
         # Get auth functions
@@ -151,7 +151,7 @@ def test_before_map(self, comments_enabled):
         mapa_calls = urls_set if comments_enabled == 'True' else urls_set - 3
 
         # Configure config and get instance
-        plugin.config.get.return_value = comments_enabled
+        common.config.get.return_value = comments_enabled
         self.plg_instance = plugin.DataRequestsPlugin()
 
         mock_icon = 'icon'
@@ -261,7 +261,7 @@ def test_before_map(self, comments_enabled):
     def test_helpers(self, comments_enabled, show_datarequests_badge):
 
         # Configure config and get instance
-        plugin.config = {
+        common.config = {
             'ckan.datarequests.comments': comments_enabled,
             'ckan.datarequests.show_datarequests_badge': show_datarequests_badge
         }

From 436d89d7f075b8dcf9539d1299cfa9f8359596eb Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Thu, 2 Sep 2021 10:26:49 +1000
Subject: [PATCH 124/276] [QOL-8251] update CKAN Docker image

---
 .docker/Dockerfile.ckan | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.docker/Dockerfile.ckan b/.docker/Dockerfile.ckan
index 789bf9e1..b4075f7f 100644
--- a/.docker/Dockerfile.ckan
+++ b/.docker/Dockerfile.ckan
@@ -1,4 +1,4 @@
-FROM amazeeio/python:2.7-ckan-21.6.0
+FROM amazeeio/python:2.7-ckan-21.7.0
 
 ARG SITE_URL
 ENV SITE_URL="${SITE_URL}"

From 5a72f5388cf338ee23039ecc9fa52678a2555e66 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Thu, 2 Sep 2021 10:46:25 +1000
Subject: [PATCH 125/276] [QOL-8251] add debugging of failed container builds

---
 .circleci/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/build.sh b/.circleci/build.sh
index 611dca97..407dd0ec 100755
--- a/.circleci/build.sh
+++ b/.circleci/build.sh
@@ -21,4 +21,4 @@ export DOCTOR_CHECK_SSH=0
 export DOCTOR_CHECK_WEBSERVER=0
 export DOCTOR_CHECK_BOOTSTRAP=0
 
-ahoy build
+ahoy build || (ahoy logs; exit 1)

From 808c51d64f4e795bab6b3ce721a41fda92168244 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Thu, 2 Sep 2021 11:18:53 +1000
Subject: [PATCH 126/276] [QOL-8251] drop user ID override on database
 containers, use default

---
 docker-compose.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 15417d94..a1c7c008 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -53,7 +53,6 @@ services:
     networks:
       - amazeeio-network
       - default
-    <<: *default-user
     environment:
       <<: *default-environment
 
@@ -61,7 +60,6 @@ services:
     image: amazeeio/postgres-ckan
     ports:
       - "5432"
-    <<: *default-user
     networks:
       - amazeeio-network
       - default

From 0867a3233c45978c379e4f4d90e8f938b7fad4a1 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Thu, 2 Sep 2021 11:42:42 +1000
Subject: [PATCH 127/276] [QOL-8251] use better test passwords and extract to
 default value

---
 .docker/scripts/create-test-data.sh | 22 +++++++++++-----------
 .docker/scripts/init-ext.sh         |  2 +-
 test/features/environment.py        | 10 +++++-----
 test/features/login.feature         | 15 +--------------
 4 files changed, 18 insertions(+), 31 deletions(-)

diff --git a/.docker/scripts/create-test-data.sh b/.docker/scripts/create-test-data.sh
index 8feb8026..69403f10 100644
--- a/.docker/scripts/create-test-data.sh
+++ b/.docker/scripts/create-test-data.sh
@@ -20,10 +20,10 @@ add_user_if_needed () {
     ckan_cli user "$1" | grep "$1" || ckan_cli user add "$1"\
         fullname="$2"\
         email="$3"\
-        password="$4"
+        password="${4:-Password123!}"
 }
 
-add_user_if_needed "$CKAN_USER_NAME" "$CKAN_DISPLAY_NAME" "$CKAN_USER_EMAIL" "$CKAN_USER_PASSWORD"
+add_user_if_needed "$CKAN_USER_NAME" "$CKAN_DISPLAY_NAME" "$CKAN_USER_EMAIL"
 ckan_cli sysadmin add "${CKAN_USER_NAME}"
 
 # We know the "admin" sysadmin account exists, so we'll use her API KEY to create further data
@@ -48,15 +48,15 @@ curl -LsH "Authorization: ${API_KEY}" \
 ##
 # BEGIN: Create a test organisation with test users for admin, editor and member
 #
-TEST_ORG_NAME=test
-TEST_ORG_TITLE="Test"
+TEST_ORG_NAME=test-organisation
+TEST_ORG_TITLE="Test Organisation"
 
 echo "Creating test users for ${TEST_ORG_TITLE} Organisation:"
 
-add_user_if_needed ckan_user "CKAN User" ckan_user@localhost password
-add_user_if_needed test_org_admin "Test Admin" test_org_admin@localhost password
-add_user_if_needed test_org_editor "Test Editor" test_org_editor@localhost password
-add_user_if_needed test_org_member "Test Member" test_org_member@localhost password
+add_user_if_needed ckan_user "CKAN User" ckan_user@localhost
+add_user_if_needed test_org_admin "Test Admin" test_org_admin@localhost
+add_user_if_needed test_org_editor "Test Editor" test_org_editor@localhost
+add_user_if_needed test_org_member "Test Member" test_org_member@localhost
 
 echo "Creating ${TEST_ORG_TITLE} Organisation:"
 
@@ -94,9 +94,9 @@ DR_ORG_TITLE="Open Data Administration (data requests)"
 
 echo "Creating test users for ${DR_ORG_TITLE} Organisation:"
 
-add_user_if_needed dr_admin "Data Request Admin" dr_admin@localhost password
-add_user_if_needed dr_editor "Data Request Editor" dr_editor@localhost password
-add_user_if_needed dr_member "Data Request Member" dr_member@localhost password
+add_user_if_needed dr_admin "Data Request Admin" dr_admin@localhost
+add_user_if_needed dr_editor "Data Request Editor" dr_editor@localhost
+add_user_if_needed dr_member "Data Request Member" dr_member@localhost
 
 echo "Creating ${DR_ORG_TITLE} Organisation:"
 
diff --git a/.docker/scripts/init-ext.sh b/.docker/scripts/init-ext.sh
index c6b00ec9..07be8fe1 100755
--- a/.docker/scripts/init-ext.sh
+++ b/.docker/scripts/init-ext.sh
@@ -7,8 +7,8 @@ set -e
 if [ "$VENV_DIR" != "" ]; then
   . ${VENV_DIR}/bin/activate
 fi
-pip install -r "requirements-dev.txt"
 pip install -r "requirements.txt"
+pip install -r "requirements-dev.txt"
 python setup.py develop
 installed_name=$(grep '^\s*name=' setup.py |sed "s|[^']*'\([-a-zA-Z0-9]*\)'.*|\1|")
 
diff --git a/test/features/environment.py b/test/features/environment.py
index 0a66e80d..c938a5b8 100644
--- a/test/features/environment.py
+++ b/test/features/environment.py
@@ -17,7 +17,7 @@
     'SysAdmin': {
         'name': u'admin',
         'email': u'admin@localhost',
-        'password': u'password'
+        'password': u'Password123!'
     },
     'Unauthenticated': {
         'name': u'',
@@ -28,22 +28,22 @@
     'CKANUser': {
         'name': u'ckan_user',
         'email': u'ckan_user@localhost',
-        'password': u'password'
+        'password': u'Password123!'
     },
     'TestOrgAdmin': {
         'name': u'test_org_admin',
         'email': u'test_org_admin@localhost',
-        'password': u'password'
+        'password': u'Password123!'
     },
     'TestOrgEditor': {
         'name': u'test_org_editor',
         'email': u'test_org_editor@localhost',
-        'password': u'password'
+        'password': u'Password123!'
     },
     'TestOrgMember': {
         'name': u'test_org_member',
         'email': u'test_org_member@localhost',
-        'password': u'password'
+        'password': u'Password123!'
     },
     'DataRequestOrgAdmin': {
         'name': u'dr_admin',
diff --git a/test/features/login.feature b/test/features/login.feature
index 99c0b555..ca7a0e55 100644
--- a/test/features/login.feature
+++ b/test/features/login.feature
@@ -1,20 +1,7 @@
 @smoke @login
 Feature: Login
 
-    Scenario: Smoke test to ensure Login process works
-        Given "SysAdmin" as the persona
-        When I go to homepage
-        And I click the link with text that contains "Log in"
-        And I fill in "login" with "$name"
-        And I fill in "password" with "$password"
-        # Login is a button without "name" or "id".
-        And I press the element with xpath "//button[contains(string(), 'Login')]"
-        And I take a screenshot
-        Then I should see an element with xpath "//a[contains(string(), 'Log out')]"
-
     Scenario: Smoke test to ensure Login step works
         Given "SysAdmin" as the persona
-        When I go to homepage
-        And I click the link with text that contains "Log in"
-        And I log in
+        When I log in
         Then I take a screenshot

From 1365a9fa742454f3af9e3389717d8494a379fa19 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Thu, 2 Sep 2021 12:07:07 +1000
Subject: [PATCH 128/276] [QOL-8251] fix data request test passwords

---
 test/features/environment.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/features/environment.py b/test/features/environment.py
index c938a5b8..8b48e60b 100644
--- a/test/features/environment.py
+++ b/test/features/environment.py
@@ -48,17 +48,17 @@
     'DataRequestOrgAdmin': {
         'name': u'dr_admin',
         'email': u'dr_admin@localhost',
-        'password': u'password'
+        'password': u'Password123!'
     },
     'DataRequestOrgEditor': {
         'name': u'dr_editor',
         'email': u'dr_editor@localhost',
-        'password': u'password'
+        'password': u'Password123!'
     },
     'DataRequestOrgMember': {
         'name': u'dr_member',
         'email': u'dr_member@localhost',
-        'password': u'password'
+        'password': u'Password123!'
     }
 }
 

From d5095fbc9c9d2c60ed4cddf6f9d84f77e196ea12 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Tue, 9 Nov 2021 15:52:08 +1000
Subject: [PATCH 129/276] [QOL-7970] split plugin for Pylons and Flask

---
 .../controllers/pylons_controller.py          |  44 ++
 .../datarequests/controllers/ui_controller.py | 674 +++++++++---------
 .../{plugin.py => plugin/__init__.py}         |  77 +-
 ckanext/datarequests/plugin/flask_plugin.py   |  91 +++
 ckanext/datarequests/plugin/pylons_plugin.py  |  78 ++
 5 files changed, 553 insertions(+), 411 deletions(-)
 create mode 100644 ckanext/datarequests/controllers/pylons_controller.py
 rename ckanext/datarequests/{plugin.py => plugin/__init__.py} (72%)
 create mode 100644 ckanext/datarequests/plugin/flask_plugin.py
 create mode 100644 ckanext/datarequests/plugin/pylons_plugin.py

diff --git a/ckanext/datarequests/controllers/pylons_controller.py b/ckanext/datarequests/controllers/pylons_controller.py
new file mode 100644
index 00000000..f5859207
--- /dev/null
+++ b/ckanext/datarequests/controllers/pylons_controller.py
@@ -0,0 +1,44 @@
+# -*- coding: utf-8 -*-
+
+from ckan.plugins.toolkit import BaseController
+
+from . import ui_controller
+
+
+class DataRequestsUI(BaseController):
+
+    def index(self):
+        return ui_controller.index()
+
+    def new(self):
+        return ui_controller.new()
+
+    def show(self, id):
+        return ui_controller.show(id)
+
+    def update(self, id):
+        return ui_controller.update(id)
+
+    def delete(self, id):
+        return ui_controller.delete(id)
+
+    def organization_datarequests(self, id):
+        return ui_controller.organization(id)
+
+    def user_datarequests(self, id):
+        return ui_controller.user(id)
+
+    def close(self, id):
+        return ui_controller.close(id)
+
+    def comment(self, id):
+        return ui_controller.comment(id)
+
+    def delete_comment(self, datarequest_id, comment_id):
+        return ui_controller.delete_comment(datarequest_id, comment_id)
+
+    def follow(self, datarequest_id):
+        return ui_controller.follow(datarequest_id)
+
+    def unfollow(self, datarequest_id):
+        return ui_controller.unfollow(datarequest_id)
diff --git a/ckanext/datarequests/controllers/ui_controller.py b/ckanext/datarequests/controllers/ui_controller.py
index 28b88ef2..cd96a563 100644
--- a/ckanext/datarequests/controllers/ui_controller.py
+++ b/ckanext/datarequests/controllers/ui_controller.py
@@ -1,25 +1,7 @@
-# -*- coding: utf-8 -*-
-
-# Copyright (c) 2015-2016 CoNWeT Lab., Universidad Politécnica de Madrid
-
-# This file is part of CKAN Data Requests Extension.
-
-# CKAN Data Requests Extension is free software: you can redistribute it and/or
-# modify it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-
-# CKAN Data Requests Extension is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-
-# You should have received a copy of the GNU Affero General Public License
-# along with CKAN Data Requests Extension. If not, see <http://www.gnu.org/licenses/>.
-
-import logging
+# encoding: utf-8
 
 import functools
+import logging
 import re
 import six
 
@@ -27,7 +9,7 @@
 
 from ckan import model, plugins
 from ckan.common import request
-from ckan.lib import base, helpers
+from ckan.lib import helpers
 from ckanext.datarequests import constants
 
 
@@ -75,363 +57,375 @@ def user_datarequest_url(params, id):
     return url_with_params(url, params)
 
 
-class DataRequestsUI(base.BaseController):
+def _get_context():
+    return {'model': model, 'session': model.Session,
+            'user': c.user, 'auth_user_obj': c.userobj}
 
-    def _get_context(self):
-        return {'model': model, 'session': model.Session,
-                'user': c.user, 'auth_user_obj': c.userobj}
 
-    def _show_index(self, user_id, organization_id, include_organization_facet, url_func, file_to_render):
+def _show_index(user_id, organization_id, include_organization_facet, url_func, file_to_render):
 
-        def pager_url(state=None, sort=None, q=None, page=None):
-            params = []
+    def pager_url(state=None, sort=None, q=None, page=None):
+        params = []
 
-            if q:
-                params.append(('q', q))
+        if q:
+            params.append(('q', q))
 
-            if state is not None:
-                params.append(('state', state))
+        if state is not None:
+            params.append(('state', state))
 
-            params.append(('sort', sort))
-            params.append(('page', page))
+        params.append(('sort', sort))
+        params.append(('page', page))
 
-            return url_func(params)
+        return url_func(params)
 
-        try:
-            context = self._get_context()
-            page = int(request.GET.get('page', 1))
-            limit = constants.DATAREQUESTS_PER_PAGE
-            offset = (page - 1) * constants.DATAREQUESTS_PER_PAGE
-            data_dict = {'offset': offset, 'limit': limit}
-
-            state = request.GET.get('state', None)
-            if state:
-                data_dict['closed'] = True if state == 'closed' else False
-
-            q = request.GET.get('q', '')
-            if q:
-                data_dict['q'] = q
-
-            if organization_id:
-                data_dict['organization_id'] = organization_id
-
-            if user_id:
-                data_dict['user_id'] = user_id
-
-            sort = request.GET.get('sort', 'desc')
-            sort = sort if sort in ['asc', 'desc'] else 'desc'
-            if sort is not None:
-                data_dict['sort'] = sort
-
-            tk.check_access(constants.LIST_DATAREQUESTS, context, data_dict)
-            datarequests_list = tk.get_action(constants.LIST_DATAREQUESTS)(context, data_dict)
-
-            c.filters = [(tk._('Newest'), 'desc'), (tk._('Oldest'), 'asc')]
-            c.sort = sort
-            c.q = q
-            c.organization = organization_id
-            c.state = state
-            c.datarequest_count = datarequests_list['count']
-            c.datarequests = datarequests_list['result']
-            c.search_facets = datarequests_list['facets']
-            c.page = helpers.Page(
-                collection=datarequests_list['result'],
-                page=page,
-                url=functools.partial(pager_url, state, sort),
-                item_count=datarequests_list['count'],
-                items_per_page=limit
-            )
-            c.facet_titles = {
-                'state': tk._('State'),
-            }
+    try:
+        context = _get_context()
+        page = int(request.GET.get('page', 1))
+        limit = constants.DATAREQUESTS_PER_PAGE
+        offset = (page - 1) * constants.DATAREQUESTS_PER_PAGE
+        data_dict = {'offset': offset, 'limit': limit}
 
-            # Organization facet cannot be shown when the user is viewing an org
-            if include_organization_facet is True:
-                c.facet_titles['organization'] = tk._('Organizations')
+        state = request.GET.get('state', None)
+        if state:
+            data_dict['closed'] = True if state == 'closed' else False
 
-            return tk.render(file_to_render, extra_vars={'user_dict': c.user_dict if hasattr(c, 'user_dict') else None, 'group_type': 'organization'})
-        except ValueError as e:
-            # This exception should only occur if the page value is not valid
-            log.warn(e)
-            tk.abort(400, tk._('"page" parameter must be an integer'))
-        except tk.NotAuthorized as e:
-            log.warn(e)
-            tk.abort(403, tk._('Unauthorized to list Data Requests'))
+        q = request.GET.get('q', '')
+        if q:
+            data_dict['q'] = q
 
-    def index(self):
-        return self._show_index(None, request.GET.get('organization', ''), True, search_url, 'datarequests/index.html')
+        if organization_id:
+            data_dict['organization_id'] = organization_id
 
-    def _process_post(self, action, context):
-        # If the user has submitted the form, the data request must be created
-        if request.POST:
-            data_dict = {}
-            data_dict['title'] = request.POST.get('title', '')
-            data_dict['description'] = request.POST.get('description', '')
-            data_dict['organization_id'] = request.POST.get('organization_id', '')
+        if user_id:
+            data_dict['user_id'] = user_id
 
-            if action == constants.UPDATE_DATAREQUEST:
-                data_dict['id'] = request.POST.get('id', '')
+        sort = request.GET.get('sort', 'desc')
+        sort = sort if sort in ['asc', 'desc'] else 'desc'
+        if sort is not None:
+            data_dict['sort'] = sort
 
-            try:
-                result = tk.get_action(action)(context, data_dict)
-                tk.redirect_to(helpers.url_for(controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI', action='show', id=result['id']))
+        tk.check_access(constants.LIST_DATAREQUESTS, context, data_dict)
+        datarequests_list = tk.get_action(constants.LIST_DATAREQUESTS)(context, data_dict)
 
-            except tk.ValidationError as e:
-                log.warn(e)
-                # Fill the fields that will display some information in the page
-                c.datarequest = {
-                    'id': data_dict.get('id', ''),
-                    'title': data_dict.get('title', ''),
-                    'description': data_dict.get('description', ''),
-                    'organization_id': data_dict.get('organization_id', '')
-                }
-                c.errors = e.error_dict
-                c.errors_summary = _get_errors_summary(c.errors)
+        c.filters = [(tk._('Newest'), 'desc'), (tk._('Oldest'), 'asc')]
+        c.sort = sort
+        c.q = q
+        c.organization = organization_id
+        c.state = state
+        c.datarequest_count = datarequests_list['count']
+        c.datarequests = datarequests_list['result']
+        c.search_facets = datarequests_list['facets']
+        c.page = helpers.Page(
+            collection=datarequests_list['result'],
+            page=page,
+            url=functools.partial(pager_url, state, sort),
+            item_count=datarequests_list['count'],
+            items_per_page=limit
+        )
+        c.facet_titles = {
+            'state': tk._('State'),
+        }
 
-    def new(self):
-        context = self._get_context()
+        # Organization facet cannot be shown when the user is viewing an org
+        if include_organization_facet is True:
+            c.facet_titles['organization'] = tk._('Organizations')
 
-        # Basic intialization
-        c.datarequest = {}
-        c.errors = {}
-        c.errors_summary = {}
+        return tk.render(file_to_render, extra_vars={'user_dict': c.user_dict if hasattr(c, 'user_dict') else None, 'group_type': 'organization'})
+    except ValueError as e:
+        # This exception should only occur if the page value is not valid
+        log.warn(e)
+        tk.abort(400, tk._('"page" parameter must be an integer'))
+    except tk.NotAuthorized as e:
+        log.warn(e)
+        tk.abort(403, tk._('Unauthorized to list Data Requests'))
 
-        # Check access
-        try:
-            tk.check_access(constants.CREATE_DATAREQUEST, context, None)
-            self._process_post(constants.CREATE_DATAREQUEST, context)
 
-            # The form is always rendered
-            return tk.render('datarequests/new.html')
+def index():
+    return _show_index(None, request.GET.get('organization', ''), True, search_url, 'datarequests/index.html')
 
-        except tk.NotAuthorized as e:
-            log.warn(e)
-            tk.abort(403, tk._('Unauthorized to create a Data Request'))
 
-    def show(self, id):
-        data_dict = {'id': id}
-        context = self._get_context()
+def _process_post(action, context):
+    # If the user has submitted the form, the data request must be created
+    if request.POST:
+        data_dict = {}
+        data_dict['title'] = request.POST.get('title', '')
+        data_dict['description'] = request.POST.get('description', '')
+        data_dict['organization_id'] = request.POST.get('organization_id', '')
 
-        try:
-            tk.check_access(constants.SHOW_DATAREQUEST, context, data_dict)
-            c.datarequest = tk.get_action(constants.SHOW_DATAREQUEST)(context, data_dict)
+        if action == constants.UPDATE_DATAREQUEST:
+            data_dict['id'] = request.POST.get('id', '')
 
-            context_ignore_auth = context.copy()
-            context_ignore_auth['ignore_auth'] = True
+        try:
+            result = tk.get_action(action)(context, data_dict)
+            tk.redirect_to(helpers.url_for(controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI', action='show', id=result['id']))
 
-            return tk.render('datarequests/show.html')
-        except tk.ObjectNotFound:
-            tk.abort(404, tk._('Data Request %s not found') % id)
-        except tk.NotAuthorized as e:
+        except tk.ValidationError as e:
             log.warn(e)
-            tk.abort(403, tk._('You are not authorized to view the Data Request %s'
-                               % id))
+            # Fill the fields that will display some information in the page
+            c.datarequest = {
+                'id': data_dict.get('id', ''),
+                'title': data_dict.get('title', ''),
+                'description': data_dict.get('description', ''),
+                'organization_id': data_dict.get('organization_id', '')
+            }
+            c.errors = e.error_dict
+            c.errors_summary = _get_errors_summary(c.errors)
+
+
+def new():
+    context = _get_context()
+
+    # Basic initialization
+    c.datarequest = {}
+    c.errors = {}
+    c.errors_summary = {}
+
+    # Check access
+    try:
+        tk.check_access(constants.CREATE_DATAREQUEST, context, None)
+        _process_post(constants.CREATE_DATAREQUEST, context)
+
+        # The form is always rendered
+        return tk.render('datarequests/new.html')
+
+    except tk.NotAuthorized as e:
+        log.warn(e)
+        tk.abort(403, tk._('Unauthorized to create a Data Request'))
+
+
+def show(id):
+    data_dict = {'id': id}
+    context = _get_context()
+
+    try:
+        tk.check_access(constants.SHOW_DATAREQUEST, context, data_dict)
+        c.datarequest = tk.get_action(constants.SHOW_DATAREQUEST)(context, data_dict)
+
+        context_ignore_auth = context.copy()
+        context_ignore_auth['ignore_auth'] = True
+
+        return tk.render('datarequests/show.html')
+    except tk.ObjectNotFound:
+        tk.abort(404, tk._('Data Request %s not found') % id)
+    except tk.NotAuthorized as e:
+        log.warn(e)
+        tk.abort(403, tk._('You are not authorized to view the Data Request %s'
+                           % id))
+
+
+def update(id):
+    data_dict = {'id': id}
+    context = _get_context()
+
+    # Basic initialization
+    c.datarequest = {}
+    c.errors = {}
+    c.errors_summary = {}
+
+    try:
+        tk.check_access(constants.UPDATE_DATAREQUEST, context, data_dict)
+        c.datarequest = tk.get_action(constants.SHOW_DATAREQUEST)(context, data_dict)
+        c.original_title = c.datarequest.get('title')
+        _process_post(constants.UPDATE_DATAREQUEST, context)
+        return tk.render('datarequests/edit.html')
+    except tk.ObjectNotFound as e:
+        log.warn(e)
+        tk.abort(404, tk._('Data Request %s not found') % id)
+    except tk.NotAuthorized as e:
+        log.warn(e)
+        tk.abort(403, tk._('You are not authorized to update the Data Request %s'
+                           % id))
+
+
+def delete(id):
+    data_dict = {'id': id}
+    context = _get_context()
+
+    try:
+        tk.check_access(constants.DELETE_DATAREQUEST, context, data_dict)
+        datarequest = tk.get_action(constants.DELETE_DATAREQUEST)(context, data_dict)
+        helpers.flash_notice(tk._('Data Request %s has been deleted') % datarequest.get('title', ''))
+        tk.redirect_to(helpers.url_for(controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI', action='index'))
+    except tk.ObjectNotFound as e:
+        log.warn(e)
+        tk.abort(404, tk._('Data Request %s not found') % id)
+    except tk.NotAuthorized as e:
+        log.warn(e)
+        tk.abort(403, tk._('You are not authorized to delete the Data Request %s'
+                           % id))
+
+
+def organization(id):
+    context = _get_context()
+    c.group_dict = tk.get_action('organization_show')(context, {'id': id})
+    url_func = functools.partial(org_datarequest_url, id=id)
+    return _show_index(None, id, False, url_func, 'organization/datarequests.html')
+
+
+def user(id):
+    context = _get_context()
+    c.user_dict = tk.get_action('user_show')(context, {'id': id, 'include_num_followers': True})
+    url_func = functools.partial(user_datarequest_url, id=id)
+    return _show_index(id, request.GET.get('organization', ''), True, url_func, 'user/datarequests.html')
+
+
+def close(id):
+    data_dict = {'id': id}
+    context = _get_context()
+
+    # Basic intialization
+    c.datarequest = {}
+
+    def _return_page(errors=None, errors_summary=None):
+        errors = errors or {}
+        errors_summary = errors_summary or {}
+        # Get datasets (if the data req belongs to an organization,
+        # only the ones that belong to the organization are shown)
+        organization_id = c.datarequest.get('organization_id', '')
+        if organization_id:
+            base_datasets = tk.get_action('organization_show')({'ignore_auth': True}, {'id': organization_id, 'include_datasets': True})['packages']
+        else:
+            # FIXME: At this time, only the 500 last modified/created datasets are retrieved.
+            # We assume that a user will close their data request with a recently added or modified dataset
+            # In the future, we should fix this with an autocomplete form...
+            # Expected for CKAN 2.3
+            base_datasets = tk.get_action('package_search')({'ignore_auth': True}, {'rows': 500})['results']
+
+        c.datasets = []
+        c.errors = errors
+        c.errors_summary = errors_summary
+        for dataset in base_datasets:
+            c.datasets.append({'name': dataset.get('name'), 'title': dataset.get('title')})
+
+        if tk.h.closing_circumstances_enabled:
+            # This is required so the form can set the currently selected close_circumstance option in the select dropdown
+            c.datarequest['close_circumstance'] = request.POST.get('close_circumstance', None)
+
+        return tk.render('datarequests/close.html')
+
+    try:
+        tk.check_access(constants.CLOSE_DATAREQUEST, context, data_dict)
+        c.datarequest = tk.get_action(constants.SHOW_DATAREQUEST)(context, data_dict)
+
+        if c.datarequest.get('closed', False):
+            tk.abort(403, tk._('This data request is already closed'))
+        elif request.POST:
+            data_dict = {}
+            data_dict['accepted_dataset_id'] = request.POST.get('accepted_dataset_id', None)
+            data_dict['id'] = id
+            if tk.h.closing_circumstances_enabled:
+                data_dict['close_circumstance'] = request.POST.get('close_circumstance', None)
+                data_dict['approx_publishing_date'] = request.POST.get('approx_publishing_date', None)
+                data_dict['condition'] = request.POST.get('condition', None)
+
+            tk.get_action(constants.CLOSE_DATAREQUEST)(context, data_dict)
+            tk.redirect_to(helpers.url_for(controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI', action='show', id=data_dict['id']))
+        else:   # GET
+            return _return_page()
+
+    except tk.ValidationError as e:     # Accepted Dataset is not valid
+        log.warn(e)
+        errors_summary = _get_errors_summary(e.error_dict)
+        return _return_page(e.error_dict, errors_summary)
+    except tk.ObjectNotFound as e:
+        log.warn(e)
+        tk.abort(404, tk._('Data Request %s not found') % id)
+    except tk.NotAuthorized as e:
+        log.warn(e)
+        tk.abort(403, tk._('You are not authorized to close the Data Request %s'
+                           % id))
+
+
+def comment(id):
+    try:
+        context = _get_context()
+        data_dict_comment_list = {'datarequest_id': id}
+        data_dict_dr_show = {'id': id}
+        tk.check_access(constants.LIST_DATAREQUEST_COMMENTS, context, data_dict_comment_list)
+
+        # Raises 404 Not Found if the data request does not exist
+        c.datarequest = tk.get_action(constants.SHOW_DATAREQUEST)(context, data_dict_dr_show)
+
+        comment_text = request.POST.get('comment', '')
+        comment_id = request.POST.get('comment-id', '')
 
-    def update(self, id):
-        data_dict = {'id': id}
-        context = self._get_context()
+        if request.POST:
+            action = constants.COMMENT_DATAREQUEST
+            action_text = 'comment'
 
-        # Basic intialization
-        c.datarequest = {}
-        c.errors = {}
-        c.errors_summary = {}
+            if comment_id:
+                action = constants.UPDATE_DATAREQUEST_COMMENT
+                action_text = 'update comment'
 
-        try:
-            tk.check_access(constants.UPDATE_DATAREQUEST, context, data_dict)
-            c.datarequest = tk.get_action(constants.SHOW_DATAREQUEST)(context, data_dict)
-            c.original_title = c.datarequest.get('title')
-            self._process_post(constants.UPDATE_DATAREQUEST, context)
-            return tk.render('datarequests/edit.html')
-        except tk.ObjectNotFound as e:
-            log.warn(e)
-            tk.abort(404, tk._('Data Request %s not found') % id)
-        except tk.NotAuthorized as e:
-            log.warn(e)
-            tk.abort(403, tk._('You are not authorized to update the Data Request %s'
-                               % id))
+            try:
+                comment_data_dict = {'datarequest_id': id, 'comment': comment_text, 'id': comment_id}
+                updated_comment = tk.get_action(action)(context, comment_data_dict)
 
-    def delete(self, id):
-        data_dict = {'id': id}
-        context = self._get_context()
+                if not comment_id:
+                    flash_message = tk._('Comment has been published')
+                else:
+                    flash_message = tk._('Comment has been updated')
 
-        try:
-            tk.check_access(constants.DELETE_DATAREQUEST, context, data_dict)
-            datarequest = tk.get_action(constants.DELETE_DATAREQUEST)(context, data_dict)
-            helpers.flash_notice(tk._('Data Request %s has been deleted') % datarequest.get('title', ''))
-            tk.redirect_to(helpers.url_for(controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI', action='index'))
-        except tk.ObjectNotFound as e:
-            log.warn(e)
-            tk.abort(404, tk._('Data Request %s not found') % id)
-        except tk.NotAuthorized as e:
-            log.warn(e)
-            tk.abort(403, tk._('You are not authorized to delete the Data Request %s'
-                               % id))
-
-    def organization_datarequests(self, id):
-        context = self._get_context()
-        c.group_dict = tk.get_action('organization_show')(context, {'id': id})
-        url_func = functools.partial(org_datarequest_url, id=id)
-        return self._show_index(None, id, False, url_func, 'organization/datarequests.html')
-
-    def user_datarequests(self, id):
-        context = self._get_context()
-        c.user_dict = tk.get_action('user_show')(context, {'id': id, 'include_num_followers': True})
-        url_func = functools.partial(user_datarequest_url, id=id)
-        return self._show_index(id, request.GET.get('organization', ''), True, url_func, 'user/datarequests.html')
-
-    def close(self, id):
-        data_dict = {'id': id}
-        context = self._get_context()
-
-        # Basic intialization
-        c.datarequest = {}
-
-        def _return_page(errors=None, errors_summary=None):
-            errors = errors or {}
-            errors_summary = errors_summary or {}
-            # Get datasets (if the data req belongs to an organization,
-            # only the ones that belong to the organization are shown)
-            organization_id = c.datarequest.get('organization_id', '')
-            if organization_id:
-                base_datasets = tk.get_action('organization_show')({'ignore_auth': True}, {'id': organization_id, 'include_datasets': True})['packages']
-            else:
-                # FIXME: At this time, only the 500 last modified/created datasets are retrieved.
-                # We assume that a user will close their data request with a recently added or modified dataset
-                # In the future, we should fix this with an autocomplete form...
-                # Expected for CKAN 2.3
-                base_datasets = tk.get_action('package_search')({'ignore_auth': True}, {'rows': 500})['results']
-
-            c.datasets = []
-            c.errors = errors
-            c.errors_summary = errors_summary
-            for dataset in base_datasets:
-                c.datasets.append({'name': dataset.get('name'), 'title': dataset.get('title')})
+                helpers.flash_notice(flash_message)
 
-            if tk.h.closing_circumstances_enabled:
-                # This is required so the form can set the currently selected close_circumstance option in the select dropdown
-                c.datarequest['close_circumstance'] = request.POST.get('close_circumstance', None)
+            except tk.NotAuthorized as e:
+                log.warn(e)
+                tk.abort(403, tk._('You are not authorized to %s' % action_text))
+            except tk.ValidationError as e:
+                log.warn(e)
+                c.errors = e.error_dict
+                c.errors_summary = _get_errors_summary(c.errors)
+            except tk.ObjectNotFound as e:
+                log.warn(e)
+                tk.abort(404, tk._(str(e)))
+            # Other exceptions are not expected. Otherwise, the request will fail.
 
-            return tk.render('datarequests/close.html')
+            # This is required to scroll the user to the appropriate comment
+            if 'updated_comment' in locals():
+                c.updated_comment = updated_comment
+            else:
+                c.updated_comment = {
+                    'id': comment_id,
+                    'comment': comment_text
+                }
 
-        try:
-            tk.check_access(constants.CLOSE_DATAREQUEST, context, data_dict)
-            c.datarequest = tk.get_action(constants.SHOW_DATAREQUEST)(context, data_dict)
-
-            if c.datarequest.get('closed', False):
-                tk.abort(403, tk._('This data request is already closed'))
-            elif request.POST:
-                data_dict = {}
-                data_dict['accepted_dataset_id'] = request.POST.get('accepted_dataset_id', None)
-                data_dict['id'] = id
-                if tk.h.closing_circumstances_enabled:
-                    data_dict['close_circumstance'] = request.POST.get('close_circumstance', None)
-                    data_dict['approx_publishing_date'] = request.POST.get('approx_publishing_date', None)
-                    data_dict['condition'] = request.POST.get('condition', None)
-
-                tk.get_action(constants.CLOSE_DATAREQUEST)(context, data_dict)
-                tk.redirect_to(helpers.url_for(controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI', action='show', id=data_dict['id']))
-            else:   # GET
-                return _return_page()
-
-        except tk.ValidationError as e:     # Accepted Dataset is not valid
-            log.warn(e)
-            errors_summary = _get_errors_summary(e.error_dict)
-            return _return_page(e.error_dict, errors_summary)
-        except tk.ObjectNotFound as e:
-            log.warn(e)
-            tk.abort(404, tk._('Data Request %s not found') % id)
-        except tk.NotAuthorized as e:
-            log.warn(e)
-            tk.abort(403, tk._('You are not authorized to close the Data Request %s'
-                               % id))
+        # Comments should be retrieved once that the comment has been created
+        get_comments_data_dict = {'datarequest_id': id}
+        c.comments = tk.get_action(constants.LIST_DATAREQUEST_COMMENTS)(context, get_comments_data_dict)
 
-    def comment(self, id):
-        try:
-            context = self._get_context()
-            data_dict_comment_list = {'datarequest_id': id}
-            data_dict_dr_show = {'id': id}
-            tk.check_access(constants.LIST_DATAREQUEST_COMMENTS, context, data_dict_comment_list)
-
-            # Raises 404 Not Found if the data request does not exist
-            c.datarequest = tk.get_action(constants.SHOW_DATAREQUEST)(context, data_dict_dr_show)
-
-            comment_text = request.POST.get('comment', '')
-            comment_id = request.POST.get('comment-id', '')
-
-            if request.POST:
-                action = constants.COMMENT_DATAREQUEST
-                action_text = 'comment'
-
-                if comment_id:
-                    action = constants.UPDATE_DATAREQUEST_COMMENT
-                    action_text = 'update comment'
-
-                try:
-                    comment_data_dict = {'datarequest_id': id, 'comment': comment_text, 'id': comment_id}
-                    updated_comment = tk.get_action(action)(context, comment_data_dict)
-
-                    if not comment_id:
-                        flash_message = tk._('Comment has been published')
-                    else:
-                        flash_message = tk._('Comment has been updated')
-
-                    helpers.flash_notice(flash_message)
-
-                except tk.NotAuthorized as e:
-                    log.warn(e)
-                    tk.abort(403, tk._('You are not authorized to %s' % action_text))
-                except tk.ValidationError as e:
-                    log.warn(e)
-                    c.errors = e.error_dict
-                    c.errors_summary = _get_errors_summary(c.errors)
-                except tk.ObjectNotFound as e:
-                    log.warn(e)
-                    tk.abort(404, tk._(str(e)))
-                # Other exceptions are not expected. Otherwise, the request will fail.
-
-                # This is required to scroll the user to the appropriate comment
-                if 'updated_comment' in locals():
-                    c.updated_comment = updated_comment
-                else:
-                    c.updated_comment = {
-                        'id': comment_id,
-                        'comment': comment_text
-                    }
+        return tk.render('datarequests/comment.html')
 
-            # Comments should be retrieved once that the comment has been created
-            get_comments_data_dict = {'datarequest_id': id}
-            c.comments = tk.get_action(constants.LIST_DATAREQUEST_COMMENTS)(context, get_comments_data_dict)
+    except tk.ObjectNotFound as e:
+        log.warn(e)
+        tk.abort(404, tk._('Data Request %s not found' % id))
 
-            return tk.render('datarequests/comment.html')
+    except tk.NotAuthorized as e:
+        log.warn(e)
+        tk.abort(403, tk._('You are not authorized to list the comments of the Data Request %s'
+                           % id))
 
-        except tk.ObjectNotFound as e:
-            log.warn(e)
-            tk.abort(404, tk._('Data Request %s not found' % id))
 
-        except tk.NotAuthorized as e:
-            log.warn(e)
-            tk.abort(403, tk._('You are not authorized to list the comments of the Data Request %s'
-                               % id))
+def delete_comment(datarequest_id, comment_id):
+    try:
+        context = _get_context()
+        data_dict = {'id': comment_id}
+        tk.check_access(constants.DELETE_DATAREQUEST_COMMENT, context, data_dict)
+        tk.get_action(constants.DELETE_DATAREQUEST_COMMENT)(context, data_dict)
+        helpers.flash_notice(tk._('Comment has been deleted'))
+        tk.redirect_to(helpers.url_for(controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI', action='comment', id=datarequest_id))
+    except tk.ObjectNotFound as e:
+        log.warn(e)
+        tk.abort(404, tk._('Comment %s not found') % comment_id)
+    except tk.NotAuthorized as e:
+        log.warn(e)
+        tk.abort(403, tk._('You are not authorized to delete this comment'))
 
-    def delete_comment(self, datarequest_id, comment_id):
-        try:
-            context = self._get_context()
-            data_dict = {'id': comment_id}
-            tk.check_access(constants.DELETE_DATAREQUEST_COMMENT, context, data_dict)
-            tk.get_action(constants.DELETE_DATAREQUEST_COMMENT)(context, data_dict)
-            helpers.flash_notice(tk._('Comment has been deleted'))
-            tk.redirect_to(helpers.url_for(controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI', action='comment', id=datarequest_id))
-        except tk.ObjectNotFound as e:
-            log.warn(e)
-            tk.abort(404, tk._('Comment %s not found') % comment_id)
-        except tk.NotAuthorized as e:
-            log.warn(e)
-            tk.abort(403, tk._('You are not authorized to delete this comment'))
 
-    def follow(self, datarequest_id):
-        # Method is not called
-        pass
+def follow(datarequest_id):
+    # Method is not called
+    pass
+
 
-    def unfollow(self, datarequest_id):
-        # Method is not called
-        pass
+def unfollow(datarequest_id):
+    # Method is not called
+    pass
diff --git a/ckanext/datarequests/plugin.py b/ckanext/datarequests/plugin/__init__.py
similarity index 72%
rename from ckanext/datarequests/plugin.py
rename to ckanext/datarequests/plugin/__init__.py
index 6312a6d4..ec9aacd9 100644
--- a/ckanext/datarequests/plugin.py
+++ b/ckanext/datarequests/plugin/__init__.py
@@ -27,13 +27,17 @@
 
 from functools import partial
 
+if tk.check_ckan_version("2.9"):
+    from .flask_plugin import MixinPlugin
+else:
+    from .pylons_plugin import MixinPlugin
 
-class DataRequestsPlugin(p.SingletonPlugin):
+
+class DataRequestsPlugin(MixinPlugin, p.SingletonPlugin):
 
     p.implements(p.IActions)
     p.implements(p.IAuthFunctions)
     p.implements(p.IConfigurer)
-    p.implements(p.IRoutes, inherit=True)
     p.implements(p.ITemplateHelpers)
 
     # ITranslation only available in 2.5+
@@ -123,75 +127,6 @@ def update_config_schema(self, schema):
             })
         return schema
 
-    ######################################################################
-    ############################## IROUTES ###############################
-    ######################################################################
-
-    def before_map(self, mapper):
-        from routes.mapper import SubMapper
-        controller_map = SubMapper(
-            mapper, controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI')
-
-        m = SubMapper(controller_map, path_prefix="/" + constants.DATAREQUESTS_MAIN_PATH)
-
-        # Data Requests index
-        m.connect('datarequests_index', '', action='index', conditions={'method': ['GET']})
-        m.connect('datarequest.index', '', action='index', conditions={'method': ['GET']})
-
-        # Create a Data Request
-        m.connect('datarequest.new', '/new', action='new', conditions={'method': ['GET', 'POST']})
-
-        # Show a Data Request
-        m.connect('show_datarequest', '/{id}',
-                  action='show', conditions={'method': ['GET']}, ckan_icon=common.get_question_icon())
-        m.connect('datarequest.show', '/{id}',
-                  action='show', conditions={'method': ['GET']}, ckan_icon=common.get_question_icon())
-
-        # Update a Data Request
-        m.connect('datarequest.update', '/edit/{id}',
-                  action='update', conditions={'method': ['GET', 'POST']})
-
-        # Delete a Data Request
-        m.connect('datarequest.delete', '/delete/{id}',
-                  action='delete', conditions={'method': ['POST']})
-
-        # Close a Data Request
-        m.connect('datarequest.close', '/close/{id}',
-                  action='close', conditions={'method': ['GET', 'POST']})
-
-        # Follow & Unfollow
-        m.connect('datarequest.follow', '/follow/{id}',
-                  action='follow', conditions={'method': ['POST']})
-
-        m.connect('datarequest.unfollow', '/unfollow/{id}',
-                  action='unfollow', conditions={'method': ['POST']})
-
-        if self.comments_enabled:
-            # Comment, update and view comments (of) a Data Request
-            m.connect('comment_datarequest', '/comment/{id}',
-                      action='comment', conditions={'method': ['GET', 'POST']}, ckan_icon='comment')
-            m.connect('datarequest.comment', '/comment/{id}',
-                      action='comment', conditions={'method': ['GET', 'POST']}, ckan_icon='comment')
-
-            # Delete data request
-            m.connect('datarequest.delete_comment', '/comment/{datarequest_id}/delete/{comment_id}',
-                      action='delete_comment', conditions={'method': ['GET', 'POST']})
-
-        list_datarequests_map = SubMapper(
-            controller_map, conditions={'method': ['GET']}, ckan_icon=common.get_question_icon())
-
-        # Data Requests that belong to an organization
-        list_datarequests_map.connect(
-            'organization_datarequests', '/organization/%s/{id}' % constants.DATAREQUESTS_MAIN_PATH,
-            action='organization_datarequests')
-
-        # Data Requests that belong to a user
-        list_datarequests_map.connect(
-            'user_datarequests', '/user/%s/{id}' % constants.DATAREQUESTS_MAIN_PATH,
-            action='user_datarequests')
-
-        return mapper
-
     ######################################################################
     ######################### ITEMPLATESHELPER ###########################
     ######################################################################
diff --git a/ckanext/datarequests/plugin/flask_plugin.py b/ckanext/datarequests/plugin/flask_plugin.py
new file mode 100644
index 00000000..7bb4420a
--- /dev/null
+++ b/ckanext/datarequests/plugin/flask_plugin.py
@@ -0,0 +1,91 @@
+# encoding: utf-8
+
+import ckan.plugins as p
+from flask import Blueprint
+
+from ckanext.datarequests import constants
+from . import ui_controller
+
+
+datarequests_bp = Blueprint("datarequest", __name__)
+
+
+class MixinPlugin(p.SingletonPlugin):
+    p.implements(p.IBlueprint)
+
+    # IBlueprint
+
+    def get_blueprint(self):
+        rules = [
+            (
+                f"/{constants.DATAREQUESTS_MAIN_PATH}",
+                "index",
+                ui_controller.index,
+            ),
+            (
+                f"/{constants.DATAREQUESTS_MAIN_PATH}/new",
+                "new",
+                ui_controller.new,
+            ),
+            (
+                f"/{constants.DATAREQUESTS_MAIN_PATH}/<id>",
+                "show",
+                ui_controller.show,
+            ),
+            (
+                f"/{constants.DATAREQUESTS_MAIN_PATH}/edit/<id>",
+                "update",
+                ui_controller.update,
+            ),
+            (
+                f"/{constants.DATAREQUESTS_MAIN_PATH}/delete/<id>",
+                "delete",
+                ui_controller.delete,
+            ),
+            (
+                f"/{constants.DATAREQUESTS_MAIN_PATH}/close/<id>",
+                "close",
+                ui_controller.close,
+            ),
+            (
+                f"/{constants.DATAREQUESTS_MAIN_PATH}/follow/<datarequest_id>",
+                "follow",
+                ui_controller.follow,
+            ),
+            (
+                f"/{constants.DATAREQUESTS_MAIN_PATH}/unfollow/<datarequest_id>",
+                "unfollow",
+                ui_controller.unfollow,
+            ),
+            (
+                f"/organization/{constants.DATAREQUESTS_MAIN_PATH}/<id>",
+                "organization",
+                ui_controller.organization,
+            ),
+            (
+                f"/user/{constants.DATAREQUESTS_MAIN_PATH}/<id>",
+                "user",
+                ui_controller.user,
+            ),
+        ]
+
+        if self.comments_enabled:
+            rules.extend(
+                [
+                    (
+                        f"/{constants.DATAREQUESTS_MAIN_PATH}/comment/<id>",
+                        "comment",
+                        ui_controller.comment,
+                    ),
+                    (
+                        f"/{constants.DATAREQUESTS_MAIN_PATH}/comment/<datarequest_id>/delete/<comment_id>",
+                        "delete_comment",
+                        ui_controller.delete_comment,
+                    ),
+                ]
+            )
+
+        for rule in rules:
+            datarequests_bp.add_url_rule(rule[0], endpoint=rule[1], view_func=rule[2])
+
+        return [datarequests_bp]
diff --git a/ckanext/datarequests/plugin/pylons_plugin.py b/ckanext/datarequests/plugin/pylons_plugin.py
new file mode 100644
index 00000000..a514a49f
--- /dev/null
+++ b/ckanext/datarequests/plugin/pylons_plugin.py
@@ -0,0 +1,78 @@
+# encoding: utf-8
+
+import ckan.plugins as p
+
+from ckanext.datarequests import common, constants
+
+
+class MixinPlugin(p.SingletonPlugin):
+    p.implements(p.IRoutes, inherit=True)
+
+    ######################################################################
+    ############################## IROUTES ###############################
+    ######################################################################
+
+    def before_map(self, mapper):
+        from routes.mapper import SubMapper
+        controller_map = SubMapper(
+            mapper, controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI')
+
+        m = SubMapper(controller_map, path_prefix="/" + constants.DATAREQUESTS_MAIN_PATH)
+
+        # Data Requests index
+        m.connect('datarequests_index', '', action='index', conditions={'method': ['GET']})
+        m.connect('datarequest.index', '', action='index', conditions={'method': ['GET']})
+
+        # Create a Data Request
+        m.connect('datarequest.new', '/new', action='new', conditions={'method': ['GET', 'POST']})
+
+        # Show a Data Request
+        m.connect('show_datarequest', '/{id}',
+                  action='show', conditions={'method': ['GET']}, ckan_icon=common.get_question_icon())
+        m.connect('datarequest.show', '/{id}',
+                  action='show', conditions={'method': ['GET']}, ckan_icon=common.get_question_icon())
+
+        # Update a Data Request
+        m.connect('datarequest.update', '/edit/{id}',
+                  action='update', conditions={'method': ['GET', 'POST']})
+
+        # Delete a Data Request
+        m.connect('datarequest.delete', '/delete/{id}',
+                  action='delete', conditions={'method': ['POST']})
+
+        # Close a Data Request
+        m.connect('datarequest.close', '/close/{id}',
+                  action='close', conditions={'method': ['GET', 'POST']})
+
+        # Follow & Unfollow
+        m.connect('datarequest.follow', '/follow/{id}',
+                  action='follow', conditions={'method': ['POST']})
+
+        m.connect('datarequest.unfollow', '/unfollow/{id}',
+                  action='unfollow', conditions={'method': ['POST']})
+
+        if self.comments_enabled:
+            # Comment, update and view comments (of) a Data Request
+            m.connect('comment_datarequest', '/comment/{id}',
+                      action='comment', conditions={'method': ['GET', 'POST']}, ckan_icon='comment')
+            m.connect('datarequest.comment', '/comment/{id}',
+                      action='comment', conditions={'method': ['GET', 'POST']}, ckan_icon='comment')
+
+            # Delete data request
+            m.connect('datarequest.delete_comment', '/comment/{datarequest_id}/delete/{comment_id}',
+                      action='delete_comment', conditions={'method': ['GET', 'POST']})
+
+        list_datarequests_map = SubMapper(
+            controller_map, conditions={'method': ['GET']}, ckan_icon=common.get_question_icon())
+
+        # Data Requests that belong to an organization
+        list_datarequests_map.connect(
+            'organization_datarequests', '/organization/%s/{id}' % constants.DATAREQUESTS_MAIN_PATH,
+            action='organization_datarequests')
+
+        # Data Requests that belong to a user
+        list_datarequests_map.connect(
+            'user_datarequests', '/user/%s/{id}' % constants.DATAREQUESTS_MAIN_PATH,
+            action='user_datarequests')
+
+        return mapper

From 020b7bc0e436eb228d9520f6f428a82740d894ec Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Tue, 9 Nov 2021 16:02:13 +1000
Subject: [PATCH 130/276] [QOL-7970] fix template and asset directories

---
 ckanext/datarequests/plugin/__init__.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ckanext/datarequests/plugin/__init__.py b/ckanext/datarequests/plugin/__init__.py
index ec9aacd9..7f89bd8c 100644
--- a/ckanext/datarequests/plugin/__init__.py
+++ b/ckanext/datarequests/plugin/__init__.py
@@ -110,13 +110,13 @@ def get_auth_functions(self):
     def update_config(self, config):
         # Add this plugin's templates dir to CKAN's extra_template_paths, so
         # that CKAN will use this plugin's custom templates.
-        tk.add_template_directory(config, 'templates')
+        tk.add_template_directory(config, '../templates')
 
         # Register this plugin's fanstatic directory with CKAN.
-        tk.add_public_directory(config, 'public')
+        tk.add_public_directory(config, '../public')
 
         # Register this plugin's fanstatic directory with CKAN.
-        tk.add_resource('fanstatic', 'datarequest')
+        tk.add_resource('fanstatic', '../datarequest')
 
     def update_config_schema(self, schema):
         if self.closing_circumstances_enabled:
@@ -163,7 +163,7 @@ def i18n_directory(self):
         # assume plugin is called ckanext.<myplugin>.<...>.PluginClass
         extension_module_name = '.'.join(self.__module__.split('.')[:3])
         module = sys.modules[extension_module_name]
-        return os.path.join(os.path.dirname(module.__file__), 'i18n')
+        return os.path.join(os.path.dirname(module.__file__), '..', 'i18n')
 
     def i18n_locales(self):
         '''Change the list of locales that this plugin handles

From d777cfd95d8664e78c889d5b8ac32b5b7cf35f13 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Tue, 9 Nov 2021 16:14:48 +1000
Subject: [PATCH 131/276] [QOL-7970] adjust tests to use module not class

---
 .../datarequests/tests/test_ui_controller.py  | 60 +++++++++----------
 1 file changed, 27 insertions(+), 33 deletions(-)

diff --git a/ckanext/datarequests/tests/test_ui_controller.py b/ckanext/datarequests/tests/test_ui_controller.py
index 2b9b3fff..e7740155 100644
--- a/ckanext/datarequests/tests/test_ui_controller.py
+++ b/ckanext/datarequests/tests/test_ui_controller.py
@@ -58,9 +58,6 @@ def setUp(self):
         self._helpers = controller.helpers
         controller.helpers = MagicMock()
 
-        self._base = controller.base
-        controller.base = MagicMock()
-
         self._datarequests_per_page = controller.constants.DATAREQUESTS_PER_PAGE
 
         self.expected_context = {
@@ -70,8 +67,6 @@ def setUp(self):
             'auth_user_obj': controller.c.userobj
         }
 
-        self.controller_instance = controller.DataRequestsUI()
-
     def tearDown(self):
         controller.plugins = self._plugins
         controller.tk = self._tk
@@ -80,7 +75,6 @@ def tearDown(self):
         controller.model = self._model
         controller.request = self._request
         controller.helpers = self._helpers
-        controller.base = self._base
         controller.constants.DATAREQUESTS_PER_PAGE = self._datarequests_per_page
 
     ######################################################################
@@ -138,7 +132,7 @@ def test_new_no_post(self, authorized):
         if not authorized:
             controller.tk.check_access.side_effect = controller.tk.NotAuthorized('User not authorized')
 
-        result = self.controller_instance.new()
+        result = controller.new()
 
         controller.tk.check_access.assert_called_once_with(constants.CREATE_DATAREQUEST, self.expected_context, None)
 
@@ -182,7 +176,7 @@ def test_new_post_content(self, authorized, validation_error):
             'description': 'Example Description',
             'organization_id': 'organization uuid4'
         }
-        result = self.controller_instance.new()
+        result = controller.new()
 
         # Authorize function has been called
         controller.tk.check_access.assert_called_once_with(constants.CREATE_DATAREQUEST,
@@ -222,10 +216,10 @@ def test_new_post_content(self, authorized, validation_error):
     ######################################################################
 
     def test_show_not_authorized(self):
-        self._test_not_authorized(self.controller_instance.show, 'view', constants.SHOW_DATAREQUEST)
+        self._test_not_authorized(controller.show, 'view', constants.SHOW_DATAREQUEST)
 
     def test_show_not_found(self):
-        self._test_not_found(self.controller_instance.show, constants.SHOW_DATAREQUEST)
+        self._test_not_found(controller.show, constants.SHOW_DATAREQUEST)
 
     @parameterized.expand({
         (False, False, None),
@@ -293,7 +287,7 @@ def _get_action(action):
         controller.tk.get_action.side_effect = _get_action
 
         # Call the function
-        result = self.controller_instance.show(datarequest_id)
+        result = controller.show(datarequest_id)
 
         # Authorize function has been called
         controller.tk.check_access.assert_called_once_with(constants.SHOW_DATAREQUEST, self.expected_context,
@@ -316,10 +310,10 @@ def _get_action(action):
     ######################################################################
 
     def test_update_not_authorized(self):
-        self._test_not_authorized(self.controller_instance.update, 'update', constants.UPDATE_DATAREQUEST)
+        self._test_not_authorized(controller.update, 'update', constants.UPDATE_DATAREQUEST)
 
     def test_update_not_found(self):
-        self._test_not_found(self.controller_instance.update, constants.UPDATE_DATAREQUEST)
+        self._test_not_found(controller.update, constants.UPDATE_DATAREQUEST)
 
     def test_update_no_post_content(self):
         controller.tk.response.location = None
@@ -332,7 +326,7 @@ def test_update_no_post_content(self):
         show_datarequest.return_value = datarequest
 
         # Call the function
-        result = self.controller_instance.update(datarequest_id)
+        result = controller.update(datarequest_id)
 
         # Authorize function has been called
         controller.tk.check_access.assert_called_once_with(constants.UPDATE_DATAREQUEST, self.expected_context, {'id': datarequest_id})
@@ -392,7 +386,7 @@ def _get_action(action):
             'description': 'Example Description',
             'organization_id': 'organization uuid4'
         }
-        result = self.controller_instance.update(datarequest_id)
+        result = controller.update(datarequest_id)
 
         # Authorize function has been called
         controller.tk.check_access.assert_called_once_with(constants.UPDATE_DATAREQUEST, self.expected_context, {'id': datarequest_id})
@@ -438,7 +432,7 @@ def test_index_not_authorized(self):
         controller.request.GET = {'organization': organization_name}
 
         # Call the function
-        result = self.controller_instance.index()
+        result = controller.index()
 
         # Assertions
         expected_data_req = {'organization_id': organization_name, 'limit': 10, 'offset': 0, 'sort': 'desc'}
@@ -452,7 +446,7 @@ def test_index_invalid_page(self):
         controller.request.GET = controller.request.params = {'page': '2a'}
 
         # Call the function
-        result = self.controller_instance.index()
+        result = controller.index()
 
         # Assertions
         controller.tk.abort.assert_called_once_with(400, '"page" parameter must be an integer')
@@ -557,7 +551,7 @@ def _get_action(action):
         controller.helpers.url_for.return_value = base_url
 
         # Call the function
-        function = getattr(self.controller_instance, func)
+        function = getattr(controller, func)
         result = function(**params)
 
         # Assertions
@@ -636,10 +630,10 @@ def _get_action(action):
     ######################################################################
 
     def test_delete_not_authorized(self):
-        self._test_not_authorized(self.controller_instance.delete, 'delete', constants.DELETE_DATAREQUEST)
+        self._test_not_authorized(controller.delete, 'delete', constants.DELETE_DATAREQUEST)
 
     def test_delete_not_found(self):
-        self._test_not_found(self.controller_instance.delete, constants.DELETE_DATAREQUEST)
+        self._test_not_found(controller.delete, constants.DELETE_DATAREQUEST)
 
     def test_delete(self):
         datarequest_id = 'example_uuidv4'
@@ -653,7 +647,7 @@ def test_delete(self):
         delete_datarequest.return_value = datarequest
 
         # Call the function
-        result = self.controller_instance.delete(datarequest_id)
+        result = controller.delete(datarequest_id)
 
         # Assertions
         # The result
@@ -677,10 +671,10 @@ def test_delete(self):
     ######################################################################
 
     def test_close_not_authorized(self):
-        self._test_not_authorized(self.controller_instance.close, 'close', constants.CLOSE_DATAREQUEST)
+        self._test_not_authorized(controller.close, 'close', constants.CLOSE_DATAREQUEST)
 
     def test_close_not_found(self):
-        self._test_not_found(self.controller_instance.close, constants.CLOSE_DATAREQUEST)
+        self._test_not_found(controller.close, constants.CLOSE_DATAREQUEST)
 
     @parameterized.expand([
         (None,),
@@ -722,7 +716,7 @@ def _get_action(action):
         controller.tk.get_action.side_effect = _get_action
 
         # Call the function
-        result = self.controller_instance.close(datarequest_id)
+        result = controller.close(datarequest_id)
 
         # Check that the methods has been called
         controller.tk.check_access.assert_called_once_with(constants.CLOSE_DATAREQUEST, self.expected_context, {'id': datarequest_id})
@@ -763,7 +757,7 @@ def _get_action(action):
         controller.tk.get_action.side_effect = _get_action
 
         # Call the function
-        result = self.controller_instance.close(datarequest_id)
+        result = controller.close(datarequest_id)
 
         # Checks
         controller.helpers.url_for.assert_called_once_with(
@@ -794,7 +788,7 @@ def test_comment_list_not_authorized(self):
         controller.tk.check_access.side_effect = controller.tk.NotAuthorized('User not authorized')
 
         # Call the function
-        result = self.controller_instance.comment(datarequest_id)
+        result = controller.comment(datarequest_id)
 
         # Assertions
         controller.tk.check_access.assert_called_once_with(constants.LIST_DATAREQUEST_COMMENTS, self.expected_context, {'datarequest_id': datarequest_id})
@@ -807,7 +801,7 @@ def test_comment_list_not_found(self):
         controller.tk.get_action.return_value.side_effect = controller.tk.ObjectNotFound('Comment not found')
 
         # Call the function
-        result = self.controller_instance.comment(datarequest_id)
+        result = controller.comment(datarequest_id)
 
         # Assertions
         controller.tk.get_action(constants.COMMENT_DATAREQUEST)
@@ -874,7 +868,7 @@ def _get_action(action):
         controller.tk.get_action.side_effect = _get_action
 
         # Call the function
-        result = self.controller_instance.comment(datarequest_id)
+        result = controller.comment(datarequest_id)
 
         # Check the result
         controller.tk.render.assert_called_once_with('datarequests/comment.html')
@@ -942,7 +936,7 @@ def test_delete_comment_not_authorized(self):
         controller.tk.check_access.side_effect = controller.tk.NotAuthorized('User not authorized')
 
         # Call the function
-        result = self.controller_instance.delete_comment('datarequest_id', comment_id)
+        result = controller.delete_comment('datarequest_id', comment_id)
 
         # Assertions
         controller.tk.check_access.assert_called_once_with(constants.DELETE_DATAREQUEST_COMMENT,
@@ -957,7 +951,7 @@ def test_delete_comment_not_found(self):
         controller.tk.get_action.return_value.side_effect = controller.tk.ObjectNotFound('Comment not found')
 
         # Call the function
-        result = self.controller_instance.delete_comment(datarequest_id, comment_id)
+        result = controller.delete_comment(datarequest_id, comment_id)
 
         # Assertions
         controller.tk.get_action(constants.DELETE_DATAREQUEST_COMMENT)
@@ -970,7 +964,7 @@ def test_delete_comment(self):
         comment_id = 'comment_uuidv4'
 
         # Call
-        self.controller_instance.delete_comment(datarequest_id, comment_id)
+        controller.delete_comment(datarequest_id, comment_id)
 
         # Check calls
         controller.tk.get_action.assert_called_once_with(constants.DELETE_DATAREQUEST_COMMENT)
@@ -988,7 +982,7 @@ def test_delete_comment(self):
     ######################################################################
 
     def test_follow(self):
-        self.controller_instance.follow('example_uuidv4')
+        controller.follow('example_uuidv4')
 
     def test_unfollow(self):
-        self.controller_instance.unfollow('example_uuidv4')
+        controller.unfollow('example_uuidv4')

From 058ef0320078b1a30f561be256039520a6796914 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Tue, 9 Nov 2021 16:28:06 +1000
Subject: [PATCH 132/276] [QOL-7970] replace f-strings with Python 2 compatible
 syntax

---
 ckanext/datarequests/plugin/flask_plugin.py | 25 +++++++++++----------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/ckanext/datarequests/plugin/flask_plugin.py b/ckanext/datarequests/plugin/flask_plugin.py
index 7bb4420a..6a41c7b9 100644
--- a/ckanext/datarequests/plugin/flask_plugin.py
+++ b/ckanext/datarequests/plugin/flask_plugin.py
@@ -18,52 +18,52 @@ class MixinPlugin(p.SingletonPlugin):
     def get_blueprint(self):
         rules = [
             (
-                f"/{constants.DATAREQUESTS_MAIN_PATH}",
+                "/" + constants.DATAREQUESTS_MAIN_PATH,
                 "index",
                 ui_controller.index,
             ),
             (
-                f"/{constants.DATAREQUESTS_MAIN_PATH}/new",
+                "/{}/new".format(constants.DATAREQUESTS_MAIN_PATH),
                 "new",
                 ui_controller.new,
             ),
             (
-                f"/{constants.DATAREQUESTS_MAIN_PATH}/<id>",
+                "/{}/<id>".format(constants.DATAREQUESTS_MAIN_PATH),
                 "show",
                 ui_controller.show,
             ),
             (
-                f"/{constants.DATAREQUESTS_MAIN_PATH}/edit/<id>",
+                "/{}/edit/<id>".format(constants.DATAREQUESTS_MAIN_PATH),
                 "update",
                 ui_controller.update,
             ),
             (
-                f"/{constants.DATAREQUESTS_MAIN_PATH}/delete/<id>",
+                "/{}/delete/<id>".format(constants.DATAREQUESTS_MAIN_PATH),
                 "delete",
                 ui_controller.delete,
             ),
             (
-                f"/{constants.DATAREQUESTS_MAIN_PATH}/close/<id>",
+                "/{}/close/<id>".format(constants.DATAREQUESTS_MAIN_PATH),
                 "close",
                 ui_controller.close,
             ),
             (
-                f"/{constants.DATAREQUESTS_MAIN_PATH}/follow/<datarequest_id>",
+                "/{}/follow/<datarequest_id>".format(constants.DATAREQUESTS_MAIN_PATH),
                 "follow",
                 ui_controller.follow,
             ),
             (
-                f"/{constants.DATAREQUESTS_MAIN_PATH}/unfollow/<datarequest_id>",
+                "/{}/unfollow/<datarequest_id>".format(constants.DATAREQUESTS_MAIN_PATH),
                 "unfollow",
                 ui_controller.unfollow,
             ),
             (
-                f"/organization/{constants.DATAREQUESTS_MAIN_PATH}/<id>",
+                "/organization/{}/<id>".format(constants.DATAREQUESTS_MAIN_PATH),
                 "organization",
                 ui_controller.organization,
             ),
             (
-                f"/user/{constants.DATAREQUESTS_MAIN_PATH}/<id>",
+                "/user/{}/<id>".format(constants.DATAREQUESTS_MAIN_PATH),
                 "user",
                 ui_controller.user,
             ),
@@ -73,12 +73,13 @@ def get_blueprint(self):
             rules.extend(
                 [
                     (
-                        f"/{constants.DATAREQUESTS_MAIN_PATH}/comment/<id>",
+                        "/{}/comment/<id>".format(constants.DATAREQUESTS_MAIN_PATH),
                         "comment",
                         ui_controller.comment,
                     ),
                     (
-                        f"/{constants.DATAREQUESTS_MAIN_PATH}/comment/<datarequest_id>/delete/<comment_id>",
+                        "/{}/comment/<datarequest_id>/delete/<comment_id>".format(
+                            constants.DATAREQUESTS_MAIN_PATH),
                         "delete_comment",
                         ui_controller.delete_comment,
                     ),

From 00db1560a06784a9f2823915367bafb2dd38706e Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Tue, 9 Nov 2021 16:43:34 +1000
Subject: [PATCH 133/276] [QOL-7970] adjust tests to use correct Pylons
 controller

---
 .../datarequests/tests/test_ui_controller.py  | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/ckanext/datarequests/tests/test_ui_controller.py b/ckanext/datarequests/tests/test_ui_controller.py
index e7740155..aa6ba98e 100644
--- a/ckanext/datarequests/tests/test_ui_controller.py
+++ b/ckanext/datarequests/tests/test_ui_controller.py
@@ -26,8 +26,8 @@
 
 
 INDEX_FUNCTION = 'index'
-ORGANIZATION_DATAREQUESTS_FUNCTION = 'organization_datarequests'
-USER_DATAREQUESTS_FUNCTION = 'user_datarequests'
+ORGANIZATION_DATAREQUESTS_FUNCTION = 'organization'
+USER_DATAREQUESTS_FUNCTION = 'user'
 
 
 class UIControllerTest(unittest.TestCase):
@@ -204,7 +204,7 @@ def test_new_post_content(self, authorized, validation_error):
                 self.assertEquals({}, controller.c.errors_summary)
                 self.assertEquals({}, controller.c.datarequest)
                 controller.helpers.url_for.assert_called_once_with(
-                    controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
+                    controller='ckanext.datarequests.controllers.pylons_controller:DataRequestsUI',
                     action='show', id=datarequest_id)
                 controller.tk.redirect_to.assert_called_once_with(controller.helpers.url_for.return_value)
         else:
@@ -415,7 +415,7 @@ def _get_action(action):
                 self.assertEquals({}, controller.c.errors_summary)
                 self.assertEquals(original_dr, controller.c.datarequest)
                 controller.helpers.url_for.assert_called_once_with(
-                    controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
+                    controller='ckanext.datarequests.controllers.pylons_controller:DataRequestsUI',
                     action='show', id=datarequest_id)
                 controller.tk.redirect_to.assert_called_once_with(controller.helpers.url_for.return_value)
         else:
@@ -601,15 +601,15 @@ def _get_action(action):
         # When URL function is called, helpers.url_for is called to get the final URL
         if func == INDEX_FUNCTION:
             controller.helpers.url_for.assert_called_once_with(
-                controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
+                controller='ckanext.datarequests.controllers.pylons_controller:DataRequestsUI',
                 action='index')
         elif func == ORGANIZATION_DATAREQUESTS_FUNCTION:
             controller.helpers.url_for.assert_called_once_with(
-                controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
+                controller='ckanext.datarequests.controllers.pylons_controller:DataRequestsUI',
                 action='organization_datarequests', id=organization)
         elif func == USER_DATAREQUESTS_FUNCTION:
             controller.helpers.url_for.assert_called_once_with(
-                controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
+                controller='ckanext.datarequests.controllers.pylons_controller:DataRequestsUI',
                 action='user_datarequests', id=user)
 
         # Check the facets
@@ -662,7 +662,7 @@ def test_delete(self):
 
         # Redirection
         controller.helpers.url_for.assert_called_once_with(
-            controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
+            controller='ckanext.datarequests.controllers.pylons_controller:DataRequestsUI',
             action='index')
         controller.tk.redirect_to.assert_called_once_with(controller.helpers.url_for.return_value)
 
@@ -761,7 +761,7 @@ def _get_action(action):
 
         # Checks
         controller.helpers.url_for.assert_called_once_with(
-            controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
+            controller='ckanext.datarequests.controllers.pylons_controller:DataRequestsUI',
             action='show', id=datarequest_id)
         controller.tk.redirect_to.assert_called_once_with(controller.helpers.url_for.return_value)
         self.assertIsNone(result)
@@ -973,7 +973,7 @@ def test_delete_comment(self):
 
         # Check redirection
         controller.helpers.url_for.assert_called_once_with(
-            controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
+            controller='ckanext.datarequests.controllers.pylons_controller:DataRequestsUI',
             action='comment', id=datarequest_id)
         controller.tk.redirect_to.assert_called_once_with(controller.helpers.url_for.return_value)
 

From 7c1635a1c6dad2e5aabee59917c419d1d6191cba Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Tue, 9 Nov 2021 17:02:13 +1000
Subject: [PATCH 134/276] [QOL-7970] restore controller path

- move shared functions to new file and restore controller path so pages don't have to change
---
 .../controllers/controller_functions.py       | 431 +++++++++++++++++
 .../controllers/pylons_controller.py          |  44 --
 .../datarequests/controllers/ui_controller.py | 443 ++----------------
 ckanext/datarequests/plugin/flask_plugin.py   |  26 +-
 ckanext/datarequests/tests/test_plugin.py     |   2 +-
 .../datarequests/tests/test_ui_controller.py  |  18 +-
 6 files changed, 482 insertions(+), 482 deletions(-)
 create mode 100644 ckanext/datarequests/controllers/controller_functions.py
 delete mode 100644 ckanext/datarequests/controllers/pylons_controller.py

diff --git a/ckanext/datarequests/controllers/controller_functions.py b/ckanext/datarequests/controllers/controller_functions.py
new file mode 100644
index 00000000..cd96a563
--- /dev/null
+++ b/ckanext/datarequests/controllers/controller_functions.py
@@ -0,0 +1,431 @@
+# encoding: utf-8
+
+import functools
+import logging
+import re
+import six
+
+from six.moves.urllib.parse import urlencode
+
+from ckan import model, plugins
+from ckan.common import request
+from ckan.lib import helpers
+from ckanext.datarequests import constants
+
+
+_link = re.compile(r'(?:(https?://)|(www\.))(\S+\b/?)([!"#$%&\'()*+,\-./:;<=>?@[\\\]^_`{|}~]*)(\s|$)', re.I)
+
+log = logging.getLogger(__name__)
+tk = plugins.toolkit
+c = tk.c
+
+
+def _get_errors_summary(errors):
+    errors_summary = {}
+
+    for key, error in errors.items():
+        errors_summary[key] = ', '.join(error)
+
+    return errors_summary
+
+
+def _encode_params(params):
+    return [(k, v.encode('utf-8') if isinstance(v, six.string_types) else str(v))
+            for k, v in params]
+
+
+def url_with_params(url, params):
+    params = _encode_params(params)
+    return url + u'?' + urlencode(params)
+
+
+def search_url(params):
+    url = helpers.url_for(controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
+                          action='index')
+    return url_with_params(url, params)
+
+
+def org_datarequest_url(params, id):
+    url = helpers.url_for(controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
+                          action='organization_datarequests', id=id)
+    return url_with_params(url, params)
+
+
+def user_datarequest_url(params, id):
+    url = helpers.url_for(controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
+                          action='user_datarequests', id=id)
+    return url_with_params(url, params)
+
+
+def _get_context():
+    return {'model': model, 'session': model.Session,
+            'user': c.user, 'auth_user_obj': c.userobj}
+
+
+def _show_index(user_id, organization_id, include_organization_facet, url_func, file_to_render):
+
+    def pager_url(state=None, sort=None, q=None, page=None):
+        params = []
+
+        if q:
+            params.append(('q', q))
+
+        if state is not None:
+            params.append(('state', state))
+
+        params.append(('sort', sort))
+        params.append(('page', page))
+
+        return url_func(params)
+
+    try:
+        context = _get_context()
+        page = int(request.GET.get('page', 1))
+        limit = constants.DATAREQUESTS_PER_PAGE
+        offset = (page - 1) * constants.DATAREQUESTS_PER_PAGE
+        data_dict = {'offset': offset, 'limit': limit}
+
+        state = request.GET.get('state', None)
+        if state:
+            data_dict['closed'] = True if state == 'closed' else False
+
+        q = request.GET.get('q', '')
+        if q:
+            data_dict['q'] = q
+
+        if organization_id:
+            data_dict['organization_id'] = organization_id
+
+        if user_id:
+            data_dict['user_id'] = user_id
+
+        sort = request.GET.get('sort', 'desc')
+        sort = sort if sort in ['asc', 'desc'] else 'desc'
+        if sort is not None:
+            data_dict['sort'] = sort
+
+        tk.check_access(constants.LIST_DATAREQUESTS, context, data_dict)
+        datarequests_list = tk.get_action(constants.LIST_DATAREQUESTS)(context, data_dict)
+
+        c.filters = [(tk._('Newest'), 'desc'), (tk._('Oldest'), 'asc')]
+        c.sort = sort
+        c.q = q
+        c.organization = organization_id
+        c.state = state
+        c.datarequest_count = datarequests_list['count']
+        c.datarequests = datarequests_list['result']
+        c.search_facets = datarequests_list['facets']
+        c.page = helpers.Page(
+            collection=datarequests_list['result'],
+            page=page,
+            url=functools.partial(pager_url, state, sort),
+            item_count=datarequests_list['count'],
+            items_per_page=limit
+        )
+        c.facet_titles = {
+            'state': tk._('State'),
+        }
+
+        # Organization facet cannot be shown when the user is viewing an org
+        if include_organization_facet is True:
+            c.facet_titles['organization'] = tk._('Organizations')
+
+        return tk.render(file_to_render, extra_vars={'user_dict': c.user_dict if hasattr(c, 'user_dict') else None, 'group_type': 'organization'})
+    except ValueError as e:
+        # This exception should only occur if the page value is not valid
+        log.warn(e)
+        tk.abort(400, tk._('"page" parameter must be an integer'))
+    except tk.NotAuthorized as e:
+        log.warn(e)
+        tk.abort(403, tk._('Unauthorized to list Data Requests'))
+
+
+def index():
+    return _show_index(None, request.GET.get('organization', ''), True, search_url, 'datarequests/index.html')
+
+
+def _process_post(action, context):
+    # If the user has submitted the form, the data request must be created
+    if request.POST:
+        data_dict = {}
+        data_dict['title'] = request.POST.get('title', '')
+        data_dict['description'] = request.POST.get('description', '')
+        data_dict['organization_id'] = request.POST.get('organization_id', '')
+
+        if action == constants.UPDATE_DATAREQUEST:
+            data_dict['id'] = request.POST.get('id', '')
+
+        try:
+            result = tk.get_action(action)(context, data_dict)
+            tk.redirect_to(helpers.url_for(controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI', action='show', id=result['id']))
+
+        except tk.ValidationError as e:
+            log.warn(e)
+            # Fill the fields that will display some information in the page
+            c.datarequest = {
+                'id': data_dict.get('id', ''),
+                'title': data_dict.get('title', ''),
+                'description': data_dict.get('description', ''),
+                'organization_id': data_dict.get('organization_id', '')
+            }
+            c.errors = e.error_dict
+            c.errors_summary = _get_errors_summary(c.errors)
+
+
+def new():
+    context = _get_context()
+
+    # Basic initialization
+    c.datarequest = {}
+    c.errors = {}
+    c.errors_summary = {}
+
+    # Check access
+    try:
+        tk.check_access(constants.CREATE_DATAREQUEST, context, None)
+        _process_post(constants.CREATE_DATAREQUEST, context)
+
+        # The form is always rendered
+        return tk.render('datarequests/new.html')
+
+    except tk.NotAuthorized as e:
+        log.warn(e)
+        tk.abort(403, tk._('Unauthorized to create a Data Request'))
+
+
+def show(id):
+    data_dict = {'id': id}
+    context = _get_context()
+
+    try:
+        tk.check_access(constants.SHOW_DATAREQUEST, context, data_dict)
+        c.datarequest = tk.get_action(constants.SHOW_DATAREQUEST)(context, data_dict)
+
+        context_ignore_auth = context.copy()
+        context_ignore_auth['ignore_auth'] = True
+
+        return tk.render('datarequests/show.html')
+    except tk.ObjectNotFound:
+        tk.abort(404, tk._('Data Request %s not found') % id)
+    except tk.NotAuthorized as e:
+        log.warn(e)
+        tk.abort(403, tk._('You are not authorized to view the Data Request %s'
+                           % id))
+
+
+def update(id):
+    data_dict = {'id': id}
+    context = _get_context()
+
+    # Basic initialization
+    c.datarequest = {}
+    c.errors = {}
+    c.errors_summary = {}
+
+    try:
+        tk.check_access(constants.UPDATE_DATAREQUEST, context, data_dict)
+        c.datarequest = tk.get_action(constants.SHOW_DATAREQUEST)(context, data_dict)
+        c.original_title = c.datarequest.get('title')
+        _process_post(constants.UPDATE_DATAREQUEST, context)
+        return tk.render('datarequests/edit.html')
+    except tk.ObjectNotFound as e:
+        log.warn(e)
+        tk.abort(404, tk._('Data Request %s not found') % id)
+    except tk.NotAuthorized as e:
+        log.warn(e)
+        tk.abort(403, tk._('You are not authorized to update the Data Request %s'
+                           % id))
+
+
+def delete(id):
+    data_dict = {'id': id}
+    context = _get_context()
+
+    try:
+        tk.check_access(constants.DELETE_DATAREQUEST, context, data_dict)
+        datarequest = tk.get_action(constants.DELETE_DATAREQUEST)(context, data_dict)
+        helpers.flash_notice(tk._('Data Request %s has been deleted') % datarequest.get('title', ''))
+        tk.redirect_to(helpers.url_for(controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI', action='index'))
+    except tk.ObjectNotFound as e:
+        log.warn(e)
+        tk.abort(404, tk._('Data Request %s not found') % id)
+    except tk.NotAuthorized as e:
+        log.warn(e)
+        tk.abort(403, tk._('You are not authorized to delete the Data Request %s'
+                           % id))
+
+
+def organization(id):
+    context = _get_context()
+    c.group_dict = tk.get_action('organization_show')(context, {'id': id})
+    url_func = functools.partial(org_datarequest_url, id=id)
+    return _show_index(None, id, False, url_func, 'organization/datarequests.html')
+
+
+def user(id):
+    context = _get_context()
+    c.user_dict = tk.get_action('user_show')(context, {'id': id, 'include_num_followers': True})
+    url_func = functools.partial(user_datarequest_url, id=id)
+    return _show_index(id, request.GET.get('organization', ''), True, url_func, 'user/datarequests.html')
+
+
+def close(id):
+    data_dict = {'id': id}
+    context = _get_context()
+
+    # Basic intialization
+    c.datarequest = {}
+
+    def _return_page(errors=None, errors_summary=None):
+        errors = errors or {}
+        errors_summary = errors_summary or {}
+        # Get datasets (if the data req belongs to an organization,
+        # only the ones that belong to the organization are shown)
+        organization_id = c.datarequest.get('organization_id', '')
+        if organization_id:
+            base_datasets = tk.get_action('organization_show')({'ignore_auth': True}, {'id': organization_id, 'include_datasets': True})['packages']
+        else:
+            # FIXME: At this time, only the 500 last modified/created datasets are retrieved.
+            # We assume that a user will close their data request with a recently added or modified dataset
+            # In the future, we should fix this with an autocomplete form...
+            # Expected for CKAN 2.3
+            base_datasets = tk.get_action('package_search')({'ignore_auth': True}, {'rows': 500})['results']
+
+        c.datasets = []
+        c.errors = errors
+        c.errors_summary = errors_summary
+        for dataset in base_datasets:
+            c.datasets.append({'name': dataset.get('name'), 'title': dataset.get('title')})
+
+        if tk.h.closing_circumstances_enabled:
+            # This is required so the form can set the currently selected close_circumstance option in the select dropdown
+            c.datarequest['close_circumstance'] = request.POST.get('close_circumstance', None)
+
+        return tk.render('datarequests/close.html')
+
+    try:
+        tk.check_access(constants.CLOSE_DATAREQUEST, context, data_dict)
+        c.datarequest = tk.get_action(constants.SHOW_DATAREQUEST)(context, data_dict)
+
+        if c.datarequest.get('closed', False):
+            tk.abort(403, tk._('This data request is already closed'))
+        elif request.POST:
+            data_dict = {}
+            data_dict['accepted_dataset_id'] = request.POST.get('accepted_dataset_id', None)
+            data_dict['id'] = id
+            if tk.h.closing_circumstances_enabled:
+                data_dict['close_circumstance'] = request.POST.get('close_circumstance', None)
+                data_dict['approx_publishing_date'] = request.POST.get('approx_publishing_date', None)
+                data_dict['condition'] = request.POST.get('condition', None)
+
+            tk.get_action(constants.CLOSE_DATAREQUEST)(context, data_dict)
+            tk.redirect_to(helpers.url_for(controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI', action='show', id=data_dict['id']))
+        else:   # GET
+            return _return_page()
+
+    except tk.ValidationError as e:     # Accepted Dataset is not valid
+        log.warn(e)
+        errors_summary = _get_errors_summary(e.error_dict)
+        return _return_page(e.error_dict, errors_summary)
+    except tk.ObjectNotFound as e:
+        log.warn(e)
+        tk.abort(404, tk._('Data Request %s not found') % id)
+    except tk.NotAuthorized as e:
+        log.warn(e)
+        tk.abort(403, tk._('You are not authorized to close the Data Request %s'
+                           % id))
+
+
+def comment(id):
+    try:
+        context = _get_context()
+        data_dict_comment_list = {'datarequest_id': id}
+        data_dict_dr_show = {'id': id}
+        tk.check_access(constants.LIST_DATAREQUEST_COMMENTS, context, data_dict_comment_list)
+
+        # Raises 404 Not Found if the data request does not exist
+        c.datarequest = tk.get_action(constants.SHOW_DATAREQUEST)(context, data_dict_dr_show)
+
+        comment_text = request.POST.get('comment', '')
+        comment_id = request.POST.get('comment-id', '')
+
+        if request.POST:
+            action = constants.COMMENT_DATAREQUEST
+            action_text = 'comment'
+
+            if comment_id:
+                action = constants.UPDATE_DATAREQUEST_COMMENT
+                action_text = 'update comment'
+
+            try:
+                comment_data_dict = {'datarequest_id': id, 'comment': comment_text, 'id': comment_id}
+                updated_comment = tk.get_action(action)(context, comment_data_dict)
+
+                if not comment_id:
+                    flash_message = tk._('Comment has been published')
+                else:
+                    flash_message = tk._('Comment has been updated')
+
+                helpers.flash_notice(flash_message)
+
+            except tk.NotAuthorized as e:
+                log.warn(e)
+                tk.abort(403, tk._('You are not authorized to %s' % action_text))
+            except tk.ValidationError as e:
+                log.warn(e)
+                c.errors = e.error_dict
+                c.errors_summary = _get_errors_summary(c.errors)
+            except tk.ObjectNotFound as e:
+                log.warn(e)
+                tk.abort(404, tk._(str(e)))
+            # Other exceptions are not expected. Otherwise, the request will fail.
+
+            # This is required to scroll the user to the appropriate comment
+            if 'updated_comment' in locals():
+                c.updated_comment = updated_comment
+            else:
+                c.updated_comment = {
+                    'id': comment_id,
+                    'comment': comment_text
+                }
+
+        # Comments should be retrieved once that the comment has been created
+        get_comments_data_dict = {'datarequest_id': id}
+        c.comments = tk.get_action(constants.LIST_DATAREQUEST_COMMENTS)(context, get_comments_data_dict)
+
+        return tk.render('datarequests/comment.html')
+
+    except tk.ObjectNotFound as e:
+        log.warn(e)
+        tk.abort(404, tk._('Data Request %s not found' % id))
+
+    except tk.NotAuthorized as e:
+        log.warn(e)
+        tk.abort(403, tk._('You are not authorized to list the comments of the Data Request %s'
+                           % id))
+
+
+def delete_comment(datarequest_id, comment_id):
+    try:
+        context = _get_context()
+        data_dict = {'id': comment_id}
+        tk.check_access(constants.DELETE_DATAREQUEST_COMMENT, context, data_dict)
+        tk.get_action(constants.DELETE_DATAREQUEST_COMMENT)(context, data_dict)
+        helpers.flash_notice(tk._('Comment has been deleted'))
+        tk.redirect_to(helpers.url_for(controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI', action='comment', id=datarequest_id))
+    except tk.ObjectNotFound as e:
+        log.warn(e)
+        tk.abort(404, tk._('Comment %s not found') % comment_id)
+    except tk.NotAuthorized as e:
+        log.warn(e)
+        tk.abort(403, tk._('You are not authorized to delete this comment'))
+
+
+def follow(datarequest_id):
+    # Method is not called
+    pass
+
+
+def unfollow(datarequest_id):
+    # Method is not called
+    pass
diff --git a/ckanext/datarequests/controllers/pylons_controller.py b/ckanext/datarequests/controllers/pylons_controller.py
deleted file mode 100644
index f5859207..00000000
--- a/ckanext/datarequests/controllers/pylons_controller.py
+++ /dev/null
@@ -1,44 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from ckan.plugins.toolkit import BaseController
-
-from . import ui_controller
-
-
-class DataRequestsUI(BaseController):
-
-    def index(self):
-        return ui_controller.index()
-
-    def new(self):
-        return ui_controller.new()
-
-    def show(self, id):
-        return ui_controller.show(id)
-
-    def update(self, id):
-        return ui_controller.update(id)
-
-    def delete(self, id):
-        return ui_controller.delete(id)
-
-    def organization_datarequests(self, id):
-        return ui_controller.organization(id)
-
-    def user_datarequests(self, id):
-        return ui_controller.user(id)
-
-    def close(self, id):
-        return ui_controller.close(id)
-
-    def comment(self, id):
-        return ui_controller.comment(id)
-
-    def delete_comment(self, datarequest_id, comment_id):
-        return ui_controller.delete_comment(datarequest_id, comment_id)
-
-    def follow(self, datarequest_id):
-        return ui_controller.follow(datarequest_id)
-
-    def unfollow(self, datarequest_id):
-        return ui_controller.unfollow(datarequest_id)
diff --git a/ckanext/datarequests/controllers/ui_controller.py b/ckanext/datarequests/controllers/ui_controller.py
index cd96a563..f5859207 100644
--- a/ckanext/datarequests/controllers/ui_controller.py
+++ b/ckanext/datarequests/controllers/ui_controller.py
@@ -1,431 +1,44 @@
-# encoding: utf-8
+# -*- coding: utf-8 -*-
 
-import functools
-import logging
-import re
-import six
+from ckan.plugins.toolkit import BaseController
 
-from six.moves.urllib.parse import urlencode
+from . import ui_controller
 
-from ckan import model, plugins
-from ckan.common import request
-from ckan.lib import helpers
-from ckanext.datarequests import constants
 
+class DataRequestsUI(BaseController):
 
-_link = re.compile(r'(?:(https?://)|(www\.))(\S+\b/?)([!"#$%&\'()*+,\-./:;<=>?@[\\\]^_`{|}~]*)(\s|$)', re.I)
+    def index(self):
+        return ui_controller.index()
 
-log = logging.getLogger(__name__)
-tk = plugins.toolkit
-c = tk.c
+    def new(self):
+        return ui_controller.new()
 
+    def show(self, id):
+        return ui_controller.show(id)
 
-def _get_errors_summary(errors):
-    errors_summary = {}
+    def update(self, id):
+        return ui_controller.update(id)
 
-    for key, error in errors.items():
-        errors_summary[key] = ', '.join(error)
+    def delete(self, id):
+        return ui_controller.delete(id)
 
-    return errors_summary
+    def organization_datarequests(self, id):
+        return ui_controller.organization(id)
 
+    def user_datarequests(self, id):
+        return ui_controller.user(id)
 
-def _encode_params(params):
-    return [(k, v.encode('utf-8') if isinstance(v, six.string_types) else str(v))
-            for k, v in params]
+    def close(self, id):
+        return ui_controller.close(id)
 
+    def comment(self, id):
+        return ui_controller.comment(id)
 
-def url_with_params(url, params):
-    params = _encode_params(params)
-    return url + u'?' + urlencode(params)
+    def delete_comment(self, datarequest_id, comment_id):
+        return ui_controller.delete_comment(datarequest_id, comment_id)
 
+    def follow(self, datarequest_id):
+        return ui_controller.follow(datarequest_id)
 
-def search_url(params):
-    url = helpers.url_for(controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
-                          action='index')
-    return url_with_params(url, params)
-
-
-def org_datarequest_url(params, id):
-    url = helpers.url_for(controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
-                          action='organization_datarequests', id=id)
-    return url_with_params(url, params)
-
-
-def user_datarequest_url(params, id):
-    url = helpers.url_for(controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
-                          action='user_datarequests', id=id)
-    return url_with_params(url, params)
-
-
-def _get_context():
-    return {'model': model, 'session': model.Session,
-            'user': c.user, 'auth_user_obj': c.userobj}
-
-
-def _show_index(user_id, organization_id, include_organization_facet, url_func, file_to_render):
-
-    def pager_url(state=None, sort=None, q=None, page=None):
-        params = []
-
-        if q:
-            params.append(('q', q))
-
-        if state is not None:
-            params.append(('state', state))
-
-        params.append(('sort', sort))
-        params.append(('page', page))
-
-        return url_func(params)
-
-    try:
-        context = _get_context()
-        page = int(request.GET.get('page', 1))
-        limit = constants.DATAREQUESTS_PER_PAGE
-        offset = (page - 1) * constants.DATAREQUESTS_PER_PAGE
-        data_dict = {'offset': offset, 'limit': limit}
-
-        state = request.GET.get('state', None)
-        if state:
-            data_dict['closed'] = True if state == 'closed' else False
-
-        q = request.GET.get('q', '')
-        if q:
-            data_dict['q'] = q
-
-        if organization_id:
-            data_dict['organization_id'] = organization_id
-
-        if user_id:
-            data_dict['user_id'] = user_id
-
-        sort = request.GET.get('sort', 'desc')
-        sort = sort if sort in ['asc', 'desc'] else 'desc'
-        if sort is not None:
-            data_dict['sort'] = sort
-
-        tk.check_access(constants.LIST_DATAREQUESTS, context, data_dict)
-        datarequests_list = tk.get_action(constants.LIST_DATAREQUESTS)(context, data_dict)
-
-        c.filters = [(tk._('Newest'), 'desc'), (tk._('Oldest'), 'asc')]
-        c.sort = sort
-        c.q = q
-        c.organization = organization_id
-        c.state = state
-        c.datarequest_count = datarequests_list['count']
-        c.datarequests = datarequests_list['result']
-        c.search_facets = datarequests_list['facets']
-        c.page = helpers.Page(
-            collection=datarequests_list['result'],
-            page=page,
-            url=functools.partial(pager_url, state, sort),
-            item_count=datarequests_list['count'],
-            items_per_page=limit
-        )
-        c.facet_titles = {
-            'state': tk._('State'),
-        }
-
-        # Organization facet cannot be shown when the user is viewing an org
-        if include_organization_facet is True:
-            c.facet_titles['organization'] = tk._('Organizations')
-
-        return tk.render(file_to_render, extra_vars={'user_dict': c.user_dict if hasattr(c, 'user_dict') else None, 'group_type': 'organization'})
-    except ValueError as e:
-        # This exception should only occur if the page value is not valid
-        log.warn(e)
-        tk.abort(400, tk._('"page" parameter must be an integer'))
-    except tk.NotAuthorized as e:
-        log.warn(e)
-        tk.abort(403, tk._('Unauthorized to list Data Requests'))
-
-
-def index():
-    return _show_index(None, request.GET.get('organization', ''), True, search_url, 'datarequests/index.html')
-
-
-def _process_post(action, context):
-    # If the user has submitted the form, the data request must be created
-    if request.POST:
-        data_dict = {}
-        data_dict['title'] = request.POST.get('title', '')
-        data_dict['description'] = request.POST.get('description', '')
-        data_dict['organization_id'] = request.POST.get('organization_id', '')
-
-        if action == constants.UPDATE_DATAREQUEST:
-            data_dict['id'] = request.POST.get('id', '')
-
-        try:
-            result = tk.get_action(action)(context, data_dict)
-            tk.redirect_to(helpers.url_for(controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI', action='show', id=result['id']))
-
-        except tk.ValidationError as e:
-            log.warn(e)
-            # Fill the fields that will display some information in the page
-            c.datarequest = {
-                'id': data_dict.get('id', ''),
-                'title': data_dict.get('title', ''),
-                'description': data_dict.get('description', ''),
-                'organization_id': data_dict.get('organization_id', '')
-            }
-            c.errors = e.error_dict
-            c.errors_summary = _get_errors_summary(c.errors)
-
-
-def new():
-    context = _get_context()
-
-    # Basic initialization
-    c.datarequest = {}
-    c.errors = {}
-    c.errors_summary = {}
-
-    # Check access
-    try:
-        tk.check_access(constants.CREATE_DATAREQUEST, context, None)
-        _process_post(constants.CREATE_DATAREQUEST, context)
-
-        # The form is always rendered
-        return tk.render('datarequests/new.html')
-
-    except tk.NotAuthorized as e:
-        log.warn(e)
-        tk.abort(403, tk._('Unauthorized to create a Data Request'))
-
-
-def show(id):
-    data_dict = {'id': id}
-    context = _get_context()
-
-    try:
-        tk.check_access(constants.SHOW_DATAREQUEST, context, data_dict)
-        c.datarequest = tk.get_action(constants.SHOW_DATAREQUEST)(context, data_dict)
-
-        context_ignore_auth = context.copy()
-        context_ignore_auth['ignore_auth'] = True
-
-        return tk.render('datarequests/show.html')
-    except tk.ObjectNotFound:
-        tk.abort(404, tk._('Data Request %s not found') % id)
-    except tk.NotAuthorized as e:
-        log.warn(e)
-        tk.abort(403, tk._('You are not authorized to view the Data Request %s'
-                           % id))
-
-
-def update(id):
-    data_dict = {'id': id}
-    context = _get_context()
-
-    # Basic initialization
-    c.datarequest = {}
-    c.errors = {}
-    c.errors_summary = {}
-
-    try:
-        tk.check_access(constants.UPDATE_DATAREQUEST, context, data_dict)
-        c.datarequest = tk.get_action(constants.SHOW_DATAREQUEST)(context, data_dict)
-        c.original_title = c.datarequest.get('title')
-        _process_post(constants.UPDATE_DATAREQUEST, context)
-        return tk.render('datarequests/edit.html')
-    except tk.ObjectNotFound as e:
-        log.warn(e)
-        tk.abort(404, tk._('Data Request %s not found') % id)
-    except tk.NotAuthorized as e:
-        log.warn(e)
-        tk.abort(403, tk._('You are not authorized to update the Data Request %s'
-                           % id))
-
-
-def delete(id):
-    data_dict = {'id': id}
-    context = _get_context()
-
-    try:
-        tk.check_access(constants.DELETE_DATAREQUEST, context, data_dict)
-        datarequest = tk.get_action(constants.DELETE_DATAREQUEST)(context, data_dict)
-        helpers.flash_notice(tk._('Data Request %s has been deleted') % datarequest.get('title', ''))
-        tk.redirect_to(helpers.url_for(controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI', action='index'))
-    except tk.ObjectNotFound as e:
-        log.warn(e)
-        tk.abort(404, tk._('Data Request %s not found') % id)
-    except tk.NotAuthorized as e:
-        log.warn(e)
-        tk.abort(403, tk._('You are not authorized to delete the Data Request %s'
-                           % id))
-
-
-def organization(id):
-    context = _get_context()
-    c.group_dict = tk.get_action('organization_show')(context, {'id': id})
-    url_func = functools.partial(org_datarequest_url, id=id)
-    return _show_index(None, id, False, url_func, 'organization/datarequests.html')
-
-
-def user(id):
-    context = _get_context()
-    c.user_dict = tk.get_action('user_show')(context, {'id': id, 'include_num_followers': True})
-    url_func = functools.partial(user_datarequest_url, id=id)
-    return _show_index(id, request.GET.get('organization', ''), True, url_func, 'user/datarequests.html')
-
-
-def close(id):
-    data_dict = {'id': id}
-    context = _get_context()
-
-    # Basic intialization
-    c.datarequest = {}
-
-    def _return_page(errors=None, errors_summary=None):
-        errors = errors or {}
-        errors_summary = errors_summary or {}
-        # Get datasets (if the data req belongs to an organization,
-        # only the ones that belong to the organization are shown)
-        organization_id = c.datarequest.get('organization_id', '')
-        if organization_id:
-            base_datasets = tk.get_action('organization_show')({'ignore_auth': True}, {'id': organization_id, 'include_datasets': True})['packages']
-        else:
-            # FIXME: At this time, only the 500 last modified/created datasets are retrieved.
-            # We assume that a user will close their data request with a recently added or modified dataset
-            # In the future, we should fix this with an autocomplete form...
-            # Expected for CKAN 2.3
-            base_datasets = tk.get_action('package_search')({'ignore_auth': True}, {'rows': 500})['results']
-
-        c.datasets = []
-        c.errors = errors
-        c.errors_summary = errors_summary
-        for dataset in base_datasets:
-            c.datasets.append({'name': dataset.get('name'), 'title': dataset.get('title')})
-
-        if tk.h.closing_circumstances_enabled:
-            # This is required so the form can set the currently selected close_circumstance option in the select dropdown
-            c.datarequest['close_circumstance'] = request.POST.get('close_circumstance', None)
-
-        return tk.render('datarequests/close.html')
-
-    try:
-        tk.check_access(constants.CLOSE_DATAREQUEST, context, data_dict)
-        c.datarequest = tk.get_action(constants.SHOW_DATAREQUEST)(context, data_dict)
-
-        if c.datarequest.get('closed', False):
-            tk.abort(403, tk._('This data request is already closed'))
-        elif request.POST:
-            data_dict = {}
-            data_dict['accepted_dataset_id'] = request.POST.get('accepted_dataset_id', None)
-            data_dict['id'] = id
-            if tk.h.closing_circumstances_enabled:
-                data_dict['close_circumstance'] = request.POST.get('close_circumstance', None)
-                data_dict['approx_publishing_date'] = request.POST.get('approx_publishing_date', None)
-                data_dict['condition'] = request.POST.get('condition', None)
-
-            tk.get_action(constants.CLOSE_DATAREQUEST)(context, data_dict)
-            tk.redirect_to(helpers.url_for(controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI', action='show', id=data_dict['id']))
-        else:   # GET
-            return _return_page()
-
-    except tk.ValidationError as e:     # Accepted Dataset is not valid
-        log.warn(e)
-        errors_summary = _get_errors_summary(e.error_dict)
-        return _return_page(e.error_dict, errors_summary)
-    except tk.ObjectNotFound as e:
-        log.warn(e)
-        tk.abort(404, tk._('Data Request %s not found') % id)
-    except tk.NotAuthorized as e:
-        log.warn(e)
-        tk.abort(403, tk._('You are not authorized to close the Data Request %s'
-                           % id))
-
-
-def comment(id):
-    try:
-        context = _get_context()
-        data_dict_comment_list = {'datarequest_id': id}
-        data_dict_dr_show = {'id': id}
-        tk.check_access(constants.LIST_DATAREQUEST_COMMENTS, context, data_dict_comment_list)
-
-        # Raises 404 Not Found if the data request does not exist
-        c.datarequest = tk.get_action(constants.SHOW_DATAREQUEST)(context, data_dict_dr_show)
-
-        comment_text = request.POST.get('comment', '')
-        comment_id = request.POST.get('comment-id', '')
-
-        if request.POST:
-            action = constants.COMMENT_DATAREQUEST
-            action_text = 'comment'
-
-            if comment_id:
-                action = constants.UPDATE_DATAREQUEST_COMMENT
-                action_text = 'update comment'
-
-            try:
-                comment_data_dict = {'datarequest_id': id, 'comment': comment_text, 'id': comment_id}
-                updated_comment = tk.get_action(action)(context, comment_data_dict)
-
-                if not comment_id:
-                    flash_message = tk._('Comment has been published')
-                else:
-                    flash_message = tk._('Comment has been updated')
-
-                helpers.flash_notice(flash_message)
-
-            except tk.NotAuthorized as e:
-                log.warn(e)
-                tk.abort(403, tk._('You are not authorized to %s' % action_text))
-            except tk.ValidationError as e:
-                log.warn(e)
-                c.errors = e.error_dict
-                c.errors_summary = _get_errors_summary(c.errors)
-            except tk.ObjectNotFound as e:
-                log.warn(e)
-                tk.abort(404, tk._(str(e)))
-            # Other exceptions are not expected. Otherwise, the request will fail.
-
-            # This is required to scroll the user to the appropriate comment
-            if 'updated_comment' in locals():
-                c.updated_comment = updated_comment
-            else:
-                c.updated_comment = {
-                    'id': comment_id,
-                    'comment': comment_text
-                }
-
-        # Comments should be retrieved once that the comment has been created
-        get_comments_data_dict = {'datarequest_id': id}
-        c.comments = tk.get_action(constants.LIST_DATAREQUEST_COMMENTS)(context, get_comments_data_dict)
-
-        return tk.render('datarequests/comment.html')
-
-    except tk.ObjectNotFound as e:
-        log.warn(e)
-        tk.abort(404, tk._('Data Request %s not found' % id))
-
-    except tk.NotAuthorized as e:
-        log.warn(e)
-        tk.abort(403, tk._('You are not authorized to list the comments of the Data Request %s'
-                           % id))
-
-
-def delete_comment(datarequest_id, comment_id):
-    try:
-        context = _get_context()
-        data_dict = {'id': comment_id}
-        tk.check_access(constants.DELETE_DATAREQUEST_COMMENT, context, data_dict)
-        tk.get_action(constants.DELETE_DATAREQUEST_COMMENT)(context, data_dict)
-        helpers.flash_notice(tk._('Comment has been deleted'))
-        tk.redirect_to(helpers.url_for(controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI', action='comment', id=datarequest_id))
-    except tk.ObjectNotFound as e:
-        log.warn(e)
-        tk.abort(404, tk._('Comment %s not found') % comment_id)
-    except tk.NotAuthorized as e:
-        log.warn(e)
-        tk.abort(403, tk._('You are not authorized to delete this comment'))
-
-
-def follow(datarequest_id):
-    # Method is not called
-    pass
-
-
-def unfollow(datarequest_id):
-    # Method is not called
-    pass
+    def unfollow(self, datarequest_id):
+        return ui_controller.unfollow(datarequest_id)
diff --git a/ckanext/datarequests/plugin/flask_plugin.py b/ckanext/datarequests/plugin/flask_plugin.py
index 6a41c7b9..2e61b9e2 100644
--- a/ckanext/datarequests/plugin/flask_plugin.py
+++ b/ckanext/datarequests/plugin/flask_plugin.py
@@ -4,7 +4,7 @@
 from flask import Blueprint
 
 from ckanext.datarequests import constants
-from . import ui_controller
+from . import controller_functions
 
 
 datarequests_bp = Blueprint("datarequest", __name__)
@@ -20,52 +20,52 @@ def get_blueprint(self):
             (
                 "/" + constants.DATAREQUESTS_MAIN_PATH,
                 "index",
-                ui_controller.index,
+                controller_functions.index,
             ),
             (
                 "/{}/new".format(constants.DATAREQUESTS_MAIN_PATH),
                 "new",
-                ui_controller.new,
+                controller_functions.new,
             ),
             (
                 "/{}/<id>".format(constants.DATAREQUESTS_MAIN_PATH),
                 "show",
-                ui_controller.show,
+                controller_functions.show,
             ),
             (
                 "/{}/edit/<id>".format(constants.DATAREQUESTS_MAIN_PATH),
                 "update",
-                ui_controller.update,
+                controller_functions.update,
             ),
             (
                 "/{}/delete/<id>".format(constants.DATAREQUESTS_MAIN_PATH),
                 "delete",
-                ui_controller.delete,
+                controller_functions.delete,
             ),
             (
                 "/{}/close/<id>".format(constants.DATAREQUESTS_MAIN_PATH),
                 "close",
-                ui_controller.close,
+                controller_functions.close,
             ),
             (
                 "/{}/follow/<datarequest_id>".format(constants.DATAREQUESTS_MAIN_PATH),
                 "follow",
-                ui_controller.follow,
+                controller_functions.follow,
             ),
             (
                 "/{}/unfollow/<datarequest_id>".format(constants.DATAREQUESTS_MAIN_PATH),
                 "unfollow",
-                ui_controller.unfollow,
+                controller_functions.unfollow,
             ),
             (
                 "/organization/{}/<id>".format(constants.DATAREQUESTS_MAIN_PATH),
                 "organization",
-                ui_controller.organization,
+                controller_functions.organization,
             ),
             (
                 "/user/{}/<id>".format(constants.DATAREQUESTS_MAIN_PATH),
                 "user",
-                ui_controller.user,
+                controller_functions.user,
             ),
         ]
 
@@ -75,13 +75,13 @@ def get_blueprint(self):
                     (
                         "/{}/comment/<id>".format(constants.DATAREQUESTS_MAIN_PATH),
                         "comment",
-                        ui_controller.comment,
+                        controller_functions.comment,
                     ),
                     (
                         "/{}/comment/<datarequest_id>/delete/<comment_id>".format(
                             constants.DATAREQUESTS_MAIN_PATH),
                         "delete_comment",
-                        ui_controller.delete_comment,
+                        controller_functions.delete_comment,
                     ),
                 ]
             )
diff --git a/ckanext/datarequests/tests/test_plugin.py b/ckanext/datarequests/tests/test_plugin.py
index eae58063..37937133 100644
--- a/ckanext/datarequests/tests/test_plugin.py
+++ b/ckanext/datarequests/tests/test_plugin.py
@@ -139,7 +139,7 @@ def test_update_config(self):
         # Test
         config = MagicMock()
         self.plg_instance.update_config(config)
-        plugin.tk.add_template_directory.assert_called_once_with(config, 'templates')
+        plugin.tk.add_template_directory.assert_called_once_with(config, '../templates')
 
     @parameterized.expand([
         ('True',),
diff --git a/ckanext/datarequests/tests/test_ui_controller.py b/ckanext/datarequests/tests/test_ui_controller.py
index aa6ba98e..1ea36b04 100644
--- a/ckanext/datarequests/tests/test_ui_controller.py
+++ b/ckanext/datarequests/tests/test_ui_controller.py
@@ -18,7 +18,7 @@
 # along with CKAN Data Requests Extension. If not, see <http://www.gnu.org/licenses/>.
 
 from ckanext.datarequests import constants
-import ckanext.datarequests.controllers.ui_controller as controller
+import ckanext.datarequests.controllers.controller_functions as controller
 import unittest
 
 from mock import MagicMock
@@ -204,7 +204,7 @@ def test_new_post_content(self, authorized, validation_error):
                 self.assertEquals({}, controller.c.errors_summary)
                 self.assertEquals({}, controller.c.datarequest)
                 controller.helpers.url_for.assert_called_once_with(
-                    controller='ckanext.datarequests.controllers.pylons_controller:DataRequestsUI',
+                    controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
                     action='show', id=datarequest_id)
                 controller.tk.redirect_to.assert_called_once_with(controller.helpers.url_for.return_value)
         else:
@@ -415,7 +415,7 @@ def _get_action(action):
                 self.assertEquals({}, controller.c.errors_summary)
                 self.assertEquals(original_dr, controller.c.datarequest)
                 controller.helpers.url_for.assert_called_once_with(
-                    controller='ckanext.datarequests.controllers.pylons_controller:DataRequestsUI',
+                    controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
                     action='show', id=datarequest_id)
                 controller.tk.redirect_to.assert_called_once_with(controller.helpers.url_for.return_value)
         else:
@@ -601,15 +601,15 @@ def _get_action(action):
         # When URL function is called, helpers.url_for is called to get the final URL
         if func == INDEX_FUNCTION:
             controller.helpers.url_for.assert_called_once_with(
-                controller='ckanext.datarequests.controllers.pylons_controller:DataRequestsUI',
+                controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
                 action='index')
         elif func == ORGANIZATION_DATAREQUESTS_FUNCTION:
             controller.helpers.url_for.assert_called_once_with(
-                controller='ckanext.datarequests.controllers.pylons_controller:DataRequestsUI',
+                controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
                 action='organization_datarequests', id=organization)
         elif func == USER_DATAREQUESTS_FUNCTION:
             controller.helpers.url_for.assert_called_once_with(
-                controller='ckanext.datarequests.controllers.pylons_controller:DataRequestsUI',
+                controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
                 action='user_datarequests', id=user)
 
         # Check the facets
@@ -662,7 +662,7 @@ def test_delete(self):
 
         # Redirection
         controller.helpers.url_for.assert_called_once_with(
-            controller='ckanext.datarequests.controllers.pylons_controller:DataRequestsUI',
+            controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
             action='index')
         controller.tk.redirect_to.assert_called_once_with(controller.helpers.url_for.return_value)
 
@@ -761,7 +761,7 @@ def _get_action(action):
 
         # Checks
         controller.helpers.url_for.assert_called_once_with(
-            controller='ckanext.datarequests.controllers.pylons_controller:DataRequestsUI',
+            controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
             action='show', id=datarequest_id)
         controller.tk.redirect_to.assert_called_once_with(controller.helpers.url_for.return_value)
         self.assertIsNone(result)
@@ -973,7 +973,7 @@ def test_delete_comment(self):
 
         # Check redirection
         controller.helpers.url_for.assert_called_once_with(
-            controller='ckanext.datarequests.controllers.pylons_controller:DataRequestsUI',
+            controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
             action='comment', id=datarequest_id)
         controller.tk.redirect_to.assert_called_once_with(controller.helpers.url_for.return_value)
 

From 326535cbd2dfaef8f7663c7737a4b189b50fe4f9 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Tue, 9 Nov 2021 17:18:15 +1000
Subject: [PATCH 135/276] [QOL-7970] use screenshot-compatible scenario name

---
 test/features/datarequest.feature | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/test/features/datarequest.feature b/test/features/datarequest.feature
index b2fedf9b..862ceb77 100644
--- a/test/features/datarequest.feature
+++ b/test/features/datarequest.feature
@@ -11,7 +11,7 @@ Feature: Datarequest
         Then I should see an element with xpath "//a[contains(string(), 'Login to create data request')]"
 
 
-    Scenario: After logging in, the user is redirected to the datarequests page and the "Add Data Request" button is visible
+    Scenario: After logging in, the user is redirected to the datarequests page and the 'Add Data Request' button is visible
         Given "SysAdmin" as the persona
         When I go to datarequest page
         And I click the link with text "Login to create data request"
@@ -26,7 +26,7 @@ Feature: Datarequest
         And I fill in "title" with "Test data request"
         And I press the element with xpath "//button[contains(string(), 'Create data request')]"
         Then I should see an element with the css selector "div.error-explanation.alert.alert-error" within 2 seconds
-        And I should see "The form contains invalid entries" within 1 seconds    
+        And I should see "The form contains invalid entries" within 1 seconds
         And I should see an element with the css selector "span.error-block" within 1 seconds
         And I should see "Description cannot be empty" within 1 seconds
 
@@ -37,7 +37,7 @@ Feature: Datarequest
         And I press "Closed Request"
         Then I should see an element with xpath "//a[@class='btn btn-success' and contains(string(), ' Re-open')]"
 
-        Examples: Users  
+        Examples: Users
         | User                  |
         | SysAdmin              |
         | DataRequestOrgAdmin   |
@@ -49,7 +49,7 @@ Feature: Datarequest
         And I press "Closed Request"
         Then I should not see an element with xpath "//a[@class='btn btn-success' and contains(string(), ' Re-open')]"
 
-        Examples: Users  
+        Examples: Users
         | User                  |
         | CKANUser              |
         | DataRequestOrgEditor  |
@@ -65,7 +65,7 @@ Feature: Datarequest
         And I press "Test Request"
         Then I should see an element with xpath "//a[contains(string(), 'Close')]"
 
-        Examples: Users  
+        Examples: Users
         | User                  |
         | SysAdmin              |
         | DataRequestOrgAdmin   |
@@ -77,7 +77,7 @@ Feature: Datarequest
         And I press "Test Request"
         Then I should not see an element with xpath "//a[contains(string(), 'Close')]"
 
-        Examples: Users  
+        Examples: Users
         | User                  |
         | CKANUser              |
         | DataRequestOrgEditor  |
@@ -89,7 +89,7 @@ Feature: Datarequest
 
     Scenario: Creating a new data request will email the Admin users of the organisation
         Given "TestOrgEditor" as the persona
-        When I log in and create a datarequest 
+        When I log in and create a datarequest
         When I wait for 3 seconds
         Then I should receive a base64 email at "dr_admin@localhost" containing "A new data request has been added and assigned to your organisation."
         And I should receive a base64 email at "admin@localhost" containing "A new data request has been added and assigned to your organisation."
@@ -97,9 +97,9 @@ Feature: Datarequest
 
     Scenario: Closing a data request will email the creator
         Given "DataRequestOrgAdmin" as the persona
-        When I log in and create a datarequest 
+        When I log in and create a datarequest
         And I press the element with xpath "//a[contains(string(), 'Close')]"
-        And I select "Requestor initiated closure" from "close_circumstance" 
+        And I select "Requestor initiated closure" from "close_circumstance"
         And I press the element with xpath "//button[contains(string(), 'Close data request')]"
         When I wait for 3 seconds
         Then I should receive a base64 email at "dr_admin@localhost" containing "Your data request has been closed."
@@ -107,9 +107,9 @@ Feature: Datarequest
 
     Scenario: Re-Opening a data request will email the Admin users of the organisation and creator
         Given "DataRequestOrgAdmin" as the persona
-        When I log in and create a datarequest 
+        When I log in and create a datarequest
         And I press the element with xpath "//a[contains(string(), 'Close')]"
-        And I select "Requestor initiated closure" from "close_circumstance" 
+        And I select "Requestor initiated closure" from "close_circumstance"
         And I press the element with xpath "//button[contains(string(), 'Close data request')]"
         And I press the element with xpath "//a[@class='btn btn-success' and contains(string(), ' Re-open')]"
         When I wait for 3 seconds
@@ -119,7 +119,7 @@ Feature: Datarequest
 
      Scenario: Re-assigning a data request will email the Admin users of the assigned organisation and un-assigned organisation
         Given "DataRequestOrgAdmin" as the persona
-        When I log in and create a datarequest 
+        When I log in and create a datarequest
         And I press the element with xpath "//a[contains(string(), 'Manage')]"
         When I wait for 3 seconds
         # Have to use JS to change the selected value as the behaving framework does not work with autocomplete dropdown

From 9a95600d399cc3f0f1b503095e11a423f1682739 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Wed, 10 Nov 2021 08:59:16 +1000
Subject: [PATCH 136/276] [QOL-7970] oops fix import

---
 ckanext/datarequests/controllers/ui_controller.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ckanext/datarequests/controllers/ui_controller.py b/ckanext/datarequests/controllers/ui_controller.py
index f5859207..0ecf3cbc 100644
--- a/ckanext/datarequests/controllers/ui_controller.py
+++ b/ckanext/datarequests/controllers/ui_controller.py
@@ -2,7 +2,7 @@
 
 from ckan.plugins.toolkit import BaseController
 
-from . import ui_controller
+from . import controller_functions
 
 
 class DataRequestsUI(BaseController):

From d11ad16b8a108c13f915e6186c58ee90618e7b3e Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Wed, 10 Nov 2021 09:16:10 +1000
Subject: [PATCH 137/276] [QOL-7970] ensure smoke tests pass before running
 others

---
 .ahoy.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.ahoy.yml b/.ahoy.yml
index 5413ff7b..3d83d453 100644
--- a/.ahoy.yml
+++ b/.ahoy.yml
@@ -121,6 +121,7 @@ commands:
       ahoy start-ckan-job-worker &
       ahoy start-mailmock &
       sleep 5 &&
+      ahoy cli "behave ${*:-test/features}" --tags @smoke && \
       ahoy cli "behave ${*:-test/features}" || \
       [ "${ALLOW_BDD_FAIL:-0}" -eq 1 ]
       ahoy stop-mailmock

From 8fdd90f8137bd88dc5308d2b17d9335375d530e1 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Wed, 10 Nov 2021 09:16:23 +1000
Subject: [PATCH 138/276] [QOL-7970] oops fix controller function references

---
 .../datarequests/controllers/ui_controller.py | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/ckanext/datarequests/controllers/ui_controller.py b/ckanext/datarequests/controllers/ui_controller.py
index 0ecf3cbc..7555e639 100644
--- a/ckanext/datarequests/controllers/ui_controller.py
+++ b/ckanext/datarequests/controllers/ui_controller.py
@@ -2,43 +2,43 @@
 
 from ckan.plugins.toolkit import BaseController
 
-from . import controller_functions
+from . import controller_functions as controller
 
 
 class DataRequestsUI(BaseController):
 
     def index(self):
-        return ui_controller.index()
+        return controller.index()
 
     def new(self):
-        return ui_controller.new()
+        return controller.new()
 
     def show(self, id):
-        return ui_controller.show(id)
+        return controller.show(id)
 
     def update(self, id):
-        return ui_controller.update(id)
+        return controller.update(id)
 
     def delete(self, id):
-        return ui_controller.delete(id)
+        return controller.delete(id)
 
     def organization_datarequests(self, id):
-        return ui_controller.organization(id)
+        return controller.organization(id)
 
     def user_datarequests(self, id):
-        return ui_controller.user(id)
+        return controller.user(id)
 
     def close(self, id):
-        return ui_controller.close(id)
+        return controller.close(id)
 
     def comment(self, id):
-        return ui_controller.comment(id)
+        return controller.comment(id)
 
     def delete_comment(self, datarequest_id, comment_id):
-        return ui_controller.delete_comment(datarequest_id, comment_id)
+        return controller.delete_comment(datarequest_id, comment_id)
 
     def follow(self, datarequest_id):
-        return ui_controller.follow(datarequest_id)
+        return controller.follow(datarequest_id)
 
     def unfollow(self, datarequest_id):
-        return ui_controller.unfollow(datarequest_id)
+        return controller.unfollow(datarequest_id)

From 402512d552d080926a02ddfb2702f985a6c7d224 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Wed, 10 Nov 2021 09:44:12 +1000
Subject: [PATCH 139/276] [QOL-7970] fix fanstatic path

---
 ckanext/datarequests/plugin/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ckanext/datarequests/plugin/__init__.py b/ckanext/datarequests/plugin/__init__.py
index 7f89bd8c..a662468e 100644
--- a/ckanext/datarequests/plugin/__init__.py
+++ b/ckanext/datarequests/plugin/__init__.py
@@ -116,7 +116,7 @@ def update_config(self, config):
         tk.add_public_directory(config, '../public')
 
         # Register this plugin's fanstatic directory with CKAN.
-        tk.add_resource('fanstatic', '../datarequest')
+        tk.add_resource('../fanstatic', 'datarequest')
 
     def update_config_schema(self, schema):
         if self.closing_circumstances_enabled:

From f4252da0556fc099aae492f2552b36df9c0f4a0e Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Wed, 10 Nov 2021 10:00:45 +1000
Subject: [PATCH 140/276] [QOL-7970] add test for CKAN 2.7

---
 .docker/Dockerfile.ckan    | 2 +-
 .github/workflows/test.yml | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.docker/Dockerfile.ckan b/.docker/Dockerfile.ckan
index b4075f7f..5aaead47 100644
--- a/.docker/Dockerfile.ckan
+++ b/.docker/Dockerfile.ckan
@@ -1,6 +1,7 @@
 FROM amazeeio/python:2.7-ckan-21.7.0
 
 ARG SITE_URL
+ARG CKAN_VERSION
 ENV SITE_URL="${SITE_URL}"
 ENV VENV_DIR=/app/ckan/default
 ENV APP_DIR=/app
@@ -15,7 +16,6 @@ RUN apk add --no-cache curl build-base \
     && rm dockerize-alpine-linux-amd64-${DOCKERIZE_VERSION}.tar.gz
 
 # Install CKAN.
-ENV CKAN_VERSION 2.8.8
 
 RUN . ${VENV_DIR}/bin/activate \
     && pip install setuptools==36.1 \
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 89fa60d7..777c4251 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -9,10 +9,14 @@ jobs:
   test:
     strategy:
       fail-fast: false
+      matrix:
+        ckan-version: [2.7.10, 2.8.8]
 
-    name: Continuous Integration build
+    name: Continuous Integration build on CKAN ${{ matrix.ckan-version }}
     runs-on: ubuntu-latest
     container: integratedexperts/ci-builder
+    env:
+      CKAN_VERSION: ${{ matrix.ckan-version }}
 
     steps:
       - uses: actions/checkout@v2
@@ -35,6 +39,6 @@ jobs:
         if: failure()
         uses: actions/upload-artifact@v2
         with:
-          name: screenshots
+          name: CKAN ${{ matrix.ckan-version }} screenshots
           path: /tmp/artifacts/behave/screenshots
         timeout-minutes: 1

From 25d0d8abeda0f5082239dcb6686a637e4daa28ad Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Wed, 10 Nov 2021 10:05:55 +1000
Subject: [PATCH 141/276] [QOL-7970] oops pass CKAN_VERSION through Docker
 Compose

---
 docker-compose.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docker-compose.yml b/docker-compose.yml
index a1c7c008..2d81ad9a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -30,6 +30,7 @@ services:
       dockerfile: .docker/Dockerfile.ckan
       args:
         SITE_URL: "http://${PROJECT}.docker.amazee.io"
+        CKAN_VERSION:
     depends_on:
       - postgres
       - solr

From d8838e5443a23129e7ddba59c651aaf630fd740d Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Wed, 10 Nov 2021 10:19:41 +1000
Subject: [PATCH 142/276] [QOL-7970] drop QGOV theme

---
 .docker/test.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.docker/test.ini b/.docker/test.ini
index 3a7332a8..2b292929 100644
--- a/.docker/test.ini
+++ b/.docker/test.ini
@@ -95,7 +95,7 @@ ckan.redis.url = redis://redis:6379
 #       Add ``resource_proxy`` to enable resource proxying and get around the
 #       same origin policy
 # @todo:setup Cleanup the list to use only required plugins.
-ckan.plugins = stats text_view image_view recline_view datastore data_qld_theme datarequests data_qld_resources data_qld_integration ytp_comments qa archiver report
+ckan.plugins = stats text_view image_view recline_view datastore datarequests ytp_comments qa archiver report
 
 # Define which views should be created by default
 # (plugins must be loaded in ckan.plugins)

From 82010dce2361ecf4c39cf5fc14f686b32519db3d Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Wed, 10 Nov 2021 10:40:56 +1000
Subject: [PATCH 143/276] [QOL-7970] fix tests

- don't look for the QGOV-theme-specific login button
- make 'Add data request' match case-insensitive
---
 test/features/datarequest.feature | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/features/datarequest.feature b/test/features/datarequest.feature
index 862ceb77..3d2f5680 100644
--- a/test/features/datarequest.feature
+++ b/test/features/datarequest.feature
@@ -6,9 +6,9 @@ Feature: Datarequest
         Then the browser's URL should contain "/datarequest"
 
 
-    Scenario: When visiting the datarequests page as a non-logged in user, the button at the top of the page reads Login to create a data request
+    Scenario: When visiting the datarequests page as a non-logged in user, the 'Add Data Request' button is not visible
         When I go to datarequest page
-        Then I should see an element with xpath "//a[contains(string(), 'Login to create data request')]"
+        Then I should not see an element with xpath "//a[contains(string(), 'Add data request')]"
 
 
     Scenario: After logging in, the user is redirected to the datarequests page and the 'Add Data Request' button is visible
@@ -16,7 +16,7 @@ Feature: Datarequest
         When I go to datarequest page
         And I click the link with text "Login to create data request"
         And I enter my credentials and login
-        Then I should see an element with xpath "//a[contains(string(), 'Add data request')]"
+        Then I should see an element with xpath "//a[contains(string(), 'Add data request', 'i')]"
 
 
     Scenario: Data requests submitted without a description will produce an error message

From 19d014676452d52dcf9f2b727bb79cbfaa23fdd0 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Wed, 10 Nov 2021 11:00:31 +1000
Subject: [PATCH 144/276] [QOL-7970] fix tests

- drop QGOV-specific scenario
- make link test case-insensitive
---
 test/features/datarequest.feature | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/test/features/datarequest.feature b/test/features/datarequest.feature
index 3d2f5680..fce7f6cf 100644
--- a/test/features/datarequest.feature
+++ b/test/features/datarequest.feature
@@ -8,21 +8,13 @@ Feature: Datarequest
 
     Scenario: When visiting the datarequests page as a non-logged in user, the 'Add Data Request' button is not visible
         When I go to datarequest page
-        Then I should not see an element with xpath "//a[contains(string(), 'Add data request')]"
-
-
-    Scenario: After logging in, the user is redirected to the datarequests page and the 'Add Data Request' button is visible
-        Given "SysAdmin" as the persona
-        When I go to datarequest page
-        And I click the link with text "Login to create data request"
-        And I enter my credentials and login
-        Then I should see an element with xpath "//a[contains(string(), 'Add data request', 'i')]"
+        Then I should not see an element with xpath "//a[contains(string(), 'Add data request', 'i')]"
 
 
     Scenario: Data requests submitted without a description will produce an error message
         Given "SysAdmin" as the persona
         When I log in and go to datarequest page
-        And I click the link with text that contains "Add data request"
+        And I press the element with xpath "//a[contains(string(), 'Add data request', 'i')]"
         And I fill in "title" with "Test data request"
         And I press the element with xpath "//button[contains(string(), 'Create data request')]"
         Then I should see an element with the css selector "div.error-explanation.alert.alert-error" within 2 seconds

From 220c001fef14bf9e4c76d3561dcb425269a2598e Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Wed, 10 Nov 2021 11:26:04 +1000
Subject: [PATCH 145/276] [QOL-7970] drop QGOV-specific tests

- re-opening data requests is a feature of ckanext-data-qld
---
 test/features/datarequest.feature | 40 -------------------------------
 1 file changed, 40 deletions(-)

diff --git a/test/features/datarequest.feature b/test/features/datarequest.feature
index fce7f6cf..6022e5f0 100644
--- a/test/features/datarequest.feature
+++ b/test/features/datarequest.feature
@@ -23,34 +23,6 @@ Feature: Datarequest
         And I should see "Description cannot be empty" within 1 seconds
 
 
-    Scenario Outline: Sysadmin or Admin users of the assigned organisation for a data request can see a 'Re-open' button on the data request detail page for closed data requests
-        Given "<User>" as the persona
-        When I log in and go to datarequest page
-        And I press "Closed Request"
-        Then I should see an element with xpath "//a[@class='btn btn-success' and contains(string(), ' Re-open')]"
-
-        Examples: Users
-        | User                  |
-        | SysAdmin              |
-        | DataRequestOrgAdmin   |
-
-
-    Scenario Outline: Non-admin users should not see 'Re-open' button on the data request detail page for closed data requests
-        Given "<User>" as the persona
-        When I log in and go to datarequest page
-        And I press "Closed Request"
-        Then I should not see an element with xpath "//a[@class='btn btn-success' and contains(string(), ' Re-open')]"
-
-        Examples: Users
-        | User                  |
-        | CKANUser              |
-        | DataRequestOrgEditor  |
-        | DataRequestOrgMember  |
-        | TestOrgAdmin          |
-        | TestOrgEditor         |
-        | TestOrgMember         |
-
-
     Scenario Outline: Data request creator, Sysadmin and Admin users of the assigned organisation for a data request can see a 'Close' button on the data request detail page for opened data requests
         Given "<User>" as the persona
         When I log in and go to datarequest page
@@ -97,18 +69,6 @@ Feature: Datarequest
         Then I should receive a base64 email at "dr_admin@localhost" containing "Your data request has been closed."
 
 
-    Scenario: Re-Opening a data request will email the Admin users of the organisation and creator
-        Given "DataRequestOrgAdmin" as the persona
-        When I log in and create a datarequest
-        And I press the element with xpath "//a[contains(string(), 'Close')]"
-        And I select "Requestor initiated closure" from "close_circumstance"
-        And I press the element with xpath "//button[contains(string(), 'Close data request')]"
-        And I press the element with xpath "//a[@class='btn btn-success' and contains(string(), ' Re-open')]"
-        When I wait for 3 seconds
-        Then I should receive a base64 email at "dr_admin@localhost" containing "Your data request has been re-opened."
-        And I should receive a base64 email at "admin@localhost" containing "A data request assigned to your organisation has been re-opened."
-
-
      Scenario: Re-assigning a data request will email the Admin users of the assigned organisation and un-assigned organisation
         Given "DataRequestOrgAdmin" as the persona
         When I log in and create a datarequest

From 3c8a945127f8a6819c0eb658a457a3d4230738db Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Wed, 10 Nov 2021 11:39:36 +1000
Subject: [PATCH 146/276] [QOL-7970] retrieve add link case-insensitively

---
 test/features/steps/steps.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/features/steps/steps.py b/test/features/steps/steps.py
index db53b1e4..7c1aafc1 100644
--- a/test/features/steps/steps.py
+++ b/test/features/steps/steps.py
@@ -90,7 +90,7 @@ def log_in_create_a_datarequest(context):
     assert context.persona
     context.execute_steps(u"""
         When I log in and go to datarequest page
-        And I click the link with text that contains "Add data request"
+        And I press the element with xpath "//a[contains(string(), 'Add data request', 'i')]"
         And I fill in title with random text
         And I fill in "description" with "Test description"
         And I press the element with xpath "//button[contains(string(), 'Create data request')]"

From 46a31fd47cb06406e8ca1bd5fdf820bcc011bf54 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Wed, 10 Nov 2021 11:52:08 +1000
Subject: [PATCH 147/276] [QOL-7970] use matching case instead of trying
 insensitivity

---
 test/features/datarequest.feature | 2 +-
 test/features/steps/steps.py      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/features/datarequest.feature b/test/features/datarequest.feature
index 6022e5f0..634871ae 100644
--- a/test/features/datarequest.feature
+++ b/test/features/datarequest.feature
@@ -14,7 +14,7 @@ Feature: Datarequest
     Scenario: Data requests submitted without a description will produce an error message
         Given "SysAdmin" as the persona
         When I log in and go to datarequest page
-        And I press the element with xpath "//a[contains(string(), 'Add data request', 'i')]"
+        And I click the link with text that contains "Add Data Request"
         And I fill in "title" with "Test data request"
         And I press the element with xpath "//button[contains(string(), 'Create data request')]"
         Then I should see an element with the css selector "div.error-explanation.alert.alert-error" within 2 seconds
diff --git a/test/features/steps/steps.py b/test/features/steps/steps.py
index 7c1aafc1..45d3b443 100644
--- a/test/features/steps/steps.py
+++ b/test/features/steps/steps.py
@@ -90,7 +90,7 @@ def log_in_create_a_datarequest(context):
     assert context.persona
     context.execute_steps(u"""
         When I log in and go to datarequest page
-        And I press the element with xpath "//a[contains(string(), 'Add data request', 'i')]"
+        And I click the link with text that contains "Add Data Request"
         And I fill in title with random text
         And I fill in "description" with "Test description"
         And I press the element with xpath "//button[contains(string(), 'Create data request')]"

From 8478adf754af513a54b1d4b55f7f65c6186eb831 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Wed, 10 Nov 2021 12:03:30 +1000
Subject: [PATCH 148/276] [QOL-7970] fix 'Create Data Request' case

---
 test/features/datarequest.feature | 2 +-
 test/features/steps/steps.py      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/features/datarequest.feature b/test/features/datarequest.feature
index 634871ae..a9227560 100644
--- a/test/features/datarequest.feature
+++ b/test/features/datarequest.feature
@@ -16,7 +16,7 @@ Feature: Datarequest
         When I log in and go to datarequest page
         And I click the link with text that contains "Add Data Request"
         And I fill in "title" with "Test data request"
-        And I press the element with xpath "//button[contains(string(), 'Create data request')]"
+        And I press the element with xpath "//button[contains(string(), 'Create Data Request')]"
         Then I should see an element with the css selector "div.error-explanation.alert.alert-error" within 2 seconds
         And I should see "The form contains invalid entries" within 1 seconds
         And I should see an element with the css selector "span.error-block" within 1 seconds
diff --git a/test/features/steps/steps.py b/test/features/steps/steps.py
index 45d3b443..ba04b723 100644
--- a/test/features/steps/steps.py
+++ b/test/features/steps/steps.py
@@ -93,5 +93,5 @@ def log_in_create_a_datarequest(context):
         And I click the link with text that contains "Add Data Request"
         And I fill in title with random text
         And I fill in "description" with "Test description"
-        And I press the element with xpath "//button[contains(string(), 'Create data request')]"
+        And I press the element with xpath "//button[contains(string(), 'Create Data Request')]"
     """)

From 632b5cb6ac21eb4b4c06f3a0a17276de74ae5336 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Wed, 10 Nov 2021 12:03:45 +1000
Subject: [PATCH 149/276] [QOL-7970] make login link path more robust

---
 test/features/steps/steps.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/features/steps/steps.py b/test/features/steps/steps.py
index ba04b723..301efcf0 100644
--- a/test/features/steps/steps.py
+++ b/test/features/steps/steps.py
@@ -20,7 +20,6 @@ def log_in(context):
         When I go to homepage
         And I click the link with text that contains "Log in"
         And I enter my credentials and login
-        Then I should see an element with xpath "//a[contains(string(), 'Log out')]"
     """)
 
 
@@ -31,6 +30,7 @@ def submit_login(context):
         When I fill in "login" with "$name"
         And I fill in "password" with "$password"
         And I press the element with xpath "//button[contains(string(), 'Login')]"
+        Then I should see an element with xpath "//a[@title='Log out']"
     """)
 
 

From eace36a2db29cb05ccf4210e1c9769ded6aed5f6 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Wed, 10 Nov 2021 12:09:37 +1000
Subject: [PATCH 150/276] [QOL-7970] drop CKAN 2.7 testing

- ckanext-ytp-comments isn't compatible with 2.7 so this can't easily be
---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 777c4251..17fe3430 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -10,7 +10,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ckan-version: [2.7.10, 2.8.8]
+        ckan-version: [2.8.8]
 
     name: Continuous Integration build on CKAN ${{ matrix.ckan-version }}
     runs-on: ubuntu-latest

From ac2154de5c4aeca1bf0c3510bc8e0cd15e60f946 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Wed, 10 Nov 2021 12:25:05 +1000
Subject: [PATCH 151/276] [QOL-7970] retrieve org users to notify of new data
 request

---
 ckanext/datarequests/actions.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ckanext/datarequests/actions.py b/ckanext/datarequests/actions.py
index 73b0dcb0..0af7a7f2 100644
--- a/ckanext/datarequests/actions.py
+++ b/ckanext/datarequests/actions.py
@@ -52,7 +52,7 @@ def _get_user(user_id):
 def _get_organization(organization_id):
     try:
         organization_show = tk.get_action('organization_show')
-        return organization_show({'ignore_auth': True}, {'id': organization_id})
+        return organization_show({'ignore_auth': True}, {'id': organization_id, 'include_users': True})
     except Exception as e:
         log.warn(e)
 

From bd2e0898a53f76d6b612168ed06a3f20ef6d2ed6 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Wed, 10 Nov 2021 12:43:56 +1000
Subject: [PATCH 152/276] [QOL-7970] drop QGOV-specific features from tests

- make link texts use matching case
- org admins don't get special privileges
---
 test/features/datarequest.feature               |  5 ++---
 test/features/datarequest_circumstances.feature | 14 +++++++-------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/test/features/datarequest.feature b/test/features/datarequest.feature
index a9227560..aa2615bb 100644
--- a/test/features/datarequest.feature
+++ b/test/features/datarequest.feature
@@ -23,7 +23,7 @@ Feature: Datarequest
         And I should see "Description cannot be empty" within 1 seconds
 
 
-    Scenario Outline: Data request creator, Sysadmin and Admin users of the assigned organisation for a data request can see a 'Close' button on the data request detail page for opened data requests
+    Scenario Outline: Data request creator and Sysadmin can see a 'Close' button on the data request detail page for opened data requests
         Given "<User>" as the persona
         When I log in and go to datarequest page
         And I press "Test Request"
@@ -32,7 +32,6 @@ Feature: Datarequest
         Examples: Users
         | User                  |
         | SysAdmin              |
-        | DataRequestOrgAdmin   |
 
 
     Scenario Outline: Non admin users cannot see a 'Close' button on the data request detail page for opened data requests
@@ -64,7 +63,7 @@ Feature: Datarequest
         When I log in and create a datarequest
         And I press the element with xpath "//a[contains(string(), 'Close')]"
         And I select "Requestor initiated closure" from "close_circumstance"
-        And I press the element with xpath "//button[contains(string(), 'Close data request')]"
+        And I press the element with xpath "//button[contains(string(), 'Close Data Request')]"
         When I wait for 3 seconds
         Then I should receive a base64 email at "dr_admin@localhost" containing "Your data request has been closed."
 
diff --git a/test/features/datarequest_circumstances.feature b/test/features/datarequest_circumstances.feature
index 6323e9ee..21ea5820 100644
--- a/test/features/datarequest_circumstances.feature
+++ b/test/features/datarequest_circumstances.feature
@@ -25,7 +25,7 @@ Feature: Datarequest-circumstances
         When I log in and create a datarequest
         And I press the element with xpath "//a[contains(string(), 'Close')]"
         And I select "Open dataset already exists" from "close_circumstance"
-        And I press the element with xpath "//button[contains(string(), 'Close data request')]"
+        And I press the element with xpath "//button[contains(string(), 'Close Data Request')]"
         Then I should see an element with the css selector "div.error-explanation.alert.alert-error" within 2 seconds
         And I should see "The form contains invalid entries" within 1 seconds
         And I should see "Accepted dataset cannot be empty" within 1 seconds
@@ -41,7 +41,7 @@ Feature: Datarequest-circumstances
         When I log in and create a datarequest
         And I press the element with xpath "//a[contains(string(), 'Close')]"
         And I select "To be released as open data at a later date" from "close_circumstance"
-        And I press the element with xpath "//button[contains(string(), 'Close data request')]"
+        And I press the element with xpath "//button[contains(string(), 'Close Data Request')]"
         Then I should see an element with the css selector "div.error-explanation.alert.alert-error" within 2 seconds
         And I should see "The form contains invalid entries" within 1 seconds
         And I should see "Approximate publishing date cannot be empty" within 1 seconds
@@ -57,7 +57,7 @@ Feature: Datarequest-circumstances
         When I log in and create a datarequest
         And I press the element with xpath "//a[contains(string(), 'Close')]"
         And I select "Requestor initiated closure" from "close_circumstance"
-        And I press the element with xpath "//button[contains(string(), 'Close data request')]"
+        And I press the element with xpath "//button[contains(string(), 'Close Data Request')]"
         Then I should see an element with xpath "//span[contains(@class,'label-closed') and contains(string(), 'Closed')]" within 2 seconds
 
         Examples: Users
@@ -113,7 +113,7 @@ Feature: Datarequest-circumstances
         And I select "Open dataset already exists" from "close_circumstance"
         # Have to use JS to change the selected value as the behaving framework does not work with autocomplete dropdown
         Then I execute the script "document.getElementById('field-accepted_dataset_id').value = document.getElementById('field-accepted_dataset_id').options[1].value"
-        And I press the element with xpath "//button[contains(string(), 'Close data request')]"
+        And I press the element with xpath "//button[contains(string(), 'Close Data Request')]"
         Then I should see "Accepted dataset" within 1 seconds
         And I should see "A Wonderful Story" within 1 seconds
 
@@ -129,7 +129,7 @@ Feature: Datarequest-circumstances
         And I press the element with xpath "//a[contains(string(), 'Close')]"
         And I select "To be released as open data at a later date" from "close_circumstance"
         And I fill in "approx_publishing_date" with "2025-06-01"
-        And I press the element with xpath "//button[contains(string(), 'Close data request')]"
+        And I press the element with xpath "//button[contains(string(), 'Close Data Request')]"
         Then I should see "Approximate publishing date" within 1 seconds
 
         Examples: Users
@@ -143,7 +143,7 @@ Feature: Datarequest-circumstances
         When I log in and create a datarequest
         And I press the element with xpath "//a[contains(string(), 'Close')]"
         And I select "Requestor initiated closure" from "close_circumstance"
-        And I press the element with xpath "//button[contains(string(), 'Close data request')]"
+        And I press the element with xpath "//button[contains(string(), 'Close Data Request')]"
         Then I should see "Close circumstance" within 1 seconds
         Then I should see "Requestor initiated closure" within 1 seconds
 
@@ -158,7 +158,7 @@ Feature: Datarequest-circumstances
         When I log in and create a datarequest
         And I press the element with xpath "//a[contains(string(), 'Close')]"
         And I select "Requestor initiated closure" from "close_circumstance"
-        And I press the element with xpath "//button[contains(string(), 'Close data request')]"
+        And I press the element with xpath "//button[contains(string(), 'Close Data Request')]"
         Then I should not see "Accepted dataset" within 1 seconds
         Then I should not see "Approximate publishing date" within 1 seconds
 

From 0d1134eaac51429335d239a5c0e56b0f9bac6f89 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Wed, 10 Nov 2021 13:27:04 +1000
Subject: [PATCH 153/276] [QOL-7970] drop QGOV-specific features from tests

- data requests don't send emails
---
 test/features/datarequest.feature | 26 ++++++--------------------
 1 file changed, 6 insertions(+), 20 deletions(-)

diff --git a/test/features/datarequest.feature b/test/features/datarequest.feature
index aa2615bb..04332266 100644
--- a/test/features/datarequest.feature
+++ b/test/features/datarequest.feature
@@ -50,32 +50,18 @@ Feature: Datarequest
         | TestOrgMember         |
 
 
-    Scenario: Creating a new data request will email the Admin users of the organisation
+    Scenario: Creating a new data request will show the data request afterward
         Given "TestOrgEditor" as the persona
         When I log in and create a datarequest
-        When I wait for 3 seconds
-        Then I should receive a base64 email at "dr_admin@localhost" containing "A new data request has been added and assigned to your organisation."
-        And I should receive a base64 email at "admin@localhost" containing "A new data request has been added and assigned to your organisation."
+        Then I should see "Open" within 1 seconds
+        And I should see an element with xpath "//a[contains(string(), 'Close')]"
 
 
-    Scenario: Closing a data request will email the creator
+    Scenario: Closing a data request will show the data request afterward
         Given "DataRequestOrgAdmin" as the persona
         When I log in and create a datarequest
         And I press the element with xpath "//a[contains(string(), 'Close')]"
         And I select "Requestor initiated closure" from "close_circumstance"
         And I press the element with xpath "//button[contains(string(), 'Close Data Request')]"
-        When I wait for 3 seconds
-        Then I should receive a base64 email at "dr_admin@localhost" containing "Your data request has been closed."
-
-
-     Scenario: Re-assigning a data request will email the Admin users of the assigned organisation and un-assigned organisation
-        Given "DataRequestOrgAdmin" as the persona
-        When I log in and create a datarequest
-        And I press the element with xpath "//a[contains(string(), 'Manage')]"
-        When I wait for 3 seconds
-        # Have to use JS to change the selected value as the behaving framework does not work with autocomplete dropdown
-        Then I execute the script "document.getElementById('field-organizations').value = document.getElementById('field-organizations').options[1].value"
-        And I press the element with xpath "//button[contains(string(), 'Update data request')]"
-        When I wait for 3 seconds
-        Then I should receive a base64 email at "admin@localhost" containing "A data request that was assigned to your organisation has been re-assigned to another organisation."
-        And I should receive a base64 email at "test_org_admin@localhost" containing "A new data request has been added and assigned to your organisation."
+        Then I should see "Closed" within 1 seconds
+        And I should not see an element with xpath "//a[contains(string(), 'Close')]"

From 1aed1dc9967001a2960ff7268b9ce11d05dc4fa7 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Wed, 10 Nov 2021 13:47:31 +1000
Subject: [PATCH 154/276] [QOL-7970] fix assertions for request status

---
 test/features/datarequest.feature | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/features/datarequest.feature b/test/features/datarequest.feature
index 04332266..c8198d3a 100644
--- a/test/features/datarequest.feature
+++ b/test/features/datarequest.feature
@@ -54,6 +54,7 @@ Feature: Datarequest
         Given "TestOrgEditor" as the persona
         When I log in and create a datarequest
         Then I should see "Open" within 1 seconds
+        And I should see an element with xpath "//i[contains(@class, 'icon-unlock')]"
         And I should see an element with xpath "//a[contains(string(), 'Close')]"
 
 
@@ -63,5 +64,5 @@ Feature: Datarequest
         And I press the element with xpath "//a[contains(string(), 'Close')]"
         And I select "Requestor initiated closure" from "close_circumstance"
         And I press the element with xpath "//button[contains(string(), 'Close Data Request')]"
-        Then I should see "Closed" within 1 seconds
+        Then I should see an element with xpath "//i[contains(@class, 'icon-lock')]"
         And I should not see an element with xpath "//a[contains(string(), 'Close')]"

From 1b8d170d2b66c0ef6d2af72885a80798f2042baf Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Wed, 10 Nov 2021 14:00:21 +1000
Subject: [PATCH 155/276] [QOL-7970] drop incorrect assertion

---
 test/features/datarequest.feature | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/test/features/datarequest.feature b/test/features/datarequest.feature
index c8198d3a..f5b19a0b 100644
--- a/test/features/datarequest.feature
+++ b/test/features/datarequest.feature
@@ -53,8 +53,7 @@ Feature: Datarequest
     Scenario: Creating a new data request will show the data request afterward
         Given "TestOrgEditor" as the persona
         When I log in and create a datarequest
-        Then I should see "Open" within 1 seconds
-        And I should see an element with xpath "//i[contains(@class, 'icon-unlock')]"
+        Then I should see an element with xpath "//i[contains(@class, 'icon-unlock')]"
         And I should see an element with xpath "//a[contains(string(), 'Close')]"
 
 

From cabd347eec63406d639cf25428f459d20ccefe44 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Wed, 10 Nov 2021 14:21:53 +1000
Subject: [PATCH 156/276] [QOL-7970] add testing for data request comments

---
 test/features/comments.feature | 52 +++++++++++++++++++++++++
 test/features/steps/steps.py   | 69 +++++++++++++++++++++++++++++++++-
 2 files changed, 119 insertions(+), 2 deletions(-)
 create mode 100644 test/features/comments.feature

diff --git a/test/features/comments.feature b/test/features/comments.feature
new file mode 100644
index 00000000..7eb64547
--- /dev/null
+++ b/test/features/comments.feature
@@ -0,0 +1,52 @@
+@comments
+Feature: Comments
+
+    @comment-add
+    Scenario: When a logged-in user submits a comment on a Data Request the comment should then be visible on the Comments tab of the Data Request
+        Given "CKANUser" as the persona
+        When I log in
+        And I go to data request "Test Request" comments
+        Then I should see the add comment form
+        Then I submit a comment with subject "Test subject" and comment "This is a test comment"
+        Then I should see "This is a test comment" within 10 seconds
+
+    @comment-add @comment-email
+    Scenario: When a logged-in user submits a comment on a Data Request the email should contain title and comment
+        Given "CKANUser" as the persona
+        When I log in
+        And I go to data request "Test Request" comments
+        Then I should see the add comment form
+        Then I submit a comment with subject "Test Request" and comment "This is a test data request comment"
+        When I wait for 5 seconds
+        Then I should receive a base64 email at "test_org_admin@localhost" containing "Data request subject: Test Request"
+        And I should receive a base64 email at "test_org_admin@localhost" containing "Comment: This is a test data request comment"
+
+    @comment-add @comment-profane
+    Scenario: When a logged-in user submits a comment containing profanity on a Data Request they should receive an error message and the commment will not appear
+        Given "CKANUser" as the persona
+        When I log in
+        And I go to data request "Test Request" comments
+        Then I should see the add comment form
+        Then I submit a comment with subject "Test subject" and comment "Soccer balls"
+        Then I should see "Comment blocked due to profanity" within 5 seconds
+
+    @comment-report
+    Scenario: When a logged-in user reports a comment on a Data Request the comment should be marked as reported and an email notification sent to the organisation admins
+        Given "CKANUser" as the persona
+        When I log in
+        And I go to data request "Test Request" comments
+        And I press the element with xpath "//a[contains(string(), 'Report')]"
+        Then I should see "Reported" within 5 seconds
+        When I wait for 3 seconds
+        Then I should receive a base64 email at "test_org_admin@localhost" containing "This comment has been flagged as inappropriate by a user"
+
+    @comment-delete
+    Scenario: When an Org Admin visits a data request belonging to their organisation, they can delete a comment and should not see text 'This comment was deleted.'
+        Given "TestOrgAdmin" as the persona
+        When I log in
+        And I go to data request "Test Request" comments
+        And I press the element with xpath "//a[@title='Delete comment']"
+        Then I should see "Are you sure you want to delete this comment?" within 1 seconds
+        Then I press the element with xpath "//button[contains(string(), 'Confirm')]"
+        Then I should not see "This comment was deleted." within 2 seconds
+        And I should see "Comment deleted by Test Admin." within 2 seconds
diff --git a/test/features/steps/steps.py b/test/features/steps/steps.py
index 301efcf0..4c9bb1bf 100644
--- a/test/features/steps/steps.py
+++ b/test/features/steps/steps.py
@@ -1,8 +1,7 @@
 from behave import step
-from behaving.web.steps import *  # noqa: F401, F403
 from behaving.personas.steps import *  # noqa: F401, F403
+from behaving.web.steps import *  # noqa: F401, F403
 from behaving.web.steps.url import when_i_visit_url
-from behaving.mail.steps import *
 import random
 import email
 import quopri
@@ -56,6 +55,72 @@ def title_random_text(context):
     """.format(random.randrange(100000)))
 
 
+@step(u'I should see the add comment form')
+def comment_form_visible(context):
+    context.execute_steps(u"""
+        Then I should see an element with xpath "//input[@name='subject']"
+        And I should see an element with xpath "//textarea[@name='comment']"
+    """)
+
+
+@step(u'I should not see the add comment form')
+def comment_form_not_visible(context):
+    context.execute_steps(u"""
+        Then I should not see an element with xpath "//input[@name='subject']"
+        And I should not see an element with xpath "//textarea[@name='comment']"
+    """)
+
+
+@step(u'I go to data request "{subject}"')
+def go_to_data_request(context, subject):
+    context.execute_steps(u"""
+        When I go to the data requests page
+        And I click the link with text "%s"
+        Then I should see "%s" within 5 seconds
+    """ % (subject, subject))
+
+
+@step(u'I go to data request "{subject}" comments')
+def go_to_data_request_comments(context, subject):
+    context.execute_steps(u"""
+        When I go to data request "%s"
+        And I click the link with text that contains "Comments"
+    """ % (subject))
+
+
+@step(u'I submit a comment with subject "{subject}" and comment "{comment}"')
+def submit_comment_with_subject_and_comment(context, subject, comment):
+    """
+    There can be multiple comment forms per page (add, edit, reply) each with fields named "subject" and "comment"
+    This step overcomes a limitation of the fill() method which only fills a form field by name
+    :param context:
+    :param subject:
+    :param comment:
+    :return:
+    """
+    context.browser.execute_script(
+        "document.querySelector('form.form input[name=\"subject\"]').value = '%s';" % subject)
+    context.browser.execute_script(
+        "document.querySelector('form.form textarea[name=\"comment\"]').value = '%s';" % comment)
+    context.browser.execute_script(
+        "document.querySelector('form.form .form-actions input[type=\"submit\"]').click();")
+
+
+@step(u'I submit a reply with comment "{comment}"')
+def submit_reply_with_comment(context, comment):
+    """
+    There can be multiple comment forms per page (add, edit, reply) each with fields named "subject" and "comment"
+    This step overcomes a limitation of the fill() method which only fills a form field by name
+    :param context:
+    :param comment:
+    :return:
+    """
+    context.browser.execute_script(
+        "document.querySelector('.comment-wrapper form textarea[name=\"comment\"]').value = '%s';" % comment)
+    context.browser.execute_script(
+        "document.querySelector('.comment-wrapper form .form-actions input[type=\"submit\"]').click();")
+
+
 # The default behaving step does not convert base64 emails
 # Modifed the default step to decode the payload from base64
 @step(u'I should receive a base64 email at "{address}" containing "{text}"')

From 1ec26b72a790f6f511b967c1be0adfd2e789129c Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Wed, 10 Nov 2021 14:33:18 +1000
Subject: [PATCH 157/276] [QOL-7970] oops add missing behave step

---
 test/features/steps/steps.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/test/features/steps/steps.py b/test/features/steps/steps.py
index 4c9bb1bf..ee44e208 100644
--- a/test/features/steps/steps.py
+++ b/test/features/steps/steps.py
@@ -71,6 +71,11 @@ def comment_form_not_visible(context):
     """)
 
 
+@step('I go to the data requests page')
+def go_to_data_requests_page(context):
+    when_i_visit_url(context, '/datarequest')
+
+
 @step(u'I go to data request "{subject}"')
 def go_to_data_request(context, subject):
     context.execute_steps(u"""

From 13b44cd09995401b30e6591a9e49827f62d7b74a Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Wed, 10 Nov 2021 14:48:58 +1000
Subject: [PATCH 158/276] [QOL-7970] enable comments tab in tests

---
 .docker/test.ini | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.docker/test.ini b/.docker/test.ini
index 2b292929..1fbc347e 100644
--- a/.docker/test.ini
+++ b/.docker/test.ini
@@ -182,6 +182,7 @@ ckan.comments.threaded_comments = True
 ckan.comments.users_can_edit = False
 ckan.comments.check_for_profanity = True
 ckan.comments.bad_words_file = /app/ckan/default/src/ckanext-ytp-comments/ckanext/ytp/comments/bad_words.txt
+ckan.comments.show_comments_tab_page = True
 
 ## Logging configuration
 [loggers]

From 30f5c4947ada6ed82910f181c6a0264c7a921832 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Wed, 10 Nov 2021 15:30:17 +1000
Subject: [PATCH 159/276] [QOL-7970] reduce comment tab assertions

---
 test/features/comments.feature | 3 ---
 test/features/steps/steps.py   | 8 ++++----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/test/features/comments.feature b/test/features/comments.feature
index 7eb64547..6ea724d9 100644
--- a/test/features/comments.feature
+++ b/test/features/comments.feature
@@ -6,7 +6,6 @@ Feature: Comments
         Given "CKANUser" as the persona
         When I log in
         And I go to data request "Test Request" comments
-        Then I should see the add comment form
         Then I submit a comment with subject "Test subject" and comment "This is a test comment"
         Then I should see "This is a test comment" within 10 seconds
 
@@ -15,7 +14,6 @@ Feature: Comments
         Given "CKANUser" as the persona
         When I log in
         And I go to data request "Test Request" comments
-        Then I should see the add comment form
         Then I submit a comment with subject "Test Request" and comment "This is a test data request comment"
         When I wait for 5 seconds
         Then I should receive a base64 email at "test_org_admin@localhost" containing "Data request subject: Test Request"
@@ -26,7 +24,6 @@ Feature: Comments
         Given "CKANUser" as the persona
         When I log in
         And I go to data request "Test Request" comments
-        Then I should see the add comment form
         Then I submit a comment with subject "Test subject" and comment "Soccer balls"
         Then I should see "Comment blocked due to profanity" within 5 seconds
 
diff --git a/test/features/steps/steps.py b/test/features/steps/steps.py
index ee44e208..79b5fbca 100644
--- a/test/features/steps/steps.py
+++ b/test/features/steps/steps.py
@@ -58,16 +58,16 @@ def title_random_text(context):
 @step(u'I should see the add comment form')
 def comment_form_visible(context):
     context.execute_steps(u"""
-        Then I should see an element with xpath "//input[@name='subject']"
-        And I should see an element with xpath "//textarea[@name='comment']"
+        Then I should see an element with xpath "//form[contains(@class, 'form')]//input[@name='subject']"
+        And I should see an element with xpath "//form[contains(@class, 'form')]//textarea[@name='comment']"
     """)
 
 
 @step(u'I should not see the add comment form')
 def comment_form_not_visible(context):
     context.execute_steps(u"""
-        Then I should not see an element with xpath "//input[@name='subject']"
-        And I should not see an element with xpath "//textarea[@name='comment']"
+        Then I should not see an element with xpath "//form[contains(@class, 'form')]//input[@name='subject']"
+        And I should not see an element with xpath "//form[contains(@class, 'form')]//textarea[@name='comment']"
     """)
 
 

From 24ed3d374a8dd24b95f419bd64bc2ff1804011b3 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Wed, 10 Nov 2021 15:46:26 +1000
Subject: [PATCH 160/276] [QOL-7970] remove QGOV-specific test

- vanilla datarequests doesn't have a feature to flag comments
---
 test/features/comments.feature | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/test/features/comments.feature b/test/features/comments.feature
index 6ea724d9..691bed7e 100644
--- a/test/features/comments.feature
+++ b/test/features/comments.feature
@@ -27,22 +27,12 @@ Feature: Comments
         Then I submit a comment with subject "Test subject" and comment "Soccer balls"
         Then I should see "Comment blocked due to profanity" within 5 seconds
 
-    @comment-report
-    Scenario: When a logged-in user reports a comment on a Data Request the comment should be marked as reported and an email notification sent to the organisation admins
-        Given "CKANUser" as the persona
-        When I log in
-        And I go to data request "Test Request" comments
-        And I press the element with xpath "//a[contains(string(), 'Report')]"
-        Then I should see "Reported" within 5 seconds
-        When I wait for 3 seconds
-        Then I should receive a base64 email at "test_org_admin@localhost" containing "This comment has been flagged as inappropriate by a user"
-
     @comment-delete
     Scenario: When an Org Admin visits a data request belonging to their organisation, they can delete a comment and should not see text 'This comment was deleted.'
         Given "TestOrgAdmin" as the persona
         When I log in
         And I go to data request "Test Request" comments
-        And I press the element with xpath "//a[@title='Delete comment']"
+        And I press the element with xpath "//a[contains(@href, '/delete') and contains(string(), 'Delete']"
         Then I should see "Are you sure you want to delete this comment?" within 1 seconds
         Then I press the element with xpath "//button[contains(string(), 'Confirm')]"
         Then I should not see "This comment was deleted." within 2 seconds

From ddd53b7c584fa578bf0302982007336e3619d51c Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Thu, 11 Nov 2021 08:37:02 +1000
Subject: [PATCH 161/276] [QOL-7970] fix deletion test

- org admins do not have update privileges without QGOV
---
 test/features/comments.feature | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/features/comments.feature b/test/features/comments.feature
index 691bed7e..e575b226 100644
--- a/test/features/comments.feature
+++ b/test/features/comments.feature
@@ -28,12 +28,12 @@ Feature: Comments
         Then I should see "Comment blocked due to profanity" within 5 seconds
 
     @comment-delete
-    Scenario: When an Org Admin visits a data request belonging to their organisation, they can delete a comment and should not see text 'This comment was deleted.'
-        Given "TestOrgAdmin" as the persona
+    Scenario: When an Sysadmin visits a data request, they can delete a comment and should not see text 'This comment was deleted.'
+        Given "SysAdmin" as the persona
         When I log in
         And I go to data request "Test Request" comments
         And I press the element with xpath "//a[contains(@href, '/delete') and contains(string(), 'Delete']"
         Then I should see "Are you sure you want to delete this comment?" within 1 seconds
         Then I press the element with xpath "//button[contains(string(), 'Confirm')]"
         Then I should not see "This comment was deleted." within 2 seconds
-        And I should see "Comment deleted by Test Admin." within 2 seconds
+        And I should see "Comment deleted by Administrator." within 2 seconds

From d6690641e4c12056c3ed0b22b02d597626daccfb Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Thu, 11 Nov 2021 08:37:27 +1000
Subject: [PATCH 162/276] [QOL-7970] fix import path

---
 .ahoy.yml                                   | 4 ++--
 ckanext/datarequests/plugin/flask_plugin.py | 2 +-
 test/features/environment.py                | 4 +++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.ahoy.yml b/.ahoy.yml
index 3d83d453..15c871b4 100644
--- a/.ahoy.yml
+++ b/.ahoy.yml
@@ -142,7 +142,7 @@ commands:
   start-ckan-job-worker:
     usage: Starts CKAN background job worker
     cmd: |
-      ahoy title 'Starting CKAN background job worker'
+      ahoy title 'Starting default CKAN background job worker'
       ahoy cli "ckan_cli jobs clear && \
                 ckan_cli jobs worker"
 
@@ -183,7 +183,7 @@ entrypoint:
   - "-c"
   - "-e"
   - |
-    export LAGOON_LOCALDEV_URL=http://ckanext-datarequests.docker.amazee.io
+    export LAGOON_LOCALDEV_URL=http://$PROJECT.docker.amazee.io
     [ -f .env ] && [ -s .env ] && export $(grep -v '^#' .env | xargs) && if [ -f .env.local ] && [ -s .env.local ]; then export $(grep -v '^#' .env.local | xargs); fi
     bash -e -c "$0" "$@"
   - "{{cmd}}"
diff --git a/ckanext/datarequests/plugin/flask_plugin.py b/ckanext/datarequests/plugin/flask_plugin.py
index 2e61b9e2..f5c98889 100644
--- a/ckanext/datarequests/plugin/flask_plugin.py
+++ b/ckanext/datarequests/plugin/flask_plugin.py
@@ -4,7 +4,7 @@
 from flask import Blueprint
 
 from ckanext.datarequests import constants
-from . import controller_functions
+from ckanext.datarequests.controllers import controller_functions
 
 
 datarequests_bp = Blueprint("datarequest", __name__)
diff --git a/test/features/environment.py b/test/features/environment.py
index 8b48e60b..f94a3ccc 100644
--- a/test/features/environment.py
+++ b/test/features/environment.py
@@ -4,7 +4,9 @@
 from behaving.web.steps.browser import named_browser
 
 # Path to the root of the project.
-ROOT_PATH = os.path.realpath(os.path.join(os.path.dirname(os.path.realpath(__file__)), '../../'))
+ROOT_PATH = os.path.realpath(os.path.join(
+    os.path.dirname(os.path.realpath(__file__)),
+    '../../'))
 
 # Base URL for relative paths resolution.
 BASE_URL = 'http://ckan:3000/'

From 2f507d2d1148c278d416fba96d4e00091ee39144 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Thu, 11 Nov 2021 09:03:23 +1000
Subject: [PATCH 163/276] [QOL-7970] make comment subject optional

- Vanilla theme doesn't include the subject field on data request comments
---
 test/features/steps/steps.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/test/features/steps/steps.py b/test/features/steps/steps.py
index 79b5fbca..eda4da19 100644
--- a/test/features/steps/steps.py
+++ b/test/features/steps/steps.py
@@ -103,8 +103,10 @@ def submit_comment_with_subject_and_comment(context, subject, comment):
     :param comment:
     :return:
     """
-    context.browser.execute_script(
-        "document.querySelector('form.form input[name=\"subject\"]').value = '%s';" % subject)
+    context.browser.execute_script("""
+        subject_field = document.querySelector('form.form input[name=\"subject\"]');
+        if (subject_field) { subject_field.value = '%s'; }
+        """ % subject)
     context.browser.execute_script(
         "document.querySelector('form.form textarea[name=\"comment\"]').value = '%s';" % comment)
     context.browser.execute_script(

From 0a13a9b6d7d7551b97620776230f4aab902dc17b Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Thu, 11 Nov 2021 09:24:47 +1000
Subject: [PATCH 164/276] [QOL-7970] fix XPath for comment delete link

---
 test/features/comments.feature | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/features/comments.feature b/test/features/comments.feature
index e575b226..39e3e9a8 100644
--- a/test/features/comments.feature
+++ b/test/features/comments.feature
@@ -32,7 +32,8 @@ Feature: Comments
         Given "SysAdmin" as the persona
         When I log in
         And I go to data request "Test Request" comments
-        And I press the element with xpath "//a[contains(@href, '/delete') and contains(string(), 'Delete']"
+        And I submit a comment with subject "Comment for deletion" and comment "This is a data request comment to test deletion"
+        And I press the element with xpath "//a[contains(@href, '/delete')]/i[contains(@class, 'icon-remove')]"
         Then I should see "Are you sure you want to delete this comment?" within 1 seconds
         Then I press the element with xpath "//button[contains(string(), 'Confirm')]"
         Then I should not see "This comment was deleted." within 2 seconds

From bf7fe13bc484832117dbfa999bd88d95ab637641 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Thu, 11 Nov 2021 09:47:07 +1000
Subject: [PATCH 165/276] [QOL-7970] fix document selectors for vanilla theme

---
 test/features/steps/steps.py | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/test/features/steps/steps.py b/test/features/steps/steps.py
index eda4da19..1424d79e 100644
--- a/test/features/steps/steps.py
+++ b/test/features/steps/steps.py
@@ -104,13 +104,15 @@ def submit_comment_with_subject_and_comment(context, subject, comment):
     :return:
     """
     context.browser.execute_script("""
-        subject_field = document.querySelector('form.form input[name=\"subject\"]');
+        subject_field = document.querySelector('form input[name="subject"]');
         if (subject_field) { subject_field.value = '%s'; }
         """ % subject)
-    context.browser.execute_script(
-        "document.querySelector('form.form textarea[name=\"comment\"]').value = '%s';" % comment)
-    context.browser.execute_script(
-        "document.querySelector('form.form .form-actions input[type=\"submit\"]').click();")
+    context.browser.execute_script("""
+        document.querySelector('form textarea[name="comment"]').value = '%s';
+        """ % comment)
+    context.browser.execute_script("""
+        document.querySelector('form input[type="submit" and contains(@class, "btn-primary")]').click();
+        """)
 
 
 @step(u'I submit a reply with comment "{comment}"')
@@ -122,10 +124,12 @@ def submit_reply_with_comment(context, comment):
     :param comment:
     :return:
     """
-    context.browser.execute_script(
-        "document.querySelector('.comment-wrapper form textarea[name=\"comment\"]').value = '%s';" % comment)
-    context.browser.execute_script(
-        "document.querySelector('.comment-wrapper form .form-actions input[type=\"submit\"]').click();")
+    context.browser.execute_script("""
+        document.querySelector('.comment-wrapper form textarea[name="comment"]').value = '%s';
+        """ % comment)
+    context.browser.execute_script("""
+        document.querySelector('.comment-wrapper form input[type="submit" and contains(@class, "btn-primary")]').click();
+        """)
 
 
 # The default behaving step does not convert base64 emails

From 8c5445323a10d050a2cfb5d49f5fa6e1cbdae789 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Thu, 11 Nov 2021 10:01:39 +1000
Subject: [PATCH 166/276] [QOL-7970] oops use CSS syntax not XPath

---
 test/features/steps/steps.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/features/steps/steps.py b/test/features/steps/steps.py
index 1424d79e..3ac26a17 100644
--- a/test/features/steps/steps.py
+++ b/test/features/steps/steps.py
@@ -111,7 +111,7 @@ def submit_comment_with_subject_and_comment(context, subject, comment):
         document.querySelector('form textarea[name="comment"]').value = '%s';
         """ % comment)
     context.browser.execute_script("""
-        document.querySelector('form input[type="submit" and contains(@class, "btn-primary")]').click();
+        document.querySelector('form input.btn-primary[type="submit"]').click();
         """)
 
 
@@ -128,7 +128,7 @@ def submit_reply_with_comment(context, comment):
         document.querySelector('.comment-wrapper form textarea[name="comment"]').value = '%s';
         """ % comment)
     context.browser.execute_script("""
-        document.querySelector('.comment-wrapper form input[type="submit" and contains(@class, "btn-primary")]').click();
+        document.querySelector('.comment-wrapper form input.btn-primary[type="submit"]').click();
         """)
 
 

From cd6408120d3a78bdb39e85f5aa5d08b1ee10860c Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Thu, 11 Nov 2021 10:18:02 +1000
Subject: [PATCH 167/276] [QOL-7970] drop tag name from CSS selector

- vanilla theme uses 'button' tag, QGOV theme uses 'input'
---
 test/features/steps/steps.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/features/steps/steps.py b/test/features/steps/steps.py
index 3ac26a17..d073f7aa 100644
--- a/test/features/steps/steps.py
+++ b/test/features/steps/steps.py
@@ -111,7 +111,7 @@ def submit_comment_with_subject_and_comment(context, subject, comment):
         document.querySelector('form textarea[name="comment"]').value = '%s';
         """ % comment)
     context.browser.execute_script("""
-        document.querySelector('form input.btn-primary[type="submit"]').click();
+        document.querySelector('form .btn-primary[type="submit"]').click();
         """)
 
 
@@ -128,7 +128,7 @@ def submit_reply_with_comment(context, comment):
         document.querySelector('.comment-wrapper form textarea[name="comment"]').value = '%s';
         """ % comment)
     context.browser.execute_script("""
-        document.querySelector('.comment-wrapper form input.btn-primary[type="submit"]').click();
+        document.querySelector('.comment-wrapper form .btn-primary[type="submit"]').click();
         """)
 
 

From 29d71e1c7dc0408a3e184f530c4665e7f11cb812 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Thu, 11 Nov 2021 10:53:30 +1000
Subject: [PATCH 168/276] [QOL-7970] fix tests

- add data requests to organisation
- fix comment deletion text
---
 test/features/comments.feature | 3 +--
 test/features/steps/steps.py   | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/features/comments.feature b/test/features/comments.feature
index 39e3e9a8..4c599977 100644
--- a/test/features/comments.feature
+++ b/test/features/comments.feature
@@ -36,5 +36,4 @@ Feature: Comments
         And I press the element with xpath "//a[contains(@href, '/delete')]/i[contains(@class, 'icon-remove')]"
         Then I should see "Are you sure you want to delete this comment?" within 1 seconds
         Then I press the element with xpath "//button[contains(string(), 'Confirm')]"
-        Then I should not see "This comment was deleted." within 2 seconds
-        And I should see "Comment deleted by Administrator." within 2 seconds
+        And I should see "Comment has been deleted" within 2 seconds
diff --git a/test/features/steps/steps.py b/test/features/steps/steps.py
index d073f7aa..ce93a988 100644
--- a/test/features/steps/steps.py
+++ b/test/features/steps/steps.py
@@ -169,5 +169,6 @@ def log_in_create_a_datarequest(context):
         And I click the link with text that contains "Add Data Request"
         And I fill in title with random text
         And I fill in "description" with "Test description"
+        And I select "open-data-administration-data-requests" from "organization_id"
         And I press the element with xpath "//button[contains(string(), 'Create Data Request')]"
     """)

From b232f2fd1ff0b30d6a34859d0f5d14aad1af46b2 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Thu, 11 Nov 2021 11:09:10 +1000
Subject: [PATCH 169/276] [QOL-7970] put test data request in test org

---
 .docker/scripts/create-test-data.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.docker/scripts/create-test-data.sh b/.docker/scripts/create-test-data.sh
index 69403f10..2d49a8d5 100644
--- a/.docker/scripts/create-test-data.sh
+++ b/.docker/scripts/create-test-data.sh
@@ -126,7 +126,7 @@ curl -LsH "Authorization: ${API_KEY}" \
 echo "Creating test Data Request:"
 
 curl -LsH "Authorization: ${API_KEY}" \
-    --data "title=Test Request&description=This is an example&organization_id=${DR_ORG_ID}" \
+    --data "title=Test Request&description=This is an example&organization_id=${TEST_ORG_ID}" \
     ${CKAN_ACTION_URL}/create_datarequest
 
 echo "Creating closed Data Request:"

From 429f99f2c70e8175ed16b0b1d2487b8646054d84 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Thu, 11 Nov 2021 11:25:32 +1000
Subject: [PATCH 170/276] [QOL-7970] enable test comment notifications

---
 .docker/test.ini | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.docker/test.ini b/.docker/test.ini
index 1fbc347e..55079669 100644
--- a/.docker/test.ini
+++ b/.docker/test.ini
@@ -183,6 +183,7 @@ ckan.comments.users_can_edit = False
 ckan.comments.check_for_profanity = True
 ckan.comments.bad_words_file = /app/ckan/default/src/ckanext-ytp-comments/ckanext/ytp/comments/bad_words.txt
 ckan.comments.show_comments_tab_page = True
+ckan.comments.follow_mute_enabled = True
 
 ## Logging configuration
 [loggers]

From 94b27d610fe7617d70b0793ca544be65d4bbb145 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Thu, 11 Nov 2021 11:37:55 +1000
Subject: [PATCH 171/276] [QOL-7970] use test word from default profanity list

---
 test/features/comments.feature | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/features/comments.feature b/test/features/comments.feature
index 4c599977..f8fb033c 100644
--- a/test/features/comments.feature
+++ b/test/features/comments.feature
@@ -24,7 +24,7 @@ Feature: Comments
         Given "CKANUser" as the persona
         When I log in
         And I go to data request "Test Request" comments
-        Then I submit a comment with subject "Test subject" and comment "Soccer balls"
+        Then I submit a comment with subject "Test subject" and comment "Balaam saddled his ass"
         Then I should see "Comment blocked due to profanity" within 5 seconds
 
     @comment-delete

From 65cad7da69b5057e7fb223fb6eeb4809292cc8f3 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Thu, 11 Nov 2021 11:38:07 +1000
Subject: [PATCH 172/276] [QOL-7970] drop unnecessary override of default org

---
 test/features/steps/steps.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/features/steps/steps.py b/test/features/steps/steps.py
index ce93a988..d073f7aa 100644
--- a/test/features/steps/steps.py
+++ b/test/features/steps/steps.py
@@ -169,6 +169,5 @@ def log_in_create_a_datarequest(context):
         And I click the link with text that contains "Add Data Request"
         And I fill in title with random text
         And I fill in "description" with "Test description"
-        And I select "open-data-administration-data-requests" from "organization_id"
         And I press the element with xpath "//button[contains(string(), 'Create Data Request')]"
     """)

From 002191882641c7a8d1fceadd92b472dcef1a2842 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Thu, 11 Nov 2021 12:40:48 +1000
Subject: [PATCH 173/276] [QOL-7970] fix email body bug

---
 test/features/steps/steps.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/test/features/steps/steps.py b/test/features/steps/steps.py
index d073f7aa..a2437d2e 100644
--- a/test/features/steps/steps.py
+++ b/test/features/steps/steps.py
@@ -140,7 +140,10 @@ def filter_contents(mail):
         mail = email.message_from_string(mail)
         payload = mail.get_payload()
         payload += "=" * ((4 - len(payload) % 4) % 4)  # do fix the padding error issue
-        decoded_payload = quopri.decodestring(payload).decode('base64')
+        payload_bytes = quopri.decodestring(payload)
+        if len(payload_bytes) > 0:
+            payload_bytes += b'='  # do fix the padding error issue
+        decoded_payload = payload_bytes.decode('base64')
         print('decoded_payload: ', decoded_payload)
         return text in decoded_payload
 

From 502c6bcaa6bfeb08e2139e3b54273961a488f7d0 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Thu, 11 Nov 2021 13:21:23 +1000
Subject: [PATCH 174/276] [QOL-7970] drop tests depending on
 ckanext-ytp-comments

- Vanilla Data Requests has its own comment implementation.
---
 test/features/comments.feature | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/test/features/comments.feature b/test/features/comments.feature
index f8fb033c..2dc931da 100644
--- a/test/features/comments.feature
+++ b/test/features/comments.feature
@@ -9,24 +9,6 @@ Feature: Comments
         Then I submit a comment with subject "Test subject" and comment "This is a test comment"
         Then I should see "This is a test comment" within 10 seconds
 
-    @comment-add @comment-email
-    Scenario: When a logged-in user submits a comment on a Data Request the email should contain title and comment
-        Given "CKANUser" as the persona
-        When I log in
-        And I go to data request "Test Request" comments
-        Then I submit a comment with subject "Test Request" and comment "This is a test data request comment"
-        When I wait for 5 seconds
-        Then I should receive a base64 email at "test_org_admin@localhost" containing "Data request subject: Test Request"
-        And I should receive a base64 email at "test_org_admin@localhost" containing "Comment: This is a test data request comment"
-
-    @comment-add @comment-profane
-    Scenario: When a logged-in user submits a comment containing profanity on a Data Request they should receive an error message and the commment will not appear
-        Given "CKANUser" as the persona
-        When I log in
-        And I go to data request "Test Request" comments
-        Then I submit a comment with subject "Test subject" and comment "Balaam saddled his ass"
-        Then I should see "Comment blocked due to profanity" within 5 seconds
-
     @comment-delete
     Scenario: When an Sysadmin visits a data request, they can delete a comment and should not see text 'This comment was deleted.'
         Given "SysAdmin" as the persona

From b3cdbce0ca4976c1e6828aa63f98ee0b6d2f9434 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Thu, 11 Nov 2021 13:39:11 +1000
Subject: [PATCH 175/276] [QOL-7970] drop unnecessary extensions from tests

- We don't need archiver, report, or QA, and Data Requests provides its own comment implementation.
Future development should probably make it use YTP comments though.
---
 .docker/scripts/init.sh | 14 --------------
 .docker/test.ini        | 12 +-----------
 requirements-dev.txt    |  7 -------
 3 files changed, 1 insertion(+), 32 deletions(-)

diff --git a/.docker/scripts/init.sh b/.docker/scripts/init.sh
index 681f3fe3..915e47bd 100755
--- a/.docker/scripts/init.sh
+++ b/.docker/scripts/init.sh
@@ -10,19 +10,5 @@ fi
 ckan_cli db clean
 ckan_cli db init
 
-# Initialise the Comments database tables
-PASTER_PLUGIN=ckanext-ytp-comments ckan_cli initdb
-PASTER_PLUGIN=ckanext-ytp-comments ckan_cli updatedb
-PASTER_PLUGIN=ckanext-ytp-comments ckan_cli init_notifications_db
-
-# Initialise the archiver database tables
-PASTER_PLUGIN=ckanext-archiver ckan_cli archiver init
-
-# Initialise the reporting database tables
-PASTER_PLUGIN=ckanext-report ckan_cli report initdb
-
-# Initialise the QA database tables
-PASTER_PLUGIN=ckanext-qa ckan_cli qa init
-
 # Create some base test data
 . $APP_DIR/scripts/create-test-data.sh
diff --git a/.docker/test.ini b/.docker/test.ini
index 55079669..edee540c 100644
--- a/.docker/test.ini
+++ b/.docker/test.ini
@@ -95,7 +95,7 @@ ckan.redis.url = redis://redis:6379
 #       Add ``resource_proxy`` to enable resource proxying and get around the
 #       same origin policy
 # @todo:setup Cleanup the list to use only required plugins.
-ckan.plugins = stats text_view image_view recline_view datastore datarequests ytp_comments qa archiver report
+ckan.plugins = stats text_view image_view recline_view datastore datarequests
 
 # Define which views should be created by default
 # (plugins must be loaded in ckan.plugins)
@@ -175,16 +175,6 @@ ckan.datarequests.default_organisation = open-data-administration-data-requests
 # Enable or disable circumstances for closing data requests. Default value is False
 ckan.datarequests.enable_closing_circumstances = True
 
-# YTP Comments
-ckan.comments.moderation = False
-ckan.comments.moderation.first_only = False
-ckan.comments.threaded_comments = True
-ckan.comments.users_can_edit = False
-ckan.comments.check_for_profanity = True
-ckan.comments.bad_words_file = /app/ckan/default/src/ckanext-ytp-comments/ckanext/ytp/comments/bad_words.txt
-ckan.comments.show_comments_tab_page = True
-ckan.comments.follow_mute_enabled = True
-
 ## Logging configuration
 [loggers]
 keys = root, ckan, ckanext
diff --git a/requirements-dev.txt b/requirements-dev.txt
index 1d2cec9c..4dc98218 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -16,12 +16,5 @@ progressbar==2.5
 SQLAlchemy>=0.6.6
 requests==2.25.1
 six==1.15.0
--e git+https://github.com/qld-gov-au/ckanext-data-qld@develop#egg=ckanext-data_qld
 -e git+https://github.com/ckan/ckantoolkit@release-0.0.4#egg=ckantoolkit
 -e git+https://github.com/ckan/ckanapi@ckanapi-4.3#egg=ckanapi
--e git+https://github.com/ckan/ckanext-scheming@release-1.2.0#egg=ckanext-scheming
--e git+https://github.com/qld-gov-au/ckanext-data-qld-theme@develop#egg=ckanext-data_qld_theme
--e git+https://github.com/qld-gov-au/ckanext-ytp-comments@develop#egg=ckanext-ytp-comments
--e git+https://github.com/qld-gov-au/ckanext-qa@develop#egg=ckanext-qa
--e git+https://github.com/qld-gov-au/ckanext-archiver.git@develop#egg=ckanext-archiver
--e git+https://github.com/qld-gov-au/ckanext-report.git@0.1#egg=ckanext-report

From 6bc315602742b87d33725a7083cff2d85a57a4fd Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Thu, 11 Nov 2021 13:52:25 +1000
Subject: [PATCH 176/276] [QOL-7970] provide default values for Docker args

- this is the simplest way of fixing the CircleCI build
---
 .docker/Dockerfile.ckan | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.docker/Dockerfile.ckan b/.docker/Dockerfile.ckan
index 5aaead47..0732165a 100644
--- a/.docker/Dockerfile.ckan
+++ b/.docker/Dockerfile.ckan
@@ -1,7 +1,7 @@
 FROM amazeeio/python:2.7-ckan-21.7.0
 
-ARG SITE_URL
-ARG CKAN_VERSION
+ARG SITE_URL=http://ckan:3000/
+ARG CKAN_VERSION=2.8.8
 ENV SITE_URL="${SITE_URL}"
 ENV VENV_DIR=/app/ckan/default
 ENV APP_DIR=/app

From 63ea31731e50c7749ee0a86373a96276b6851189 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Thu, 11 Nov 2021 14:02:15 +1000
Subject: [PATCH 177/276] [QOL-7970] provide CKAN_VERSION for CircleCI build

---
 .circleci/config.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index b70b58fc..cf621ac0 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -23,7 +23,10 @@ jobs:
           at: /workspace
       - checkout
       - *step_setup_remote_docker
-      - run: .circleci/build.sh
+      - run:
+          command: .circleci/build.sh
+          environment:
+            CKAN_VERSION: 2.8.8
       - run: .circleci/test.sh
       - run:
           name: Process artifacts

From d067ade11335e6feb8ae1329acb83426e6d43e4c Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Thu, 11 Nov 2021 15:27:49 +1000
Subject: [PATCH 178/276] [QOL-7970] cleanup

- enforce lint checking
- clean up Git Ignore and requirements
---
 .ahoy.yml            | 2 +-
 .env                 | 2 +-
 .gitignore           | 2 +-
 docker-compose.yml   | 9 ---------
 requirements-dev.txt | 7 +++----
 5 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/.ahoy.yml b/.ahoy.yml
index 15c871b4..005d15af 100644
--- a/.ahoy.yml
+++ b/.ahoy.yml
@@ -140,7 +140,7 @@ commands:
       ahoy cli "killall -2 mailmock"
 
   start-ckan-job-worker:
-    usage: Starts CKAN background job worker
+    usage: Starts default CKAN background job worker
     cmd: |
       ahoy title 'Starting default CKAN background job worker'
       ahoy cli "ckan_cli jobs clear && \
diff --git a/.env b/.env
index 8aeda729..99109a19 100644
--- a/.env
+++ b/.env
@@ -16,7 +16,7 @@ PROJECT="ckanext-datarequests"
 COMPOSE_PROJECT_NAME="$PROJECT"
 
 # Flag to allow code linting failures.
-ALLOW_LINT_FAIL=1
+ALLOW_LINT_FAIL=0
 
 # Flag to allow unit tests failures.
 ALLOW_UNIT_FAIL=0
diff --git a/.gitignore b/.gitignore
index b834defd..4578f100 100644
--- a/.gitignore
+++ b/.gitignore
@@ -49,6 +49,6 @@ coverage.xml
 # Sphinx documentation
 docs/_build/
 .env.local
-/test/screenshots
+screenshots
 !/test/screenshots/.gitkeep
 .idea
diff --git a/docker-compose.yml b/docker-compose.yml
index 2d81ad9a..fde46592 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -16,12 +16,6 @@ x-environment:
   AMAZEEIO: AMAZEEIO
   no_proxy: "ckan,postgres,postgres-datastore,redis,solr,chrome,mailhog.docker.amazee.io"
 
-x-user:
-  &default-user
-  # The default user under which the containers should run.
-  # Change this if you are on linux and run with another user than id `1000`.
-  user: '1000'
-
 services:
 
   ckan:
@@ -69,7 +63,6 @@ services:
 
   redis:
     image: redis:6-alpine
-    <<: *default-user
     environment:
       <<: *default-environment
     networks:
@@ -78,7 +71,6 @@ services:
 
   solr:
     image: ckan/ckan-solr-dev:2.8
-    user: '8983'
     ports:
       - "8983"
     environment:
@@ -93,7 +85,6 @@ services:
     depends_on:
       - ckan
     <<: *default-volumes
-    <<: *default-user
     environment:
       <<: *default-environment
     networks:
diff --git a/requirements-dev.txt b/requirements-dev.txt
index 4dc98218..91388a00 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -2,11 +2,11 @@ beautifulsoup4==4.9.1
 behave==1.2.6
 behaving==2.0.0
 Appium-Python-Client<=0.52
+ckanapi==4.3
 flake8==3.8.3
 nose==1.3.7
 mock
 parameterized==0.8.1
-profanityfilter
 lxml==4.6.3
 splinter>=0.13.0
 xlrd==1.2.0
@@ -15,6 +15,5 @@ messytables==0.15.2
 progressbar==2.5
 SQLAlchemy>=0.6.6
 requests==2.25.1
-six==1.15.0
--e git+https://github.com/ckan/ckantoolkit@release-0.0.4#egg=ckantoolkit
--e git+https://github.com/ckan/ckanapi@ckanapi-4.3#egg=ckanapi
+six>=1.15.0
+git+https://github.com/ckan/ckantoolkit@release-0.0.4#egg=ckantoolkit

From e9c19b2b664d719fe12a1a1c42688c380659335b Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Thu, 11 Nov 2021 15:46:08 +1000
Subject: [PATCH 179/276] [QOL-7970] use pytest instead of nose

- pytest is compatible with more CKAN versions
---
 .ahoy.yml            | 2 +-
 requirements-dev.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.ahoy.yml b/.ahoy.yml
index 005d15af..66fed874 100644
--- a/.ahoy.yml
+++ b/.ahoy.yml
@@ -112,7 +112,7 @@ commands:
   test-unit:
     usage: Run unit tests.
     cmd: |
-      ahoy cli 'nosetests --with-pylons=${CKAN_INI}' || \
+      ahoy cli 'pytest --ckan-ini=${CKAN_INI}' || \
       [ "${ALLOW_UNIT_FAIL:-0}" -eq 1 ]
 
   test-bdd:
diff --git a/requirements-dev.txt b/requirements-dev.txt
index 91388a00..dd9da1c2 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -7,7 +7,7 @@ flake8==3.8.3
 nose==1.3.7
 mock
 parameterized==0.8.1
-lxml==4.6.3
+pytest-ckan
 splinter>=0.13.0
 xlrd==1.2.0
 python-magic==0.4.18

From dd358903b1c473bb179e9cf72b075c8977d4d7a6 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Thu, 11 Nov 2021 15:55:34 +1000
Subject: [PATCH 180/276] [QOL-7970] add CKAN 2.9 test run

- enhance ckan_cli script to translate more commands
- detect the presence of the Py2 requirements file and grab it if relevant
- add config values for CKAN 2.9
- update Docker container
---
 .docker/Dockerfile.ckan             |  6 ++++--
 .docker/scripts/ckan_cli            | 11 +++++++++--
 .docker/scripts/create-test-data.sh |  8 ++++++--
 .docker/scripts/init.sh             |  2 +-
 .docker/test.ini                    |  3 +++
 .github/workflows/test.yml          |  5 ++---
 6 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/.docker/Dockerfile.ckan b/.docker/Dockerfile.ckan
index 0732165a..676dae98 100644
--- a/.docker/Dockerfile.ckan
+++ b/.docker/Dockerfile.ckan
@@ -1,4 +1,4 @@
-FROM amazeeio/python:2.7-ckan-21.7.0
+FROM amazeeio/python:2.7-ckan-21.8.0
 
 ARG SITE_URL=http://ckan:3000/
 ARG CKAN_VERSION=2.8.8
@@ -21,7 +21,9 @@ RUN . ${VENV_DIR}/bin/activate \
     && pip install setuptools==36.1 \
     && pip install -e "git+https://github.com/ckan/ckan.git@ckan-${CKAN_VERSION}#egg=ckan" \
     && sed -i "s/psycopg2==2.4.5/psycopg2==2.7.7/g" "${VENV_DIR}/src/ckan/requirements.txt" \
-    && pip install -r "${VENV_DIR}/src/ckan/requirements.txt" \
+    && ((test -f "${VENV_DIR}/src/ckan/requirements-py2.txt" && \
+        pip install -r "${VENV_DIR}/src/ckan/requirements-py2.txt") || \
+        pip install -r "${VENV_DIR}/src/ckan/requirements.txt") \
     && ln -s "${VENV_DIR}/src/ckan/who.ini" "${VENV_DIR}/who.ini" \
     && deactivate \
     && ln -s ${APP_DIR}/ckan /usr/lib/ckan \
diff --git a/.docker/scripts/ckan_cli b/.docker/scripts/ckan_cli
index fcc045fd..3cf0b4cc 100644
--- a/.docker/scripts/ckan_cli
+++ b/.docker/scripts/ckan_cli
@@ -58,10 +58,17 @@ fi
 
 if [ "$COMMAND" = "ckan" ]; then
     echo "Using 'ckan' command from $ENV_DIR with config ${CKAN_INI}..." >&2
-    exec $ENV_DIR/ckan -c ${CKAN_INI} "$@"
+    # adjust args to match ckan expectations
+    COMMAND=$(echo "$1" | sed -e 's/create-test-data/seed/')
+    shift
+    exec $ENV_DIR/ckan -c ${CKAN_INI} $COMMAND "$@" $CLICK_ARGS
 elif [ "$COMMAND" = "paster" ]; then
     echo "Using 'paster' command from $ENV_DIR with config ${CKAN_INI}..." >&2
-    exec $ENV_DIR/paster --plugin=$PASTER_PLUGIN "$@" -c ${CKAN_INI}
+    # adjust args to match paster expectations
+    COMMAND=$1
+    shift
+    if [ "$1" = "show" ]; then shift; fi
+    exec $ENV_DIR/paster --plugin=$PASTER_PLUGIN $COMMAND "$@" -c ${CKAN_INI}
 else
     echo "Unable to locate 'ckan' or 'paster' command in $ENV_DIR" >&2
     exit 1
diff --git a/.docker/scripts/create-test-data.sh b/.docker/scripts/create-test-data.sh
index 2d49a8d5..6ff9ab59 100644
--- a/.docker/scripts/create-test-data.sh
+++ b/.docker/scripts/create-test-data.sh
@@ -17,7 +17,7 @@ CKAN_USER_EMAIL="${CKAN_USER_EMAIL:-admin@localhost}"
 
 add_user_if_needed () {
     echo "Adding user '$2' ($1) with email address [$3]"
-    ckan_cli user "$1" | grep "$1" || ckan_cli user add "$1"\
+    ckan_cli user show "$1" | grep "$1" || ckan_cli user add "$1"\
         fullname="$2"\
         email="$3"\
         password="${4:-Password123!}"
@@ -27,7 +27,11 @@ add_user_if_needed "$CKAN_USER_NAME" "$CKAN_DISPLAY_NAME" "$CKAN_USER_EMAIL"
 ckan_cli sysadmin add "${CKAN_USER_NAME}"
 
 # We know the "admin" sysadmin account exists, so we'll use her API KEY to create further data
-API_KEY=$(ckan_cli user admin | tr -d '\n' | sed -r 's/^(.*)apikey=(\S*)(.*)/\2/')
+API_KEY=$(ckan_cli user show "${CKAN_USER_NAME}" | tr -d '\n' | sed -r 's/^(.*)apikey=(\S*)(.*)/\2/')
+if [ "$API_KEY" = "None" ]; then
+    echo "No API Key found on ${CKAN_USER_NAME}, generating API Token..."
+    API_KEY=$(ckan_cli user token add "${CKAN_USER_NAME}" test_setup |grep -v '^API Token created' | tr -d '[:space:]')
+fi
 
 # #
 ##
diff --git a/.docker/scripts/init.sh b/.docker/scripts/init.sh
index 915e47bd..8d2a46ae 100755
--- a/.docker/scripts/init.sh
+++ b/.docker/scripts/init.sh
@@ -7,7 +7,7 @@ set -e
 if [ "$VENV_DIR" != "" ]; then
   . ${VENV_DIR}/bin/activate
 fi
-ckan_cli db clean
+CLICK_ARGS="--yes" ckan_cli db clean
 ckan_cli db init
 
 # Create some base test data
diff --git a/.docker/test.ini b/.docker/test.ini
index edee540c..11b394f5 100644
--- a/.docker/test.ini
+++ b/.docker/test.ini
@@ -22,6 +22,9 @@ host = 0.0.0.0
 port = 3000
 
 [app:main]
+ckan.devserver.host = 0.0.0.0
+ckan.devserver.port = 3000
+
 use = egg:ckan
 full_stack = true
 cache_dir = /tmp/%(ckan.site_id)s/
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 17fe3430..db0fa977 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -2,15 +2,14 @@
 #based on https://raw.githubusercontent.com/ckan/ckanext-scheming/master/.github/workflows/test.yml
 # alternative https://github.com/ckan/ckan/blob/master/contrib/cookiecutter/ckan_extension/%7B%7Bcookiecutter.project%7D%7D/.github/workflows/test.yml
 name: Tests
-on:
-  push:
+on: [push, pull_request]
 
 jobs:
   test:
     strategy:
       fail-fast: false
       matrix:
-        ckan-version: [2.8.8]
+        ckan-version: [2.8.8, 2.9.4]
 
     name: Continuous Integration build on CKAN ${{ matrix.ckan-version }}
     runs-on: ubuntu-latest

From d86f2fddd1e5729d40728e621b5d8d8c9b3b7da1 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Thu, 11 Nov 2021 16:13:44 +1000
Subject: [PATCH 181/276] [QOL-7970] drop Nose config

---
 requirements-dev.txt | 2 +-
 setup.cfg            | 4 ----
 setup.py             | 3 +--
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/requirements-dev.txt b/requirements-dev.txt
index dd9da1c2..313df4d4 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -3,8 +3,8 @@ behave==1.2.6
 behaving==2.0.0
 Appium-Python-Client<=0.52
 ckanapi==4.3
+factory-boy==2.12.0
 flake8==3.8.3
-nose==1.3.7
 mock
 parameterized==0.8.1
 pytest-ckan
diff --git a/setup.cfg b/setup.cfg
index 5f705932..c20e6ba5 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,10 +1,6 @@
 [metadata]
 description-file = README.md
 
-[nosetests]
-ckan=1
-with-pylons=/app/ckan/default/production.ini
-
 [extract_messages]
 keywords = translate isPlural
 add_comments = TRANSLATORS:
diff --git a/setup.py b/setup.py
index 51f12ebb..96296d46 100644
--- a/setup.py
+++ b/setup.py
@@ -40,7 +40,7 @@
     namespace_packages=['ckanext', 'ckanext.datarequests'],
     include_package_data=True,
     zip_safe=False,
-    setup_requires=['nose>=1.3.0'],
+    setup_requires=[],
     install_requires=[
         # -*- Extra requirements: -*-
     ],
@@ -49,7 +49,6 @@
         'selenium==3.141.0',
         'coveralls==2.1.2'
     ],
-    test_suite='nosetests',
     entry_points='''
 
         [ckan.plugins]

From dae5d3b5767456296966d06522304c97ebea2c15 Mon Sep 17 00:00:00 2001
From: antuarc <carl.antuar@smartservice.qld.gov.au>
Date: Fri, 12 Nov 2021 09:40:15 +1000
Subject: [PATCH 182/276] [QOL-7970] split off unit testing for Pylons plugin

- fake an older CKAN version so we can test Pylons
---
 ckanext/datarequests/tests/test_plugin.py     | 111 ---------------
 .../datarequests/tests/test_pylons_plugin.py  | 134 ++++++++++++++++++
 2 files changed, 134 insertions(+), 111 deletions(-)
 create mode 100644 ckanext/datarequests/tests/test_pylons_plugin.py

diff --git a/ckanext/datarequests/tests/test_plugin.py b/ckanext/datarequests/tests/test_plugin.py
index 37937133..7242affa 100644
--- a/ckanext/datarequests/tests/test_plugin.py
+++ b/ckanext/datarequests/tests/test_plugin.py
@@ -141,117 +141,6 @@ def test_update_config(self):
         self.plg_instance.update_config(config)
         plugin.tk.add_template_directory.assert_called_once_with(config, '../templates')
 
-    @parameterized.expand([
-        ('True',),
-        ('False')
-    ])
-    def test_before_map(self, comments_enabled):
-
-        urls_set = 15
-        mapa_calls = urls_set if comments_enabled == 'True' else urls_set - 3
-
-        # Configure config and get instance
-        common.config.get.return_value = comments_enabled
-        self.plg_instance = plugin.DataRequestsPlugin()
-
-        mock_icon = 'icon'
-        get_question_icon_patch = patch('ckanext.datarequests.common.get_question_icon', return_value=mock_icon)
-        get_question_icon_patch.start()
-        self.addCleanup(get_question_icon_patch.stop)
-
-        # Test
-        mapa = MagicMock()
-        dr_basic_path = 'datarequest'
-        self.plg_instance.before_map(mapa)
-
-        self.assertEquals(mapa_calls, mapa.connect.call_count)
-        mapa.connect.assert_any_call(
-            'datarequests_index', "/%s" % dr_basic_path,
-            controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
-            action='index', conditions={'method': ['GET']})
-
-        mapa.connect.assert_any_call(
-            'datarequest.index', "/%s" % dr_basic_path,
-            controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
-            action='index', conditions={'method': ['GET']})
-
-        mapa.connect.assert_any_call(
-            'datarequest.new', '/%s/new' % dr_basic_path,
-            controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
-            action='new', conditions={'method': ['GET', 'POST']})
-
-        mapa.connect.assert_any_call(
-            'show_datarequest', '/%s/{id}' % dr_basic_path,
-            controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
-            action='show', conditions={'method': ['GET']}, ckan_icon=mock_icon)
-
-        mapa.connect.assert_any_call(
-            'datarequest.show', '/%s/{id}' % dr_basic_path,
-            controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
-            action='show', conditions={'method': ['GET']}, ckan_icon=mock_icon)
-
-        mapa.connect.assert_any_call(
-            'datarequest.update', '/%s/edit/{id}' % dr_basic_path,
-            controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
-            action='update', conditions={'method': ['GET', 'POST']})
-
-        mapa.connect.assert_any_call(
-            'datarequest.delete', '/%s/delete/{id}' % dr_basic_path,
-            controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
-            action='delete', conditions={'method': ['POST']})
-
-        mapa.connect.assert_any_call(
-            'datarequest.close', '/%s/close/{id}' % dr_basic_path,
-            controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
-            action='close', conditions={'method': ['GET', 'POST']})
-
-        mapa.connect.assert_any_call(
-            'organization_datarequests',
-            '/organization/%s/{id}' % dr_basic_path,
-            controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
-            action='organization_datarequests', conditions={'method': ['GET']},
-            ckan_icon=mock_icon)
-
-        mapa.connect.assert_any_call(
-            'user_datarequests',
-            '/user/%s/{id}' % dr_basic_path,
-            controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
-            action='user_datarequests', conditions={'method': ['GET']},
-            ckan_icon=mock_icon)
-
-        mapa.connect.assert_any_call(
-            'user_datarequests',
-            '/user/%s/{id}' % dr_basic_path,
-            controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
-            action='user_datarequests', conditions={'method': ['GET']},
-            ckan_icon=mock_icon)
-
-        mapa.connect.assert_any_call(
-            'datarequest.follow', '/%s/follow/{id}' % dr_basic_path,
-            controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
-            action='follow', conditions={'method': ['POST']})
-
-        mapa.connect.assert_any_call(
-            'datarequest.unfollow', '/%s/unfollow/{id}' % dr_basic_path,
-            controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
-            action='unfollow', conditions={'method': ['POST']})
-
-        if comments_enabled == 'True':
-            mapa.connect.assert_any_call(
-                'comment_datarequest', '/%s/comment/{id}' % dr_basic_path,
-                controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
-                action='comment', conditions={'method': ['GET', 'POST']}, ckan_icon='comment')
-
-            mapa.connect.assert_any_call(
-                'datarequest.comment', '/%s/comment/{id}' % dr_basic_path,
-                controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
-                action='comment', conditions={'method': ['GET', 'POST']}, ckan_icon='comment')
-
-            mapa.connect.assert_any_call(
-                'datarequest.delete_comment', '/%s/comment/{datarequest_id}/delete/{comment_id}' % dr_basic_path,
-                controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
-                action='delete_comment', conditions={'method': ['GET', 'POST']})
-
     @parameterized.expand([
         ('True', 'True'),
         ('True', 'False'),
diff --git a/ckanext/datarequests/tests/test_pylons_plugin.py b/ckanext/datarequests/tests/test_pylons_plugin.py
new file mode 100644
index 00000000..c131dc19
--- /dev/null
+++ b/ckanext/datarequests/tests/test_pylons_plugin.py
@@ -0,0 +1,134 @@
+# encoding: utf-8
+
+import unittest
+
+import ckan.plugins.toolkit as tk
+from ckanext.datarequests import common, plugin
+
+from mock import MagicMock, patch
+from parameterized import parameterized
+
+TOTAL_ACTIONS = 13
+COMMENTS_ACTIONS = 5
+ACTIONS_NO_COMMENTS = TOTAL_ACTIONS - COMMENTS_ACTIONS
+
+
+class DataRequestPylonsPluginTest(unittest.TestCase):
+
+    def setUp(self):
+        self._check_ckan_version = tk.check_ckan_version
+        tk.check_ckan_version = lambda version: False
+
+    def tearDown(self):
+        tk.check_ckan_version = self._check_ckan_version
+
+    @parameterized.expand([
+        ('True',),
+        ('False')
+    ])
+    def test_before_map(self, comments_enabled):
+
+        urls_set = 15
+        mapa_calls = urls_set if comments_enabled == 'True' else urls_set - 3
+
+        # Configure config and get instance
+        common.config.get.return_value = comments_enabled
+        self.plg_instance = plugin.DataRequestsPlugin()
+
+        mock_icon = 'icon'
+        get_question_icon_patch = patch('ckanext.datarequests.common.get_question_icon', return_value=mock_icon)
+        get_question_icon_patch.start()
+        self.addCleanup(get_question_icon_patch.stop)
+
+        # Test
+        mapa = MagicMock()
+        dr_basic_path = 'datarequest'
+        self.plg_instance.before_map(mapa)
+
+        self.assertEquals(mapa_calls, mapa.connect.call_count)
+        mapa.connect.assert_any_call(
+            'datarequests_index', "/%s" % dr_basic_path,
+            controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
+            action='index', conditions={'method': ['GET']})
+
+        mapa.connect.assert_any_call(
+            'datarequest.index', "/%s" % dr_basic_path,
+            controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
+            action='index', conditions={'method': ['GET']})
+
+        mapa.connect.assert_any_call(
+            'datarequest.new', '/%s/new' % dr_basic_path,
+            controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
+            action='new', conditions={'method': ['GET', 'POST']})
+
+        mapa.connect.assert_any_call(
+            'show_datarequest', '/%s/{id}' % dr_basic_path,
+            controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
+            action='show', conditions={'method': ['GET']}, ckan_icon=mock_icon)
+
+        mapa.connect.assert_any_call(
+            'datarequest.show', '/%s/{id}' % dr_basic_path,
+            controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
+            action='show', conditions={'method': ['GET']}, ckan_icon=mock_icon)
+
+        mapa.connect.assert_any_call(
+            'datarequest.update', '/%s/edit/{id}' % dr_basic_path,
+            controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
+            action='update', conditions={'method': ['GET', 'POST']})
+
+        mapa.connect.assert_any_call(
+            'datarequest.delete', '/%s/delete/{id}' % dr_basic_path,
+            controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
+            action='delete', conditions={'method': ['POST']})
+
+        mapa.connect.assert_any_call(
+            'datarequest.close', '/%s/close/{id}' % dr_basic_path,
+            controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
+            action='close', conditions={'method': ['GET', 'POST']})
+
+        mapa.connect.assert_any_call(
+            'organization_datarequests',
+            '/organization/%s/{id}' % dr_basic_path,
+            controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
+            action='organization_datarequests', conditions={'method': ['GET']},
+            ckan_icon=mock_icon)
+
+        mapa.connect.assert_any_call(
+            'user_datarequests',
+            '/user/%s/{id}' % dr_basic_path,
+            controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
+            action='user_datarequests', conditions={'method': ['GET']},
+            ckan_icon=mock_icon)
+
+        mapa.connect.assert_any_call(
+            'user_datarequests',
+            '/user/%s/{id}' % dr_basic_path,
+            controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
+            action='user_datarequests', conditions={'method': ['GET']},
+            ckan_icon=mock_icon)
+
+        mapa.connect.assert_any_call(
+            'datarequest.follow', '/%s/follow/{id}' % dr_basic_path,
+            controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
+            action='follow', conditions={'method': ['POST']})
+
+        mapa.connect.assert_any_call(
+            'datarequest.unfollow', '/%s/unfollow/{id}' % dr_basic_path,
+            controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
+            action='unfollow', conditions={'method': ['POST']})
+
+        if comments_enabled == 'True':
+            mapa.connect.assert_any_call(
+                'comment_datarequest', '/%s/comment/{id}' % dr_basic_path,
+                controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
+                action='comment', conditions={'method': ['GET', 'POST']}, ckan_icon='comment')
+
+            mapa.connect.assert_any_call(
+                'datarequest.comment', '/%s/comment/{id}' % dr_basic_path,
+                controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
+                action='comment', conditions={'method': ['GET', 'POST']}, ckan_icon='comment')
+
+            mapa.connect.assert_any_call(
+                'datarequest.delete_comment', '/%s/comment/{datarequest_id}/delete/{comment_id}' % dr_basic_path,
+                controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
+                action='delete_comment', conditions={'method': ['GET', 'POST']})

From df686bbc5b396ebbba596fa1ac15fcc52b457edf Mon Sep 17 00:00:00 2001
From: antuarc <carl.antuar@smartservice.qld.gov.au>
Date: Fri, 12 Nov 2021 09:51:41 +1000
Subject: [PATCH 183/276] [QOL-7970] patch common config for tests

---
 ckanext/datarequests/tests/test_pylons_plugin.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ckanext/datarequests/tests/test_pylons_plugin.py b/ckanext/datarequests/tests/test_pylons_plugin.py
index c131dc19..2e06f5c3 100644
--- a/ckanext/datarequests/tests/test_pylons_plugin.py
+++ b/ckanext/datarequests/tests/test_pylons_plugin.py
@@ -19,8 +19,12 @@ def setUp(self):
         self._check_ckan_version = tk.check_ckan_version
         tk.check_ckan_version = lambda version: False
 
+        self.config_patch = patch('ckanext.datarequests.common.config')
+        self.config_mock = self.config_patch.start()
+
     def tearDown(self):
         tk.check_ckan_version = self._check_ckan_version
+        self.config_patch.stop()
 
     @parameterized.expand([
         ('True',),

From a4ef3b62a8cc8799d8e35217cbb1f7dc4e2b927b Mon Sep 17 00:00:00 2001
From: antuarc <carl.antuar@smartservice.qld.gov.au>
Date: Fri, 12 Nov 2021 10:05:34 +1000
Subject: [PATCH 184/276] [QOL-7970] test mix-in plugin directly

- Should be simpler than monkey-patching the version check
---
 ckanext/datarequests/tests/test_pylons_plugin.py | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/ckanext/datarequests/tests/test_pylons_plugin.py b/ckanext/datarequests/tests/test_pylons_plugin.py
index 2e06f5c3..252619ba 100644
--- a/ckanext/datarequests/tests/test_pylons_plugin.py
+++ b/ckanext/datarequests/tests/test_pylons_plugin.py
@@ -2,8 +2,8 @@
 
 import unittest
 
-import ckan.plugins.toolkit as tk
-from ckanext.datarequests import common, plugin
+from ckanext.datarequests import common
+from ckanext.datarequests.plugin import MixinPlugin
 
 from mock import MagicMock, patch
 from parameterized import parameterized
@@ -16,14 +16,10 @@
 class DataRequestPylonsPluginTest(unittest.TestCase):
 
     def setUp(self):
-        self._check_ckan_version = tk.check_ckan_version
-        tk.check_ckan_version = lambda version: False
-
         self.config_patch = patch('ckanext.datarequests.common.config')
         self.config_mock = self.config_patch.start()
 
     def tearDown(self):
-        tk.check_ckan_version = self._check_ckan_version
         self.config_patch.stop()
 
     @parameterized.expand([
@@ -37,7 +33,7 @@ def test_before_map(self, comments_enabled):
 
         # Configure config and get instance
         common.config.get.return_value = comments_enabled
-        self.plg_instance = plugin.DataRequestsPlugin()
+        self.plg_instance = MixinPlugin()
 
         mock_icon = 'icon'
         get_question_icon_patch = patch('ckanext.datarequests.common.get_question_icon', return_value=mock_icon)

From 2c46c291252d862c845d580d0a1ec67dc07ae65a Mon Sep 17 00:00:00 2001
From: antuarc <carl.antuar@smartservice.qld.gov.au>
Date: Fri, 12 Nov 2021 10:19:49 +1000
Subject: [PATCH 185/276] [QOL-7970] set flag on mix-in plugin directly

---
 ckanext/datarequests/tests/test_pylons_plugin.py | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/ckanext/datarequests/tests/test_pylons_plugin.py b/ckanext/datarequests/tests/test_pylons_plugin.py
index 252619ba..48d4488a 100644
--- a/ckanext/datarequests/tests/test_pylons_plugin.py
+++ b/ckanext/datarequests/tests/test_pylons_plugin.py
@@ -2,7 +2,6 @@
 
 import unittest
 
-from ckanext.datarequests import common
 from ckanext.datarequests.plugin import MixinPlugin
 
 from mock import MagicMock, patch
@@ -15,13 +14,6 @@
 
 class DataRequestPylonsPluginTest(unittest.TestCase):
 
-    def setUp(self):
-        self.config_patch = patch('ckanext.datarequests.common.config')
-        self.config_mock = self.config_patch.start()
-
-    def tearDown(self):
-        self.config_patch.stop()
-
     @parameterized.expand([
         ('True',),
         ('False')
@@ -32,8 +24,8 @@ def test_before_map(self, comments_enabled):
         mapa_calls = urls_set if comments_enabled == 'True' else urls_set - 3
 
         # Configure config and get instance
-        common.config.get.return_value = comments_enabled
         self.plg_instance = MixinPlugin()
+        self.plg_instance.comments_enabled = comments_enabled
 
         mock_icon = 'icon'
         get_question_icon_patch = patch('ckanext.datarequests.common.get_question_icon', return_value=mock_icon)

From 631eea2da79ec0c2a7b8ad433232b07ed2c72d5a Mon Sep 17 00:00:00 2001
From: antuarc <carl.antuar@smartservice.qld.gov.au>
Date: Fri, 12 Nov 2021 10:36:20 +1000
Subject: [PATCH 186/276] [QOL-7970] use boolean parameters instead of text

---
 ckanext/datarequests/tests/test_pylons_plugin.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ckanext/datarequests/tests/test_pylons_plugin.py b/ckanext/datarequests/tests/test_pylons_plugin.py
index 48d4488a..fce59d7e 100644
--- a/ckanext/datarequests/tests/test_pylons_plugin.py
+++ b/ckanext/datarequests/tests/test_pylons_plugin.py
@@ -15,8 +15,8 @@
 class DataRequestPylonsPluginTest(unittest.TestCase):
 
     @parameterized.expand([
-        ('True',),
-        ('False')
+        (True,),
+        (False)
     ])
     def test_before_map(self, comments_enabled):
 

From 44bbe91d436f76d8da0735d9b53f7478584f9049 Mon Sep 17 00:00:00 2001
From: antuarc <carl.antuar@smartservice.qld.gov.au>
Date: Fri, 12 Nov 2021 10:53:01 +1000
Subject: [PATCH 187/276] [QOL-7970] oops make parameter a tuple

---
 ckanext/datarequests/tests/test_pylons_plugin.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ckanext/datarequests/tests/test_pylons_plugin.py b/ckanext/datarequests/tests/test_pylons_plugin.py
index fce59d7e..f42b8036 100644
--- a/ckanext/datarequests/tests/test_pylons_plugin.py
+++ b/ckanext/datarequests/tests/test_pylons_plugin.py
@@ -16,7 +16,7 @@ class DataRequestPylonsPluginTest(unittest.TestCase):
 
     @parameterized.expand([
         (True,),
-        (False)
+        (False,)
     ])
     def test_before_map(self, comments_enabled):
 

From d1327b2ce4eca7b68ccd468a932252499410b9e1 Mon Sep 17 00:00:00 2001
From: antuarc <carl.antuar@smartservice.qld.gov.au>
Date: Fri, 12 Nov 2021 11:07:32 +1000
Subject: [PATCH 188/276] [QOL-7970] oops adjust type expectations for
 comments_enabled

---
 ckanext/datarequests/tests/test_pylons_plugin.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ckanext/datarequests/tests/test_pylons_plugin.py b/ckanext/datarequests/tests/test_pylons_plugin.py
index f42b8036..7ce43e6a 100644
--- a/ckanext/datarequests/tests/test_pylons_plugin.py
+++ b/ckanext/datarequests/tests/test_pylons_plugin.py
@@ -2,7 +2,7 @@
 
 import unittest
 
-from ckanext.datarequests.plugin import MixinPlugin
+from ckanext.datarequests.pylons_plugin import MixinPlugin
 
 from mock import MagicMock, patch
 from parameterized import parameterized
@@ -21,7 +21,7 @@ class DataRequestPylonsPluginTest(unittest.TestCase):
     def test_before_map(self, comments_enabled):
 
         urls_set = 15
-        mapa_calls = urls_set if comments_enabled == 'True' else urls_set - 3
+        mapa_calls = urls_set if comments_enabled else urls_set - 3
 
         # Configure config and get instance
         self.plg_instance = MixinPlugin()
@@ -109,7 +109,7 @@ def test_before_map(self, comments_enabled):
             controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
             action='unfollow', conditions={'method': ['POST']})
 
-        if comments_enabled == 'True':
+        if comments_enabled:
             mapa.connect.assert_any_call(
                 'comment_datarequest', '/%s/comment/{id}' % dr_basic_path,
                 controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',

From d7e8ef339ea23c15636809a62042362952eb8151 Mon Sep 17 00:00:00 2001
From: antuarc <carl.antuar@smartservice.qld.gov.au>
Date: Fri, 12 Nov 2021 11:18:02 +1000
Subject: [PATCH 189/276] [QOL-7970] oops fix module path

---
 ckanext/datarequests/tests/test_pylons_plugin.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ckanext/datarequests/tests/test_pylons_plugin.py b/ckanext/datarequests/tests/test_pylons_plugin.py
index 7ce43e6a..e8df2a57 100644
--- a/ckanext/datarequests/tests/test_pylons_plugin.py
+++ b/ckanext/datarequests/tests/test_pylons_plugin.py
@@ -2,7 +2,7 @@
 
 import unittest
 
-from ckanext.datarequests.pylons_plugin import MixinPlugin
+from ckanext.datarequests.plugin.pylons_plugin import MixinPlugin
 
 from mock import MagicMock, patch
 from parameterized import parameterized

From 742f1dbb4b4a3a472b56db841ae826a6b1ffe31c Mon Sep 17 00:00:00 2001
From: antuarc <carl.antuar@smartservice.qld.gov.au>
Date: Fri, 12 Nov 2021 11:45:58 +1000
Subject: [PATCH 190/276] [QOL-7970] use named routes

- this is potentially compatible with both Pylons and Flask, since both have ways of making named routes
---
 .../datarequests/templates/datarequests/base.html    |  4 ++--
 .../datarequests/templates/datarequests/close.html   |  6 +++---
 .../datarequests/templates/datarequests/edit.html    |  6 +++---
 .../datarequests/templates/datarequests/index.html   |  4 ++--
 ckanext/datarequests/templates/datarequests/new.html |  2 +-
 .../datarequests/templates/datarequests/show.html    | 10 +++++-----
 .../datarequests/snippets/additional_info.html       |  4 ++--
 .../datarequests/snippets/comment_item.html          | 12 ++++++------
 .../datarequests/snippets/datarequest_form.html      |  2 +-
 .../datarequests/snippets/datarequest_item.html      |  6 +++---
 .../datarequests/snippets/datarequest_list.html      |  4 ++--
 .../templates/datarequests/snippets/followers.html   |  4 ++--
 .../templates/organization/datarequests.html         |  4 ++--
 13 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/ckanext/datarequests/templates/datarequests/base.html b/ckanext/datarequests/templates/datarequests/base.html
index 314e603b..178f143e 100644
--- a/ckanext/datarequests/templates/datarequests/base.html
+++ b/ckanext/datarequests/templates/datarequests/base.html
@@ -8,7 +8,7 @@
 {% block subtitle %}{{ _('Data Requests') }}{% endblock %}
 
 {% block breadcrumb_content %}
-  <li class="active">{% link_for _('Data Requests'), controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI', action='index' %}</li>
+  <li class="active">{% link_for _('Data Requests'), named_route='datarequest.index' %}</li>
 {% endblock %}
 
 {% block secondary_content %}
@@ -23,5 +23,5 @@ <h2 class="module-heading"><i class="icon-info-sign fa fa-info-circle"></i>{% tr
       {% endblock %}
     </div>
   </section>
-  
+
 {% endblock %}
diff --git a/ckanext/datarequests/templates/datarequests/close.html b/ckanext/datarequests/templates/datarequests/close.html
index 945ba87e..5716c78b 100644
--- a/ckanext/datarequests/templates/datarequests/close.html
+++ b/ckanext/datarequests/templates/datarequests/close.html
@@ -3,8 +3,8 @@
 {% block subtitle %}{{ _('Close Data Request') }}{% endblock %}
 
 {% block breadcrumb_content %}
-  <li>{% link_for _('Data Requests'), controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI', action='index' %}</li>
-  <li>{% link_for c.datarequest.get('title')|truncate(30), controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI', action='show', id=c.datarequest.get('id') %}</li>
+  <li>{% link_for _('Data Requests'), named_route='datarequest.index' %}</li>
+  <li>{% link_for c.datarequest.get('title')|truncate(30), named_route='datarequest.show', id=c.datarequest.get('id') %}</li>
   <li class="active"><a href="">{{ _('Close Data Request') }}</a></li>
 {% endblock %}
 
@@ -13,4 +13,4 @@ <h1 class="{% block page_heading_class %}page-heading{% endblock %}">{% block pa
   {% snippet "datarequests/snippets/close_datarequest_form.html", datarequest=c.datarequest, datasets=c.datasets, errors=c.errors, errors_summary=c.errors_summary  %}
 {% endblock %}
 
-{% block page_header %}{% endblock %}
\ No newline at end of file
+{% block page_header %}{% endblock %}
diff --git a/ckanext/datarequests/templates/datarequests/edit.html b/ckanext/datarequests/templates/datarequests/edit.html
index 535920ad..17845e41 100644
--- a/ckanext/datarequests/templates/datarequests/edit.html
+++ b/ckanext/datarequests/templates/datarequests/edit.html
@@ -3,8 +3,8 @@
 {% block subtitle %}{{ _('Edit Data Request') }}{% endblock %}
 
 {% block breadcrumb_content %}
-  <li>{% link_for _('Data Requests'), controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI', action='index' %}</li>
-  <li>{% link_for c.original_title|truncate(30), controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI', action='show', id=c.datarequest.get('id') %}</li>
+  <li>{% link_for _('Data Requests'), named_route='datarequest.index' %}</li>
+  <li>{% link_for c.original_title|truncate(30), named_route='datarequest.show', id=c.datarequest.get('id') %}</li>
   <li class="active"><a href="">{{ _('Edit Data Request') }}</a></li>
 {% endblock %}
 
@@ -13,4 +13,4 @@ <h1 class="{% block page_heading_class %}page-heading{% endblock %}">{% block pa
   {% snippet "datarequests/snippets/edit_datarequest_form.html", data=c.datarequest, errors=c.errors, errors_summary=c.errors_summary, offering=c.offering %}
 {% endblock %}
 
-{% block page_header %}{% endblock %}
\ No newline at end of file
+{% block page_header %}{% endblock %}
diff --git a/ckanext/datarequests/templates/datarequests/index.html b/ckanext/datarequests/templates/datarequests/index.html
index a9ccd546..0096f723 100644
--- a/ckanext/datarequests/templates/datarequests/index.html
+++ b/ckanext/datarequests/templates/datarequests/index.html
@@ -6,7 +6,7 @@
       {% block page_primary_action %}
         {% if h.check_access('create_datarequest') %}
           <div class="page_primary_action">
-            {% link_for _('Add Data Request'), controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI', action='new', class_='btn btn-primary', icon=h.get_plus_icon() %}
+            {% link_for _('Add Data Request'), named_route='datarequest.new', class_='btn btn-primary', icon=h.get_plus_icon() %}
           </div>
         {% endif %}
         {% snippet 'snippets/custom_search_form.html', query=c.q, fields=(('organization', c.organization), ('state', c.state)), sorting=c.filters, sorting_selected=c.sort, placeholder=_('Search Data Requests...'), no_bottom_border=true, count=c.datarequest_count, no_title=True %}
@@ -21,4 +21,4 @@
   {% for facet in c.facet_titles %}
     {{ h.snippet('snippets/facet_list.html', title=c.facet_titles[facet], name=facet) }}
   {% endfor %}
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/ckanext/datarequests/templates/datarequests/new.html b/ckanext/datarequests/templates/datarequests/new.html
index 1c371e1a..54de71fd 100644
--- a/ckanext/datarequests/templates/datarequests/new.html
+++ b/ckanext/datarequests/templates/datarequests/new.html
@@ -3,7 +3,7 @@
 {% block subtitle %}{{ _('Create Data Request') }}{% endblock %}
 
 {% block breadcrumb_content %}
-  <li>{% link_for _('Data Requests'), controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI', action='index' %}</li>
+  <li>{% link_for _('Data Requests'), named_route='datarequest.index' %}</li>
   <li class="active"><a href="">{{ _('Create Data Request') }}</a></li>
 {% endblock %}
 
diff --git a/ckanext/datarequests/templates/datarequests/show.html b/ckanext/datarequests/templates/datarequests/show.html
index 89b11f87..7d0d8192 100644
--- a/ckanext/datarequests/templates/datarequests/show.html
+++ b/ckanext/datarequests/templates/datarequests/show.html
@@ -5,18 +5,18 @@
 {% set datarequest_id = c.datarequest.get('id') %}
 
 {% block breadcrumb_content %}
-  <li>{% link_for _('Data Requests'), controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI', action='index' %}</li>
-  <li>{% link_for c.datarequest.get('title'), controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI', action='show', id=datarequest_id %}</li>
+  <li>{% link_for _('Data Requests'), named_route='datarequest.index' %}</li>
+  <li>{% link_for c.datarequest.get('title'), named_route='datarequest.show', id=datarequest_id %}</li>
 {% endblock %}
 
 {% block content_action %}
 
   {% if h.check_access('update_datarequest', {'id':datarequest_id }) %}
-    {% link_for _('Manage'), controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI', action='update', id=datarequest_id, class_='btn btn-default', icon='wrench' %}
+    {% link_for _('Manage'), named_route='datarequest.update', id=datarequest_id, class_='btn btn-default', icon='wrench' %}
   {% endif %}
 
   {% if h.check_access('close_datarequest', {'id':datarequest_id }) and not c.datarequest.closed %}
-    {% link_for _('Close'), controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI', action='close', id=datarequest_id, class_='btn btn-danger', icon='lock' %}
+    {% link_for _('Close'), named_route='datarequest.close', id=datarequest_id, class_='btn btn-danger', icon='lock' %}
   {% endif %}
 
 {% endblock %}
@@ -65,4 +65,4 @@ <h1 class="{% block page_heading_class %}page-heading{% endblock %}">{% block pa
     {% snippet "datarequests/snippets/additional_info.html", datarequest=c.datarequest %}
   {% endblock %}
 
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/ckanext/datarequests/templates/datarequests/snippets/additional_info.html b/ckanext/datarequests/templates/datarequests/snippets/additional_info.html
index e5547c43..fa305d04 100644
--- a/ckanext/datarequests/templates/datarequests/snippets/additional_info.html
+++ b/ckanext/datarequests/templates/datarequests/snippets/additional_info.html
@@ -39,7 +39,7 @@ <h3>{{ _('Additional Info') }}</h3>
               <tr>
                 <th scope="row" class="dataset-label">{{ _('Accepted dataset') }}</th>
                 <td class="dataset-details">
-                  {% link_for datarequest.accepted_dataset['title'], controller='package', action='read', id=datarequest.accepted_dataset.get('id') %}
+                  {% link_for datarequest.accepted_dataset['title'], named_route='package.read', id=datarequest.accepted_dataset.get('id') %}
                 </td>
               </tr>
             {% endif %}
@@ -59,4 +59,4 @@ <h3>{{ _('Additional Info') }}</h3>
       {% endblock %}
     </tbody>
   </table>
-</section>
\ No newline at end of file
+</section>
diff --git a/ckanext/datarequests/templates/datarequests/snippets/comment_item.html b/ckanext/datarequests/templates/datarequests/snippets/comment_item.html
index 99339342..1f9c4942 100644
--- a/ckanext/datarequests/templates/datarequests/snippets/comment_item.html
+++ b/ckanext/datarequests/templates/datarequests/snippets/comment_item.html
@@ -6,7 +6,7 @@
 {% endif %}
 
 <div class="comment-wrapper">
-  <a href="{{ h.url_for(controller='user', action='read', id=comment.user.get('name')) }}"
+  <a href="{{ h.url_for(named_route='user.read', id=comment.user.get('name')) }}"
     class="comment-avatar">
     {{ h.gravatar(comment.user.get('email_hash'), 48) }}
   </a>
@@ -16,22 +16,22 @@
         {% if h.check_access('delete_datarequest_comment', {'id':comment.id }) %}
           <div class="comment-action">
             {% set locale = h.dump_json({'content': _('Are you sure you want to delete this comment?')}) %}
-            <a class="subtle-btn" id="delete-comment-{{ comment.id }}" href="{% url_for controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI', action='delete_comment', datarequest_id=datarequest.id, comment_id=comment.id %}" data-module="confirm-action" data-module-i18n="{{ locale }}"><i class="icon-remove fa fa-times"></i></a>
+            <a class="subtle-btn" id="delete-comment-{{ comment.id }}" href="{% url_for named_route='datarequest.delete_comment', datarequest_id=datarequest.id, comment_id=comment.id %}" data-module="confirm-action" data-module-i18n="{{ locale }}"><i class="icon-remove fa fa-times"></i></a>
           </div>
         {% endif %}
         {% if can_update %}
           <div class="comment-action" id="edit-button">
             <button class="subtle-btn" id="update-comment-{{ comment.id }}" href=""><i class="icon-pencil fa fa-pencil"></i></button>
-          </div>          
+          </div>
         {% endif %}
         <div class="comment-header-text">
-          <a href="{{ h.url_for(controller='user', action='read', id=comment.user.get('name')) }}" class="author">{{ comment.user.get('display_name') }}</a>
+          <a href="{{ h.url_for(named_route='user.read', id=comment.user.get('name')) }}" class="author">{{ comment.user.get('display_name') }}</a>
           {% trans %}commented{% endtrans %}
           <span title="{{comment.time}}">{{ h.time_ago_from_timestamp(comment.time).lower() }}</span>
         </div>
       </div>
     </div>
-    
+
     <div class="comment-content {{ 'hide' if focus and errors }}" id="comment-{{ comment.id }}">
       {{ h.render_markdown(comment.comment|safe) }}
     </div>
@@ -41,4 +41,4 @@
     {% endif %}
 
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/ckanext/datarequests/templates/datarequests/snippets/datarequest_form.html b/ckanext/datarequests/templates/datarequests/snippets/datarequest_form.html
index 0690de85..590f0eec 100644
--- a/ckanext/datarequests/templates/datarequests/snippets/datarequest_form.html
+++ b/ckanext/datarequests/templates/datarequests/snippets/datarequest_form.html
@@ -45,7 +45,7 @@
       {% block delete_button %}
         {% if h.check_access('delete_datarequest', {'id': data.get('id', '')}) and not data.state == 'deleted' %}
           {% set locale = h.dump_json({'content': _('Are you sure you want to delete this data request?')}) %}
-          <a class="btn btn-danger pull-left" href="{% url_for controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI', action='delete', id=data.get('id') %}" data-module="confirm-action" data-module-i18n="{{ locale }}">{% block delete_button_text %}{{ _('Delete') }}{% endblock %}</a>
+          <a class="btn btn-danger pull-left" href="{% url_for named_route='datarequest.delete', id=data.get('id') %}" data-module="confirm-action" data-module-i18n="{{ locale }}">{% block delete_button_text %}{{ _('Delete') }}{% endblock %}</a>
         {% endif %}
       {% endblock %}
       <button class="btn btn-primary" type="submit" name="save">{% block save_button_text %}{{ _('Create Data Request') }}{% endblock %}</button>
diff --git a/ckanext/datarequests/templates/datarequests/snippets/datarequest_item.html b/ckanext/datarequests/templates/datarequests/snippets/datarequest_item.html
index 773b28d7..80788d12 100644
--- a/ckanext/datarequests/templates/datarequests/snippets/datarequest_item.html
+++ b/ckanext/datarequests/templates/datarequests/snippets/datarequest_item.html
@@ -16,18 +16,18 @@ <h3 class="dataset-heading">
             <i class="icon-unlock fa fa-unlock"></i> {% trans %}Open{% endtrans %}
           </span>
         {% endif %}
-        {{ h.link_to(h.truncate(title, truncate_title), h.url_for(controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI', action='show', id=datarequest.get('id', ''))) }}
+        {{ h.link_to(h.truncate(title, truncate_title), h.url_for(named_route='datarequest.show', id=datarequest.get('id', ''))) }}
       </h3>
       {% if description %}
         <div>{{ description }}</div>
       {% endif %}
       <div class="datarequest-properties">
         {% if h.show_comments_tab() %}
-          <a href="{{ h.url_for(controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI', action='comment', id=datarequest.get('id','')) }}" class="label label-default"><i class="icon-comment fa fa-comment"></i> {{ h.get_comments_number(datarequest.get('id', '')) }}</span></a>
+          <a href="{{ h.url_for(named_route='datarequest.comment', id=datarequest.get('id','')) }}" class="label label-default"><i class="icon-comment fa fa-comment"></i> {{ h.get_comments_number(datarequest.get('id', '')) }}</span></a>
         {% endif %}
         <div class="divider"/>
         <span class="date-datarequests">{{ h.time_ago_from_timestamp(datarequest.open_time) }}</span>
       </div>
     </div>
   {% endblock %}
-</li>
\ No newline at end of file
+</li>
diff --git a/ckanext/datarequests/templates/datarequests/snippets/datarequest_list.html b/ckanext/datarequests/templates/datarequests/snippets/datarequest_list.html
index 2c14adfb..86c37fbb 100644
--- a/ckanext/datarequests/templates/datarequests/snippets/datarequest_list.html
+++ b/ckanext/datarequests/templates/datarequests/snippets/datarequest_list.html
@@ -13,11 +13,11 @@
     <p class="empty">
       {{ _('No Data Requests found with the given criteria') }}.
       {% if h.check_access('create_datarequest') %}
-        {% link_for _('How about creating one?'), controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI', action='new' %}</a>
+        {% link_for _('How about creating one?'), named_route='datarequest.new' %}</a>
       {% endif %}
     </p>
   {% endif %}
 {% endblock %}
 {% block page_pagination %}
   {{ page.pager(q=q) }}
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/ckanext/datarequests/templates/datarequests/snippets/followers.html b/ckanext/datarequests/templates/datarequests/snippets/followers.html
index d21a3e65..a2dbd666 100644
--- a/ckanext/datarequests/templates/datarequests/snippets/followers.html
+++ b/ckanext/datarequests/templates/datarequests/snippets/followers.html
@@ -17,12 +17,12 @@ <h1 class="heading">{{ datarequest.get('title') }}</h1>
           <div class="follow_button">
             {% if h.check_access('follow_datarequest') %}
               {% if h.is_following_datarequest(datarequest.id) %}
-                <a href="{{ h.url_for(controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI', action='unfollow', id=datarequest.id) }}" class="{% block following_class %}btn btn-danger{% endblock %}" data-module="follow" data-module-type="datarequest" data-module-id="{{ datarequest.id }}" data-module-action="unfollow">
+                <a href="{{ h.url_for(named_route='datarequest.unfollow', id=datarequest.id) }}" class="{% block following_class %}btn btn-danger{% endblock %}" data-module="follow" data-module-type="datarequest" data-module-id="{{ datarequest.id }}" data-module-action="unfollow">
                   <i class="fa fa-times-circle icon-remove-sign"></i>
                   {{ _('Unfollow') }}
                 </a>
               {% else %}
-                <a href="{{ h.url_for(controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI', action='follow', id=datarequest.id) }}" class="{% block unfollowing_class %}btn btn-success{% endblock %}" data-module="follow" data-module-type="datarequest" data-module-id="{{ datarequest.id }}" data-module-action="follow">
+                <a href="{{ h.url_for(named_route='datarequest.follow', id=datarequest.id) }}" class="{% block unfollowing_class %}btn btn-success{% endblock %}" data-module="follow" data-module-type="datarequest" data-module-id="{{ datarequest.id }}" data-module-action="follow">
                   <i class="fa fa-plus-circle icon-plus-sign"></i>
                   {{ _('Follow') }}
                 </a>
diff --git a/ckanext/datarequests/templates/organization/datarequests.html b/ckanext/datarequests/templates/organization/datarequests.html
index 413fcdff..6a41a495 100644
--- a/ckanext/datarequests/templates/organization/datarequests.html
+++ b/ckanext/datarequests/templates/organization/datarequests.html
@@ -7,7 +7,7 @@
 {% block page_primary_action %}
   {% if h.check_access('create_datarequest') %}
     <div class="page_primary_action">
-      {% link_for _('Add Data Request'), controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI', action='new', organization=c.group_dict.id, class_='btn btn-primary', icon=h.get_plus_icon() %}
+      {% link_for _('Add Data Request'), named_route='datarequest.new', organization=c.group_dict.id, class_='btn btn-primary', icon=h.get_plus_icon() %}
     </div>
   {% endif %}
   {% snippet 'snippets/custom_search_form.html', query=c.q, fields=(('state', c.state),), sorting=c.filters, sorting_selected=c.sort, placeholder=_('Search Data Requests...'), no_bottom_border=true, count=c.datarequest_count, no_title=True %}
@@ -19,4 +19,4 @@
   {% for facet in c.facet_titles %}
     {{ h.snippet('snippets/facet_list.html', title=c.facet_titles[facet], name=facet, extras={'id': c.group_dict.name}) }}
   {% endfor %}
-{% endblock %}
\ No newline at end of file
+{% endblock %}

From 0968e40830c5d6c5bbd546febd06ca4d0211a557 Mon Sep 17 00:00:00 2001
From: antuarc <carl.antuar@smartservice.qld.gov.au>
Date: Fri, 12 Nov 2021 12:29:50 +1000
Subject: [PATCH 191/276] [QOL-7970] increase Flask compatibility

- use more named routes
- use helper to retrieve attributes from either type of request object
---
 .../controllers/controller_functions.py       | 31 +++++++---------
 ckanext/datarequests/plugin/pylons_plugin.py  |  6 +++
 ckanext/datarequests/request_helpers.py       | 37 +++++++++++++++++++
 .../snippets/additional_info.html             |  2 +-
 .../datarequests/tests/test_ui_controller.py  | 24 ++++--------
 5 files changed, 66 insertions(+), 34 deletions(-)
 create mode 100644 ckanext/datarequests/request_helpers.py

diff --git a/ckanext/datarequests/controllers/controller_functions.py b/ckanext/datarequests/controllers/controller_functions.py
index cd96a563..ef1d4316 100644
--- a/ckanext/datarequests/controllers/controller_functions.py
+++ b/ckanext/datarequests/controllers/controller_functions.py
@@ -10,7 +10,7 @@
 from ckan import model, plugins
 from ckan.common import request
 from ckan.lib import helpers
-from ckanext.datarequests import constants
+from ckanext.datarequests import constants, request_helpers
 
 
 _link = re.compile(r'(?:(https?://)|(www\.))(\S+\b/?)([!"#$%&\'()*+,\-./:;<=>?@[\\\]^_`{|}~]*)(\s|$)', re.I)
@@ -40,20 +40,17 @@ def url_with_params(url, params):
 
 
 def search_url(params):
-    url = helpers.url_for(controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
-                          action='index')
+    url = helpers.url_for(named_route='datarequest.index')
     return url_with_params(url, params)
 
 
 def org_datarequest_url(params, id):
-    url = helpers.url_for(controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
-                          action='organization_datarequests', id=id)
+    url = helpers.url_for(named_route='datarequest.organization', id=id)
     return url_with_params(url, params)
 
 
 def user_datarequest_url(params, id):
-    url = helpers.url_for(controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
-                          action='user_datarequests', id=id)
+    url = helpers.url_for(named_route='datarequest.user', id=id)
     return url_with_params(url, params)
 
 
@@ -80,16 +77,16 @@ def pager_url(state=None, sort=None, q=None, page=None):
 
     try:
         context = _get_context()
-        page = int(request.GET.get('page', 1))
+        page = int(request_helpers.get_first_query_param('page', 1))
         limit = constants.DATAREQUESTS_PER_PAGE
         offset = (page - 1) * constants.DATAREQUESTS_PER_PAGE
         data_dict = {'offset': offset, 'limit': limit}
 
-        state = request.GET.get('state', None)
+        state = request_helpers.get_first_query_param('state', None)
         if state:
             data_dict['closed'] = True if state == 'closed' else False
 
-        q = request.GET.get('q', '')
+        q = request_helpers.get_first_query_param('q', '')
         if q:
             data_dict['q'] = q
 
@@ -99,7 +96,7 @@ def pager_url(state=None, sort=None, q=None, page=None):
         if user_id:
             data_dict['user_id'] = user_id
 
-        sort = request.GET.get('sort', 'desc')
+        sort = request_helpers.get_first_query_param('sort', 'desc')
         sort = sort if sort in ['asc', 'desc'] else 'desc'
         if sort is not None:
             data_dict['sort'] = sort
@@ -141,7 +138,7 @@ def pager_url(state=None, sort=None, q=None, page=None):
 
 
 def index():
-    return _show_index(None, request.GET.get('organization', ''), True, search_url, 'datarequests/index.html')
+    return _show_index(None, request_helpers.get_first_query_param('organization', ''), True, search_url, 'datarequests/index.html')
 
 
 def _process_post(action, context):
@@ -157,7 +154,7 @@ def _process_post(action, context):
 
         try:
             result = tk.get_action(action)(context, data_dict)
-            tk.redirect_to(helpers.url_for(controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI', action='show', id=result['id']))
+            tk.redirect_to(helpers.url_for(named_route='datarequest.show', id=result['id']))
 
         except tk.ValidationError as e:
             log.warn(e)
@@ -245,7 +242,7 @@ def delete(id):
         tk.check_access(constants.DELETE_DATAREQUEST, context, data_dict)
         datarequest = tk.get_action(constants.DELETE_DATAREQUEST)(context, data_dict)
         helpers.flash_notice(tk._('Data Request %s has been deleted') % datarequest.get('title', ''))
-        tk.redirect_to(helpers.url_for(controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI', action='index'))
+        tk.redirect_to(helpers.url_for(named_route='datarequest.index'))
     except tk.ObjectNotFound as e:
         log.warn(e)
         tk.abort(404, tk._('Data Request %s not found') % id)
@@ -266,7 +263,7 @@ def user(id):
     context = _get_context()
     c.user_dict = tk.get_action('user_show')(context, {'id': id, 'include_num_followers': True})
     url_func = functools.partial(user_datarequest_url, id=id)
-    return _show_index(id, request.GET.get('organization', ''), True, url_func, 'user/datarequests.html')
+    return _show_index(id, request_helpers.get_first_query_param('organization', ''), True, url_func, 'user/datarequests.html')
 
 
 def close(id):
@@ -319,7 +316,7 @@ def _return_page(errors=None, errors_summary=None):
                 data_dict['condition'] = request.POST.get('condition', None)
 
             tk.get_action(constants.CLOSE_DATAREQUEST)(context, data_dict)
-            tk.redirect_to(helpers.url_for(controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI', action='show', id=data_dict['id']))
+            tk.redirect_to(helpers.url_for(named_route='datarequest.show', id=data_dict['id']))
         else:   # GET
             return _return_page()
 
@@ -412,7 +409,7 @@ def delete_comment(datarequest_id, comment_id):
         tk.check_access(constants.DELETE_DATAREQUEST_COMMENT, context, data_dict)
         tk.get_action(constants.DELETE_DATAREQUEST_COMMENT)(context, data_dict)
         helpers.flash_notice(tk._('Comment has been deleted'))
-        tk.redirect_to(helpers.url_for(controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI', action='comment', id=datarequest_id))
+        tk.redirect_to(helpers.url_for(named_route='datarequest.comment', id=datarequest_id))
     except tk.ObjectNotFound as e:
         log.warn(e)
         tk.abort(404, tk._('Comment %s not found') % comment_id)
diff --git a/ckanext/datarequests/plugin/pylons_plugin.py b/ckanext/datarequests/plugin/pylons_plugin.py
index a514a49f..2bdd9a0a 100644
--- a/ckanext/datarequests/plugin/pylons_plugin.py
+++ b/ckanext/datarequests/plugin/pylons_plugin.py
@@ -69,10 +69,16 @@ def before_map(self, mapper):
         list_datarequests_map.connect(
             'organization_datarequests', '/organization/%s/{id}' % constants.DATAREQUESTS_MAIN_PATH,
             action='organization_datarequests')
+        list_datarequests_map.connect(
+            'datarequest.organization', '/organization/%s/{id}' % constants.DATAREQUESTS_MAIN_PATH,
+            action='organization_datarequests')
 
         # Data Requests that belong to a user
         list_datarequests_map.connect(
             'user_datarequests', '/user/%s/{id}' % constants.DATAREQUESTS_MAIN_PATH,
             action='user_datarequests')
+        list_datarequests_map.connect(
+            'datarequest.user', '/user/%s/{id}' % constants.DATAREQUESTS_MAIN_PATH,
+            action='user_datarequests')
 
         return mapper
diff --git a/ckanext/datarequests/request_helpers.py b/ckanext/datarequests/request_helpers.py
new file mode 100644
index 00000000..9b477c7c
--- /dev/null
+++ b/ckanext/datarequests/request_helpers.py
@@ -0,0 +1,37 @@
+# encoding: utf-8
+""" Some useful functions for interacting with the current request.
+"""
+
+from ckan.common import request
+
+
+def get_cookie(field_name, default=None):
+    """ Get the value of a cookie, or the default value if not present.
+    """
+    return request.cookies.get(field_name, default)
+
+
+def get_query_params():
+    return getattr(request, 'GET', {}) or getattr(request, 'args', None)
+
+
+def get_post_params():
+    return getattr(request, 'POST', {}) or getattr(request, 'form', None)
+
+
+def get_first_post_param(field_name, default=None):
+    """ Retrieve the first POST parameter with the specified name
+    for the current request.
+
+    This uses 'request.POST' for Pylons and 'request.form' for Flask.
+    """
+    return get_post_params().get(field_name, default)
+
+
+def get_first_query_param(field_name, default=None):
+    """ Retrieve the first GET parameter with the specified name
+    for the current request.
+
+    This uses 'request.GET' for Pylons and 'request.args' for Flask.
+    """
+    return get_query_params().get(field_name, default)
diff --git a/ckanext/datarequests/templates/datarequests/snippets/additional_info.html b/ckanext/datarequests/templates/datarequests/snippets/additional_info.html
index fa305d04..2fdf89ed 100644
--- a/ckanext/datarequests/templates/datarequests/snippets/additional_info.html
+++ b/ckanext/datarequests/templates/datarequests/snippets/additional_info.html
@@ -48,7 +48,7 @@ <h3>{{ _('Additional Info') }}</h3>
               <th scope="row" class="dataset-label">{{ _('Accepted dataset') }}</th>
               <td class="dataset-details">
               {% if datarequest.accepted_dataset %}
-                {% link_for datarequest.accepted_dataset['title'], controller='package', action='read', id=datarequest.accepted_dataset.get('id') %}
+                {% link_for datarequest.accepted_dataset['title'], named_route='package.read', id=datarequest.accepted_dataset.get('id') %}
               {% else %}
                 {{ _('None') }}
               {% endif %}
diff --git a/ckanext/datarequests/tests/test_ui_controller.py b/ckanext/datarequests/tests/test_ui_controller.py
index 1ea36b04..3532ffdd 100644
--- a/ckanext/datarequests/tests/test_ui_controller.py
+++ b/ckanext/datarequests/tests/test_ui_controller.py
@@ -204,8 +204,7 @@ def test_new_post_content(self, authorized, validation_error):
                 self.assertEquals({}, controller.c.errors_summary)
                 self.assertEquals({}, controller.c.datarequest)
                 controller.helpers.url_for.assert_called_once_with(
-                    controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
-                    action='show', id=datarequest_id)
+                    named_route='datarequest.show', id=datarequest_id)
                 controller.tk.redirect_to.assert_called_once_with(controller.helpers.url_for.return_value)
         else:
             controller.tk.abort.assert_called_once_with(403, 'Unauthorized to create a Data Request')
@@ -415,8 +414,7 @@ def _get_action(action):
                 self.assertEquals({}, controller.c.errors_summary)
                 self.assertEquals(original_dr, controller.c.datarequest)
                 controller.helpers.url_for.assert_called_once_with(
-                    controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
-                    action='show', id=datarequest_id)
+                    named_route='datarequest.show', id=datarequest_id)
                 controller.tk.redirect_to.assert_called_once_with(controller.helpers.url_for.return_value)
         else:
             controller.tk.abort.assert_called_once_with(403, 'You are not authorized to update the Data Request %s' % datarequest_id)
@@ -601,16 +599,13 @@ def _get_action(action):
         # When URL function is called, helpers.url_for is called to get the final URL
         if func == INDEX_FUNCTION:
             controller.helpers.url_for.assert_called_once_with(
-                controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
-                action='index')
+                named_route='datarequest.index')
         elif func == ORGANIZATION_DATAREQUESTS_FUNCTION:
             controller.helpers.url_for.assert_called_once_with(
-                controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
-                action='organization_datarequests', id=organization)
+                named_route='datarequest.organization', id=organization)
         elif func == USER_DATAREQUESTS_FUNCTION:
             controller.helpers.url_for.assert_called_once_with(
-                controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
-                action='user_datarequests', id=user)
+                named_route='datarequest.user', id=user)
 
         # Check the facets
         expected_facet_titles = {}
@@ -662,8 +657,7 @@ def test_delete(self):
 
         # Redirection
         controller.helpers.url_for.assert_called_once_with(
-            controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
-            action='index')
+            named_route='datarequest.index')
         controller.tk.redirect_to.assert_called_once_with(controller.helpers.url_for.return_value)
 
     ######################################################################
@@ -761,8 +755,7 @@ def _get_action(action):
 
         # Checks
         controller.helpers.url_for.assert_called_once_with(
-            controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
-            action='show', id=datarequest_id)
+            named_route='datarequest.show', id=datarequest_id)
         controller.tk.redirect_to.assert_called_once_with(controller.helpers.url_for.return_value)
         self.assertIsNone(result)
 
@@ -973,8 +966,7 @@ def test_delete_comment(self):
 
         # Check redirection
         controller.helpers.url_for.assert_called_once_with(
-            controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
-            action='comment', id=datarequest_id)
+            named_route='datarequest.comment', id=datarequest_id)
         controller.tk.redirect_to.assert_called_once_with(controller.helpers.url_for.return_value)
 
     ######################################################################

From 8ae242a321d562b12759fd2c81d1ee7c649c4eba Mon Sep 17 00:00:00 2001
From: antuarc <carl.antuar@smartservice.qld.gov.au>
Date: Fri, 12 Nov 2021 12:40:15 +1000
Subject: [PATCH 192/276] [QOL-7970] adjust tests to handle extra named routes

---
 ckanext/datarequests/tests/test_pylons_plugin.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/ckanext/datarequests/tests/test_pylons_plugin.py b/ckanext/datarequests/tests/test_pylons_plugin.py
index e8df2a57..18aef868 100644
--- a/ckanext/datarequests/tests/test_pylons_plugin.py
+++ b/ckanext/datarequests/tests/test_pylons_plugin.py
@@ -20,7 +20,7 @@ class DataRequestPylonsPluginTest(unittest.TestCase):
     ])
     def test_before_map(self, comments_enabled):
 
-        urls_set = 15
+        urls_set = 17
         mapa_calls = urls_set if comments_enabled else urls_set - 3
 
         # Configure config and get instance
@@ -85,6 +85,13 @@ def test_before_map(self, comments_enabled):
             action='organization_datarequests', conditions={'method': ['GET']},
             ckan_icon=mock_icon)
 
+        mapa.connect.assert_any_call(
+            'datarequest.organization',
+            '/organization/%s/{id}' % dr_basic_path,
+            controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
+            action='organization_datarequests', conditions={'method': ['GET']},
+            ckan_icon=mock_icon)
+
         mapa.connect.assert_any_call(
             'user_datarequests',
             '/user/%s/{id}' % dr_basic_path,
@@ -93,7 +100,7 @@ def test_before_map(self, comments_enabled):
             ckan_icon=mock_icon)
 
         mapa.connect.assert_any_call(
-            'user_datarequests',
+            'datarequest.user',
             '/user/%s/{id}' % dr_basic_path,
             controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI',
             action='user_datarequests', conditions={'method': ['GET']},

From 16dd59376b0d8085aca59860480d182b5a4c6b7a Mon Sep 17 00:00:00 2001
From: antuarc <carl.antuar@smartservice.qld.gov.au>
Date: Fri, 12 Nov 2021 12:50:37 +1000
Subject: [PATCH 193/276] [QOL-7970] mock out request object in tests

---
 ckanext/datarequests/tests/test_ui_controller.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ckanext/datarequests/tests/test_ui_controller.py b/ckanext/datarequests/tests/test_ui_controller.py
index 3532ffdd..9c6221d9 100644
--- a/ckanext/datarequests/tests/test_ui_controller.py
+++ b/ckanext/datarequests/tests/test_ui_controller.py
@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with CKAN Data Requests Extension. If not, see <http://www.gnu.org/licenses/>.
 
-from ckanext.datarequests import constants
+from ckanext.datarequests import constants, request_helpers
 import ckanext.datarequests.controllers.controller_functions as controller
 import unittest
 
@@ -46,8 +46,8 @@ def setUp(self):
         self._c = controller.c
         controller.c = MagicMock()
 
-        self._request = controller.request
-        controller.request = MagicMock()
+        self._request = request_helpers.request
+        request_helpers.request = MagicMock()
 
         self._model = controller.model
         controller.model = MagicMock()

From 308163dad3f7ba99e34c2b00d23431e74fdde913 Mon Sep 17 00:00:00 2001
From: antuarc <carl.antuar@smartservice.qld.gov.au>
Date: Fri, 12 Nov 2021 13:07:25 +1000
Subject: [PATCH 194/276] [QOL-7970] use request helpers for POST and testing

---
 .../controllers/controller_functions.py       | 29 +++++++--------
 .../datarequests/tests/test_ui_controller.py  | 37 +++++++++----------
 2 files changed, 32 insertions(+), 34 deletions(-)

diff --git a/ckanext/datarequests/controllers/controller_functions.py b/ckanext/datarequests/controllers/controller_functions.py
index ef1d4316..25b2881b 100644
--- a/ckanext/datarequests/controllers/controller_functions.py
+++ b/ckanext/datarequests/controllers/controller_functions.py
@@ -8,7 +8,6 @@
 from six.moves.urllib.parse import urlencode
 
 from ckan import model, plugins
-from ckan.common import request
 from ckan.lib import helpers
 from ckanext.datarequests import constants, request_helpers
 
@@ -143,14 +142,14 @@ def index():
 
 def _process_post(action, context):
     # If the user has submitted the form, the data request must be created
-    if request.POST:
+    if request_helpers.get_post_params():
         data_dict = {}
-        data_dict['title'] = request.POST.get('title', '')
-        data_dict['description'] = request.POST.get('description', '')
-        data_dict['organization_id'] = request.POST.get('organization_id', '')
+        data_dict['title'] = request_helpers.get_first_post_param('title', '')
+        data_dict['description'] = request_helpers.get_first_post_param('description', '')
+        data_dict['organization_id'] = request_helpers.get_first_post_param('organization_id', '')
 
         if action == constants.UPDATE_DATAREQUEST:
-            data_dict['id'] = request.POST.get('id', '')
+            data_dict['id'] = request_helpers.get_first_post_param('id', '')
 
         try:
             result = tk.get_action(action)(context, data_dict)
@@ -296,7 +295,7 @@ def _return_page(errors=None, errors_summary=None):
 
         if tk.h.closing_circumstances_enabled:
             # This is required so the form can set the currently selected close_circumstance option in the select dropdown
-            c.datarequest['close_circumstance'] = request.POST.get('close_circumstance', None)
+            c.datarequest['close_circumstance'] = request_helpers.get_first_post_param('close_circumstance', None)
 
         return tk.render('datarequests/close.html')
 
@@ -306,14 +305,14 @@ def _return_page(errors=None, errors_summary=None):
 
         if c.datarequest.get('closed', False):
             tk.abort(403, tk._('This data request is already closed'))
-        elif request.POST:
+        elif request_helpers.get_post_params():
             data_dict = {}
-            data_dict['accepted_dataset_id'] = request.POST.get('accepted_dataset_id', None)
+            data_dict['accepted_dataset_id'] = request_helpers.get_first_post_param('accepted_dataset_id', None)
             data_dict['id'] = id
             if tk.h.closing_circumstances_enabled:
-                data_dict['close_circumstance'] = request.POST.get('close_circumstance', None)
-                data_dict['approx_publishing_date'] = request.POST.get('approx_publishing_date', None)
-                data_dict['condition'] = request.POST.get('condition', None)
+                data_dict['close_circumstance'] = request_helpers.get_first_post_param('close_circumstance', None)
+                data_dict['approx_publishing_date'] = request_helpers.get_first_post_param('approx_publishing_date', None)
+                data_dict['condition'] = request_helpers.get_first_post_param('condition', None)
 
             tk.get_action(constants.CLOSE_DATAREQUEST)(context, data_dict)
             tk.redirect_to(helpers.url_for(named_route='datarequest.show', id=data_dict['id']))
@@ -343,10 +342,10 @@ def comment(id):
         # Raises 404 Not Found if the data request does not exist
         c.datarequest = tk.get_action(constants.SHOW_DATAREQUEST)(context, data_dict_dr_show)
 
-        comment_text = request.POST.get('comment', '')
-        comment_id = request.POST.get('comment-id', '')
+        comment_text = request_helpers.get_first_post_param('comment', '')
+        comment_id = request_helpers.get_first_post_param('comment-id', '')
 
-        if request.POST:
+        if request_helpers.get_post_params():
             action = constants.COMMENT_DATAREQUEST
             action_text = 'comment'
 
diff --git a/ckanext/datarequests/tests/test_ui_controller.py b/ckanext/datarequests/tests/test_ui_controller.py
index 9c6221d9..9b8c0db5 100644
--- a/ckanext/datarequests/tests/test_ui_controller.py
+++ b/ckanext/datarequests/tests/test_ui_controller.py
@@ -52,8 +52,8 @@ def setUp(self):
         self._model = controller.model
         controller.model = MagicMock()
 
-        self._request = controller.request
-        controller.request = MagicMock()
+        self._request = request_helpers.request
+        request_helpers.request = MagicMock()
 
         self._helpers = controller.helpers
         controller.helpers = MagicMock()
@@ -71,9 +71,8 @@ def tearDown(self):
         controller.plugins = self._plugins
         controller.tk = self._tk
         controller.c = self._c
-        controller.request = self._request
+        request_helpers.request = self._request
         controller.model = self._model
-        controller.request = self._request
         controller.helpers = self._helpers
         controller.constants.DATAREQUESTS_PER_PAGE = self._datarequests_per_page
 
@@ -126,7 +125,7 @@ def _get_action(action):
     def test_new_no_post(self, authorized):
         controller.tk.response.location = None
         controller.tk.response.status_int = 200
-        controller.request.POST = {}
+        request_helpers.request.POST = {}
 
         # Raise exception if the user is not authorized to create a new data request
         if not authorized:
@@ -171,7 +170,7 @@ def test_new_post_content(self, authorized, validation_error):
             action.return_value = {'id': datarequest_id}
 
         # Create the request
-        request_data = controller.request.POST = {
+        request_data = request_helpers.request.POST = {
             'title': 'Example Title',
             'description': 'Example Description',
             'organization_id': 'organization uuid4'
@@ -317,7 +316,7 @@ def test_update_not_found(self):
     def test_update_no_post_content(self):
         controller.tk.response.location = None
         controller.tk.response.status_int = 200
-        controller.request.POST = {}
+        request_helpers.request.POST = {}
 
         datarequest_id = 'example_uuidv4'
         datarequest = {'id': 'uuid4', 'user_id': 'user_uuid4', 'title': 'example_title'}
@@ -379,7 +378,7 @@ def _get_action(action):
             update_datarequest.return_value = {'id': datarequest_id}
 
         # Create the request
-        request_data = controller.request.POST = {
+        request_data = request_helpers.request.POST = {
             'id': datarequest_id,
             'title': 'Example Title',
             'description': 'Example Description',
@@ -427,7 +426,7 @@ def _get_action(action):
     def test_index_not_authorized(self):
         controller.tk.check_access.side_effect = controller.tk.NotAuthorized('User is not authorized')
         organization_name = 'org'
-        controller.request.GET = {'organization': organization_name}
+        request_helpers.request.GET = {'organization': organization_name}
 
         # Call the function
         result = controller.index()
@@ -441,7 +440,7 @@ def test_index_not_authorized(self):
         self.assertIsNone(result)
 
     def test_index_invalid_page(self):
-        controller.request.GET = controller.request.params = {'page': '2a'}
+        request_helpers.request.GET = request_helpers.request.params = {'page': '2a'}
 
         # Call the function
         result = controller.index()
@@ -507,11 +506,11 @@ def test_index_organization_user_dr(self, func, page, organization, user, expect
         constants.DATAREQUESTS_PER_PAGE = datarequests_per_page
 
         # Get parameters
-        controller.request.GET = controller.request.params = {}
+        request_helpers.request.GET = request_helpers.request.params = {}
 
         # Set page
         if page:
-            controller.request.GET['page'] = page
+            request_helpers.request.GET['page'] = page
 
         # Set the organization in the correct place depending on the function
         if func == ORGANIZATION_DATAREQUESTS_FUNCTION:
@@ -523,14 +522,14 @@ def test_index_organization_user_dr(self, func, page, organization, user, expect
                 expected_data_dict['user_id'] = user
 
             if organization:
-                controller.request.GET['organization'] = organization
+                request_helpers.request.GET['organization'] = organization
                 expected_data_dict['organization_id'] = organization
 
         if sort:
-            controller.request.GET['sort'] = sort
+            request_helpers.request.GET['sort'] = sort
 
         if query:
-            controller.request.GET['q'] = query
+            request_helpers.request.GET['q'] = query
 
         # Mocking
         user_show = MagicMock()
@@ -680,7 +679,7 @@ def test_close_datarequest(self, organization):
     def _test_close(self, organization, post_content=None, errors=None, errors_summary=None, close_datarequest=None):
         controller.tk.response.location = None
         controller.tk.response.status_int = 200
-        controller.request.POST = post_content or {}
+        request_helpers.request.POST = post_content or {}
         errors = errors or {}
         errors_summary = errors_summary or {}
         if not close_datarequest:
@@ -735,7 +734,7 @@ def _get_action(action):
         self.assertEquals(expected_datasets, controller.c.datasets)
 
     def test_close_post_no_error(self):
-        controller.request.POST = {'accepted_dataset': 'example_ds'}
+        request_helpers.request.POST = {'accepted_dataset': 'example_ds'}
 
         datarequest_id = 'example_uuidv4'
         datarequest = {'id': 'uuid4', 'user_id': 'user_uuid4', 'title': 'example_title'}
@@ -817,14 +816,14 @@ def test_comment_list_not_found(self):
     def test_comment_list(self, new_comment=False, update_comment=False,
                           comment_or_update_exception=None):
 
-        controller.request.POST = {}
+        request_helpers.request.POST = {}
         datarequest_id = 'example_uuidv4'
         comment_id = 'comment_uuidv4'
         comment = 'example comment'
         new_comment_id = 'another_uuidv4'
 
         if new_comment or update_comment:
-            controller.request.POST = {
+            request_helpers.request.POST = {
                 'datarequest_id': datarequest_id,
                 'comment': comment,
                 'comment-id': comment_id if update_comment else ''

From 49748b6b5dbf06a94a9d2a053c4061b833561e8a Mon Sep 17 00:00:00 2001
From: antuarc <carl.antuar@smartservice.qld.gov.au>
Date: Fri, 12 Nov 2021 13:55:52 +1000
Subject: [PATCH 195/276] [QOL-7970] mock POST body correctly

- mock out the request helper function fully, not just providing a partial value
---
 ckanext/datarequests/tests/test_ui_controller.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/ckanext/datarequests/tests/test_ui_controller.py b/ckanext/datarequests/tests/test_ui_controller.py
index 9b8c0db5..8bc2a3d5 100644
--- a/ckanext/datarequests/tests/test_ui_controller.py
+++ b/ckanext/datarequests/tests/test_ui_controller.py
@@ -125,7 +125,7 @@ def _get_action(action):
     def test_new_no_post(self, authorized):
         controller.tk.response.location = None
         controller.tk.response.status_int = 200
-        request_helpers.request.POST = {}
+        request_helpers.get_post_params.return_value = {}
 
         # Raise exception if the user is not authorized to create a new data request
         if not authorized:
@@ -170,7 +170,7 @@ def test_new_post_content(self, authorized, validation_error):
             action.return_value = {'id': datarequest_id}
 
         # Create the request
-        request_data = request_helpers.request.POST = {
+        request_data = request_helpers.get_post_params.return_value = {
             'title': 'Example Title',
             'description': 'Example Description',
             'organization_id': 'organization uuid4'
@@ -316,7 +316,7 @@ def test_update_not_found(self):
     def test_update_no_post_content(self):
         controller.tk.response.location = None
         controller.tk.response.status_int = 200
-        request_helpers.request.POST = {}
+        request_helpers.get_post_params.return_value = {}
 
         datarequest_id = 'example_uuidv4'
         datarequest = {'id': 'uuid4', 'user_id': 'user_uuid4', 'title': 'example_title'}
@@ -378,7 +378,7 @@ def _get_action(action):
             update_datarequest.return_value = {'id': datarequest_id}
 
         # Create the request
-        request_data = request_helpers.request.POST = {
+        request_data = request_helpers.get_post_params.return_value = {
             'id': datarequest_id,
             'title': 'Example Title',
             'description': 'Example Description',
@@ -679,7 +679,7 @@ def test_close_datarequest(self, organization):
     def _test_close(self, organization, post_content=None, errors=None, errors_summary=None, close_datarequest=None):
         controller.tk.response.location = None
         controller.tk.response.status_int = 200
-        request_helpers.request.POST = post_content or {}
+        request_helpers.get_post_params.return_value = post_content or {}
         errors = errors or {}
         errors_summary = errors_summary or {}
         if not close_datarequest:
@@ -734,7 +734,7 @@ def _get_action(action):
         self.assertEquals(expected_datasets, controller.c.datasets)
 
     def test_close_post_no_error(self):
-        request_helpers.request.POST = {'accepted_dataset': 'example_ds'}
+        request_helpers.get_post_params.return_value = {'accepted_dataset': 'example_ds'}
 
         datarequest_id = 'example_uuidv4'
         datarequest = {'id': 'uuid4', 'user_id': 'user_uuid4', 'title': 'example_title'}
@@ -816,14 +816,14 @@ def test_comment_list_not_found(self):
     def test_comment_list(self, new_comment=False, update_comment=False,
                           comment_or_update_exception=None):
 
-        request_helpers.request.POST = {}
+        request_helpers.get_post_params.return_value = {}
         datarequest_id = 'example_uuidv4'
         comment_id = 'comment_uuidv4'
         comment = 'example comment'
         new_comment_id = 'another_uuidv4'
 
         if new_comment or update_comment:
-            request_helpers.request.POST = {
+            request_helpers.get_post_params.return_value = {
                 'datarequest_id': datarequest_id,
                 'comment': comment,
                 'comment-id': comment_id if update_comment else ''

From 52caa4c0d3f1a63700e9158d0e7dd2eb5ffaa36c Mon Sep 17 00:00:00 2001
From: antuarc <carl.antuar@smartservice.qld.gov.au>
Date: Fri, 12 Nov 2021 14:17:47 +1000
Subject: [PATCH 196/276] [QOL-7970] mock out request helper module

---
 .../datarequests/tests/test_ui_controller.py  | 25 +++++++++----------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/ckanext/datarequests/tests/test_ui_controller.py b/ckanext/datarequests/tests/test_ui_controller.py
index 8bc2a3d5..492e9364 100644
--- a/ckanext/datarequests/tests/test_ui_controller.py
+++ b/ckanext/datarequests/tests/test_ui_controller.py
@@ -46,15 +46,12 @@ def setUp(self):
         self._c = controller.c
         controller.c = MagicMock()
 
-        self._request = request_helpers.request
-        request_helpers.request = MagicMock()
+        self._request_helpers = request_helpers
+        controller.request_helpers = MagicMock()
 
         self._model = controller.model
         controller.model = MagicMock()
 
-        self._request = request_helpers.request
-        request_helpers.request = MagicMock()
-
         self._helpers = controller.helpers
         controller.helpers = MagicMock()
 
@@ -71,7 +68,7 @@ def tearDown(self):
         controller.plugins = self._plugins
         controller.tk = self._tk
         controller.c = self._c
-        request_helpers.request = self._request
+        controller.request_helpers = self._request_helpers
         controller.model = self._model
         controller.helpers = self._helpers
         controller.constants.DATAREQUESTS_PER_PAGE = self._datarequests_per_page
@@ -426,7 +423,7 @@ def _get_action(action):
     def test_index_not_authorized(self):
         controller.tk.check_access.side_effect = controller.tk.NotAuthorized('User is not authorized')
         organization_name = 'org'
-        request_helpers.request.GET = {'organization': organization_name}
+        request_helpers.get_query_params.return_value = {'organization': organization_name}
 
         # Call the function
         result = controller.index()
@@ -440,7 +437,7 @@ def test_index_not_authorized(self):
         self.assertIsNone(result)
 
     def test_index_invalid_page(self):
-        request_helpers.request.GET = request_helpers.request.params = {'page': '2a'}
+        request_helpers.get_query_params.return_value = {'page': '2a'}
 
         # Call the function
         result = controller.index()
@@ -506,11 +503,11 @@ def test_index_organization_user_dr(self, func, page, organization, user, expect
         constants.DATAREQUESTS_PER_PAGE = datarequests_per_page
 
         # Get parameters
-        request_helpers.request.GET = request_helpers.request.params = {}
+        query_params = {}
 
         # Set page
         if page:
-            request_helpers.request.GET['page'] = page
+            query_params['page'] = page
 
         # Set the organization in the correct place depending on the function
         if func == ORGANIZATION_DATAREQUESTS_FUNCTION:
@@ -522,14 +519,16 @@ def test_index_organization_user_dr(self, func, page, organization, user, expect
                 expected_data_dict['user_id'] = user
 
             if organization:
-                request_helpers.request.GET['organization'] = organization
+                query_params['organization'] = organization
                 expected_data_dict['organization_id'] = organization
 
         if sort:
-            request_helpers.request.GET['sort'] = sort
+            query_params['sort'] = sort
 
         if query:
-            request_helpers.request.GET['q'] = query
+            query_params['q'] = query
+
+        request_helpers.get_query_params.return_value = query_params
 
         # Mocking
         user_show = MagicMock()

From b763a0e2056d8fa54729318785aad850c392d102 Mon Sep 17 00:00:00 2001
From: antuarc <carl.antuar@smartservice.qld.gov.au>
Date: Fri, 12 Nov 2021 14:37:33 +1000
Subject: [PATCH 197/276] [QOL-7970] fix request helper patching

- mocking out the whole module means we lose useful functions. Just mock the request object. But mock both versions of it.
---
 .../datarequests/tests/test_ui_controller.py  | 54 +++++++++++--------
 1 file changed, 31 insertions(+), 23 deletions(-)

diff --git a/ckanext/datarequests/tests/test_ui_controller.py b/ckanext/datarequests/tests/test_ui_controller.py
index 492e9364..867dcf5b 100644
--- a/ckanext/datarequests/tests/test_ui_controller.py
+++ b/ckanext/datarequests/tests/test_ui_controller.py
@@ -30,6 +30,16 @@
 USER_DATAREQUESTS_FUNCTION = 'user'
 
 
+def _patch_GET(params):
+    request_helpers.request.GET = params
+    request_helpers.request.args = params
+
+
+def _patch_POST(params):
+    request_helpers.request.POST = params
+    request_helpers.request.form = params
+
+
 class UIControllerTest(unittest.TestCase):
 
     def setUp(self):
@@ -46,8 +56,8 @@ def setUp(self):
         self._c = controller.c
         controller.c = MagicMock()
 
-        self._request_helpers = request_helpers
-        controller.request_helpers = MagicMock()
+        self._request = request_helpers.request
+        request_helpers.request = MagicMock()
 
         self._model = controller.model
         controller.model = MagicMock()
@@ -68,7 +78,7 @@ def tearDown(self):
         controller.plugins = self._plugins
         controller.tk = self._tk
         controller.c = self._c
-        controller.request_helpers = self._request_helpers
+        request_helpers.request = self._request
         controller.model = self._model
         controller.helpers = self._helpers
         controller.constants.DATAREQUESTS_PER_PAGE = self._datarequests_per_page
@@ -122,7 +132,7 @@ def _get_action(action):
     def test_new_no_post(self, authorized):
         controller.tk.response.location = None
         controller.tk.response.status_int = 200
-        request_helpers.get_post_params.return_value = {}
+        _patch_POST({})
 
         # Raise exception if the user is not authorized to create a new data request
         if not authorized:
@@ -167,11 +177,11 @@ def test_new_post_content(self, authorized, validation_error):
             action.return_value = {'id': datarequest_id}
 
         # Create the request
-        request_data = request_helpers.get_post_params.return_value = {
+        request_data = _patch_POST({
             'title': 'Example Title',
             'description': 'Example Description',
             'organization_id': 'organization uuid4'
-        }
+        })
         result = controller.new()
 
         # Authorize function has been called
@@ -313,7 +323,7 @@ def test_update_not_found(self):
     def test_update_no_post_content(self):
         controller.tk.response.location = None
         controller.tk.response.status_int = 200
-        request_helpers.get_post_params.return_value = {}
+        _patch_POST({})
 
         datarequest_id = 'example_uuidv4'
         datarequest = {'id': 'uuid4', 'user_id': 'user_uuid4', 'title': 'example_title'}
@@ -375,12 +385,12 @@ def _get_action(action):
             update_datarequest.return_value = {'id': datarequest_id}
 
         # Create the request
-        request_data = request_helpers.get_post_params.return_value = {
+        request_data = _patch_POST({
             'id': datarequest_id,
             'title': 'Example Title',
             'description': 'Example Description',
             'organization_id': 'organization uuid4'
-        }
+        })
         result = controller.update(datarequest_id)
 
         # Authorize function has been called
@@ -423,7 +433,7 @@ def _get_action(action):
     def test_index_not_authorized(self):
         controller.tk.check_access.side_effect = controller.tk.NotAuthorized('User is not authorized')
         organization_name = 'org'
-        request_helpers.get_query_params.return_value = {'organization': organization_name}
+        _patch_GET({'organization': organization_name})
 
         # Call the function
         result = controller.index()
@@ -437,7 +447,7 @@ def test_index_not_authorized(self):
         self.assertIsNone(result)
 
     def test_index_invalid_page(self):
-        request_helpers.get_query_params.return_value = {'page': '2a'}
+        _patch_GET({'page': '2a'})
 
         # Call the function
         result = controller.index()
@@ -503,11 +513,11 @@ def test_index_organization_user_dr(self, func, page, organization, user, expect
         constants.DATAREQUESTS_PER_PAGE = datarequests_per_page
 
         # Get parameters
-        query_params = {}
+        _patch_GET({})
 
         # Set page
         if page:
-            query_params['page'] = page
+            request_helpers.request.GET['page'] = page
 
         # Set the organization in the correct place depending on the function
         if func == ORGANIZATION_DATAREQUESTS_FUNCTION:
@@ -519,16 +529,14 @@ def test_index_organization_user_dr(self, func, page, organization, user, expect
                 expected_data_dict['user_id'] = user
 
             if organization:
-                query_params['organization'] = organization
+                request_helpers.request.GET['organization'] = organization
                 expected_data_dict['organization_id'] = organization
 
         if sort:
-            query_params['sort'] = sort
+            request_helpers.request.GET['sort'] = sort
 
         if query:
-            query_params['q'] = query
-
-        request_helpers.get_query_params.return_value = query_params
+            request_helpers.request.GET['q'] = query
 
         # Mocking
         user_show = MagicMock()
@@ -678,7 +686,7 @@ def test_close_datarequest(self, organization):
     def _test_close(self, organization, post_content=None, errors=None, errors_summary=None, close_datarequest=None):
         controller.tk.response.location = None
         controller.tk.response.status_int = 200
-        request_helpers.get_post_params.return_value = post_content or {}
+        _patch_POST(post_content or {})
         errors = errors or {}
         errors_summary = errors_summary or {}
         if not close_datarequest:
@@ -733,7 +741,7 @@ def _get_action(action):
         self.assertEquals(expected_datasets, controller.c.datasets)
 
     def test_close_post_no_error(self):
-        request_helpers.get_post_params.return_value = {'accepted_dataset': 'example_ds'}
+        _patch_POST({'accepted_dataset': 'example_ds'})
 
         datarequest_id = 'example_uuidv4'
         datarequest = {'id': 'uuid4', 'user_id': 'user_uuid4', 'title': 'example_title'}
@@ -815,18 +823,18 @@ def test_comment_list_not_found(self):
     def test_comment_list(self, new_comment=False, update_comment=False,
                           comment_or_update_exception=None):
 
-        request_helpers.get_post_params.return_value = {}
+        _patch_POST({})
         datarequest_id = 'example_uuidv4'
         comment_id = 'comment_uuidv4'
         comment = 'example comment'
         new_comment_id = 'another_uuidv4'
 
         if new_comment or update_comment:
-            request_helpers.get_post_params.return_value = {
+            _patch_POST({
                 'datarequest_id': datarequest_id,
                 'comment': comment,
                 'comment-id': comment_id if update_comment else ''
-            }
+            })
 
         datarequest = {'id': 'uuid4', 'user_id': 'user_uuid4', 'title': 'example_title'}
         comments_list = [

From f1fe395684bb20cef9c8a90b12706993a97a8fd2 Mon Sep 17 00:00:00 2001
From: antuarc <carl.antuar@smartservice.qld.gov.au>
Date: Fri, 12 Nov 2021 14:48:45 +1000
Subject: [PATCH 198/276] [QOL-7970] make patch functions fluent

---
 ckanext/datarequests/tests/test_ui_controller.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ckanext/datarequests/tests/test_ui_controller.py b/ckanext/datarequests/tests/test_ui_controller.py
index 867dcf5b..5cb63530 100644
--- a/ckanext/datarequests/tests/test_ui_controller.py
+++ b/ckanext/datarequests/tests/test_ui_controller.py
@@ -33,11 +33,13 @@
 def _patch_GET(params):
     request_helpers.request.GET = params
     request_helpers.request.args = params
+    return params
 
 
 def _patch_POST(params):
     request_helpers.request.POST = params
     request_helpers.request.form = params
+    return params
 
 
 class UIControllerTest(unittest.TestCase):

From 57b59d83a2e07151fd00b66e0ecab5a7cda31e07 Mon Sep 17 00:00:00 2001
From: antuarc <carl.antuar@smartservice.qld.gov.au>
Date: Fri, 12 Nov 2021 15:03:00 +1000
Subject: [PATCH 199/276] [QOL-7970] fix fallback handling on request helpers

---
 ckanext/datarequests/request_helpers.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ckanext/datarequests/request_helpers.py b/ckanext/datarequests/request_helpers.py
index 9b477c7c..b878df22 100644
--- a/ckanext/datarequests/request_helpers.py
+++ b/ckanext/datarequests/request_helpers.py
@@ -12,11 +12,11 @@ def get_cookie(field_name, default=None):
 
 
 def get_query_params():
-    return getattr(request, 'GET', {}) or getattr(request, 'args', None)
+    return getattr(request, 'GET', None) or getattr(request, 'args', {})
 
 
 def get_post_params():
-    return getattr(request, 'POST', {}) or getattr(request, 'form', None)
+    return getattr(request, 'POST', None) or getattr(request, 'form', {})
 
 
 def get_first_post_param(field_name, default=None):

From 8e0b950a348fe3611bedf9b4c98b09580bed7d89 Mon Sep 17 00:00:00 2001
From: antuarc <carl.antuar@smartservice.qld.gov.au>
Date: Fri, 12 Nov 2021 15:43:34 +1000
Subject: [PATCH 200/276] [QOL-7970] add methods to Flask routing

---
 ckanext/datarequests/plugin/flask_plugin.py | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/ckanext/datarequests/plugin/flask_plugin.py b/ckanext/datarequests/plugin/flask_plugin.py
index f5c98889..822f3583 100644
--- a/ckanext/datarequests/plugin/flask_plugin.py
+++ b/ckanext/datarequests/plugin/flask_plugin.py
@@ -21,51 +21,61 @@ def get_blueprint(self):
                 "/" + constants.DATAREQUESTS_MAIN_PATH,
                 "index",
                 controller_functions.index,
+                ('GET',),
             ),
             (
                 "/{}/new".format(constants.DATAREQUESTS_MAIN_PATH),
                 "new",
                 controller_functions.new,
+                ('GET', 'POST',),
             ),
             (
                 "/{}/<id>".format(constants.DATAREQUESTS_MAIN_PATH),
                 "show",
                 controller_functions.show,
+                ('GET',),
             ),
             (
                 "/{}/edit/<id>".format(constants.DATAREQUESTS_MAIN_PATH),
                 "update",
                 controller_functions.update,
+                ('GET', 'POST',),
             ),
             (
                 "/{}/delete/<id>".format(constants.DATAREQUESTS_MAIN_PATH),
                 "delete",
                 controller_functions.delete,
+                ('POST',),
             ),
             (
                 "/{}/close/<id>".format(constants.DATAREQUESTS_MAIN_PATH),
                 "close",
                 controller_functions.close,
+                ('GET', 'POST',),
             ),
             (
                 "/{}/follow/<datarequest_id>".format(constants.DATAREQUESTS_MAIN_PATH),
                 "follow",
                 controller_functions.follow,
+                ('POST',),
             ),
             (
                 "/{}/unfollow/<datarequest_id>".format(constants.DATAREQUESTS_MAIN_PATH),
                 "unfollow",
                 controller_functions.unfollow,
+                ('POST',),
             ),
             (
                 "/organization/{}/<id>".format(constants.DATAREQUESTS_MAIN_PATH),
                 "organization",
                 controller_functions.organization,
+                ('GET',),
             ),
             (
                 "/user/{}/<id>".format(constants.DATAREQUESTS_MAIN_PATH),
                 "user",
                 controller_functions.user,
+                ('GET',),
             ),
         ]
 
@@ -76,17 +86,19 @@ def get_blueprint(self):
                         "/{}/comment/<id>".format(constants.DATAREQUESTS_MAIN_PATH),
                         "comment",
                         controller_functions.comment,
+                        ('GET', 'POST',),
                     ),
                     (
                         "/{}/comment/<datarequest_id>/delete/<comment_id>".format(
                             constants.DATAREQUESTS_MAIN_PATH),
                         "delete_comment",
                         controller_functions.delete_comment,
+                        ('GET', 'POST',),
                     ),
                 ]
             )
 
         for rule in rules:
-            datarequests_bp.add_url_rule(rule[0], endpoint=rule[1], view_func=rule[2])
+            datarequests_bp.add_url_rule(rule[0], endpoint=rule[1], view_func=rule[2], methods=rule[3])
 
         return [datarequests_bp]

From 436f3dc4e839b22c8e3f66fdc73eba08c1c1fd92 Mon Sep 17 00:00:00 2001
From: antuarc <carl.antuar@smartservice.qld.gov.au>
Date: Fri, 12 Nov 2021 16:28:13 +1000
Subject: [PATCH 201/276] [QOL-7970] fix url_for args

- the url_for Jinja tag uses a named parameter 'named_route',
but helpers.url_for doesn't name it
---
 .../controllers/controller_functions.py          | 14 +++++++-------
 .../datarequests/snippets/comment_item.html      |  4 ++--
 .../datarequests/snippets/datarequest_item.html  |  4 ++--
 .../datarequests/snippets/followers.html         |  4 ++--
 ckanext/datarequests/tests/test_ui_controller.py | 16 ++++++++--------
 5 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/ckanext/datarequests/controllers/controller_functions.py b/ckanext/datarequests/controllers/controller_functions.py
index 25b2881b..7f233432 100644
--- a/ckanext/datarequests/controllers/controller_functions.py
+++ b/ckanext/datarequests/controllers/controller_functions.py
@@ -39,17 +39,17 @@ def url_with_params(url, params):
 
 
 def search_url(params):
-    url = helpers.url_for(named_route='datarequest.index')
+    url = helpers.url_for('datarequest.index')
     return url_with_params(url, params)
 
 
 def org_datarequest_url(params, id):
-    url = helpers.url_for(named_route='datarequest.organization', id=id)
+    url = helpers.url_for('datarequest.organization', id=id)
     return url_with_params(url, params)
 
 
 def user_datarequest_url(params, id):
-    url = helpers.url_for(named_route='datarequest.user', id=id)
+    url = helpers.url_for('datarequest.user', id=id)
     return url_with_params(url, params)
 
 
@@ -153,7 +153,7 @@ def _process_post(action, context):
 
         try:
             result = tk.get_action(action)(context, data_dict)
-            tk.redirect_to(helpers.url_for(named_route='datarequest.show', id=result['id']))
+            tk.redirect_to(helpers.url_for('datarequest.show', id=result['id']))
 
         except tk.ValidationError as e:
             log.warn(e)
@@ -241,7 +241,7 @@ def delete(id):
         tk.check_access(constants.DELETE_DATAREQUEST, context, data_dict)
         datarequest = tk.get_action(constants.DELETE_DATAREQUEST)(context, data_dict)
         helpers.flash_notice(tk._('Data Request %s has been deleted') % datarequest.get('title', ''))
-        tk.redirect_to(helpers.url_for(named_route='datarequest.index'))
+        tk.redirect_to(helpers.url_for('datarequest.index'))
     except tk.ObjectNotFound as e:
         log.warn(e)
         tk.abort(404, tk._('Data Request %s not found') % id)
@@ -315,7 +315,7 @@ def _return_page(errors=None, errors_summary=None):
                 data_dict['condition'] = request_helpers.get_first_post_param('condition', None)
 
             tk.get_action(constants.CLOSE_DATAREQUEST)(context, data_dict)
-            tk.redirect_to(helpers.url_for(named_route='datarequest.show', id=data_dict['id']))
+            tk.redirect_to(helpers.url_for('datarequest.show', id=data_dict['id']))
         else:   # GET
             return _return_page()
 
@@ -408,7 +408,7 @@ def delete_comment(datarequest_id, comment_id):
         tk.check_access(constants.DELETE_DATAREQUEST_COMMENT, context, data_dict)
         tk.get_action(constants.DELETE_DATAREQUEST_COMMENT)(context, data_dict)
         helpers.flash_notice(tk._('Comment has been deleted'))
-        tk.redirect_to(helpers.url_for(named_route='datarequest.comment', id=datarequest_id))
+        tk.redirect_to(helpers.url_for('datarequest.comment', id=datarequest_id))
     except tk.ObjectNotFound as e:
         log.warn(e)
         tk.abort(404, tk._('Comment %s not found') % comment_id)
diff --git a/ckanext/datarequests/templates/datarequests/snippets/comment_item.html b/ckanext/datarequests/templates/datarequests/snippets/comment_item.html
index 1f9c4942..5612e48c 100644
--- a/ckanext/datarequests/templates/datarequests/snippets/comment_item.html
+++ b/ckanext/datarequests/templates/datarequests/snippets/comment_item.html
@@ -6,7 +6,7 @@
 {% endif %}
 
 <div class="comment-wrapper">
-  <a href="{{ h.url_for(named_route='user.read', id=comment.user.get('name')) }}"
+  <a href="{% url_for named_route='user.read', id=comment.user.get('name') %}"
     class="comment-avatar">
     {{ h.gravatar(comment.user.get('email_hash'), 48) }}
   </a>
@@ -25,7 +25,7 @@
           </div>
         {% endif %}
         <div class="comment-header-text">
-          <a href="{{ h.url_for(named_route='user.read', id=comment.user.get('name')) }}" class="author">{{ comment.user.get('display_name') }}</a>
+          <a href="{% url_for named_route='user.read', id=comment.user.get('name') %}" class="author">{{ comment.user.get('display_name') }}</a>
           {% trans %}commented{% endtrans %}
           <span title="{{comment.time}}">{{ h.time_ago_from_timestamp(comment.time).lower() }}</span>
         </div>
diff --git a/ckanext/datarequests/templates/datarequests/snippets/datarequest_item.html b/ckanext/datarequests/templates/datarequests/snippets/datarequest_item.html
index 80788d12..7e12e456 100644
--- a/ckanext/datarequests/templates/datarequests/snippets/datarequest_item.html
+++ b/ckanext/datarequests/templates/datarequests/snippets/datarequest_item.html
@@ -16,14 +16,14 @@ <h3 class="dataset-heading">
             <i class="icon-unlock fa fa-unlock"></i> {% trans %}Open{% endtrans %}
           </span>
         {% endif %}
-        {{ h.link_to(h.truncate(title, truncate_title), h.url_for(named_route='datarequest.show', id=datarequest.get('id', ''))) }}
+        {{ h.link_to(h.truncate(title, truncate_title), h.url_for('datarequest.show', id=datarequest.get('id', ''))) }}
       </h3>
       {% if description %}
         <div>{{ description }}</div>
       {% endif %}
       <div class="datarequest-properties">
         {% if h.show_comments_tab() %}
-          <a href="{{ h.url_for(named_route='datarequest.comment', id=datarequest.get('id','')) }}" class="label label-default"><i class="icon-comment fa fa-comment"></i> {{ h.get_comments_number(datarequest.get('id', '')) }}</span></a>
+          <a href="{% url_for named_route='datarequest.comment', id=datarequest.get('id','') %}" class="label label-default"><i class="icon-comment fa fa-comment"></i> {{ h.get_comments_number(datarequest.get('id', '')) }}</span></a>
         {% endif %}
         <div class="divider"/>
         <span class="date-datarequests">{{ h.time_ago_from_timestamp(datarequest.open_time) }}</span>
diff --git a/ckanext/datarequests/templates/datarequests/snippets/followers.html b/ckanext/datarequests/templates/datarequests/snippets/followers.html
index a2dbd666..aa56352e 100644
--- a/ckanext/datarequests/templates/datarequests/snippets/followers.html
+++ b/ckanext/datarequests/templates/datarequests/snippets/followers.html
@@ -17,12 +17,12 @@ <h1 class="heading">{{ datarequest.get('title') }}</h1>
           <div class="follow_button">
             {% if h.check_access('follow_datarequest') %}
               {% if h.is_following_datarequest(datarequest.id) %}
-                <a href="{{ h.url_for(named_route='datarequest.unfollow', id=datarequest.id) }}" class="{% block following_class %}btn btn-danger{% endblock %}" data-module="follow" data-module-type="datarequest" data-module-id="{{ datarequest.id }}" data-module-action="unfollow">
+                <a href="{% url_for named_route='datarequest.unfollow', id=datarequest.id %}" class="{% block following_class %}btn btn-danger{% endblock %}" data-module="follow" data-module-type="datarequest" data-module-id="{{ datarequest.id }}" data-module-action="unfollow">
                   <i class="fa fa-times-circle icon-remove-sign"></i>
                   {{ _('Unfollow') }}
                 </a>
               {% else %}
-                <a href="{{ h.url_for(named_route='datarequest.follow', id=datarequest.id) }}" class="{% block unfollowing_class %}btn btn-success{% endblock %}" data-module="follow" data-module-type="datarequest" data-module-id="{{ datarequest.id }}" data-module-action="follow">
+                <a href="{% url_for named_route='datarequest.follow', id=datarequest.id %}" class="{% block unfollowing_class %}btn btn-success{% endblock %}" data-module="follow" data-module-type="datarequest" data-module-id="{{ datarequest.id }}" data-module-action="follow">
                   <i class="fa fa-plus-circle icon-plus-sign"></i>
                   {{ _('Follow') }}
                 </a>
diff --git a/ckanext/datarequests/tests/test_ui_controller.py b/ckanext/datarequests/tests/test_ui_controller.py
index 5cb63530..1a7d016b 100644
--- a/ckanext/datarequests/tests/test_ui_controller.py
+++ b/ckanext/datarequests/tests/test_ui_controller.py
@@ -212,7 +212,7 @@ def test_new_post_content(self, authorized, validation_error):
                 self.assertEquals({}, controller.c.errors_summary)
                 self.assertEquals({}, controller.c.datarequest)
                 controller.helpers.url_for.assert_called_once_with(
-                    named_route='datarequest.show', id=datarequest_id)
+                    'datarequest.show', id=datarequest_id)
                 controller.tk.redirect_to.assert_called_once_with(controller.helpers.url_for.return_value)
         else:
             controller.tk.abort.assert_called_once_with(403, 'Unauthorized to create a Data Request')
@@ -422,7 +422,7 @@ def _get_action(action):
                 self.assertEquals({}, controller.c.errors_summary)
                 self.assertEquals(original_dr, controller.c.datarequest)
                 controller.helpers.url_for.assert_called_once_with(
-                    named_route='datarequest.show', id=datarequest_id)
+                    'datarequest.show', id=datarequest_id)
                 controller.tk.redirect_to.assert_called_once_with(controller.helpers.url_for.return_value)
         else:
             controller.tk.abort.assert_called_once_with(403, 'You are not authorized to update the Data Request %s' % datarequest_id)
@@ -607,13 +607,13 @@ def _get_action(action):
         # When URL function is called, helpers.url_for is called to get the final URL
         if func == INDEX_FUNCTION:
             controller.helpers.url_for.assert_called_once_with(
-                named_route='datarequest.index')
+                'datarequest.index')
         elif func == ORGANIZATION_DATAREQUESTS_FUNCTION:
             controller.helpers.url_for.assert_called_once_with(
-                named_route='datarequest.organization', id=organization)
+                'datarequest.organization', id=organization)
         elif func == USER_DATAREQUESTS_FUNCTION:
             controller.helpers.url_for.assert_called_once_with(
-                named_route='datarequest.user', id=user)
+                'datarequest.user', id=user)
 
         # Check the facets
         expected_facet_titles = {}
@@ -665,7 +665,7 @@ def test_delete(self):
 
         # Redirection
         controller.helpers.url_for.assert_called_once_with(
-            named_route='datarequest.index')
+            'datarequest.index')
         controller.tk.redirect_to.assert_called_once_with(controller.helpers.url_for.return_value)
 
     ######################################################################
@@ -763,7 +763,7 @@ def _get_action(action):
 
         # Checks
         controller.helpers.url_for.assert_called_once_with(
-            named_route='datarequest.show', id=datarequest_id)
+            'datarequest.show', id=datarequest_id)
         controller.tk.redirect_to.assert_called_once_with(controller.helpers.url_for.return_value)
         self.assertIsNone(result)
 
@@ -974,7 +974,7 @@ def test_delete_comment(self):
 
         # Check redirection
         controller.helpers.url_for.assert_called_once_with(
-            named_route='datarequest.comment', id=datarequest_id)
+            'datarequest.comment', id=datarequest_id)
         controller.tk.redirect_to.assert_called_once_with(controller.helpers.url_for.return_value)
 
     ######################################################################

From de132ccb299c334f59da4c3ef1c84a536fc11950 Mon Sep 17 00:00:00 2001
From: antuarc <carl.antuar@smartservice.qld.gov.au>
Date: Fri, 12 Nov 2021 16:41:44 +1000
Subject: [PATCH 202/276] [QOL-7970] oops url_for tag doesn't name its
 parameter either

---
 .../templates/datarequests/snippets/comment_item.html       | 6 +++---
 .../templates/datarequests/snippets/datarequest_form.html   | 2 +-
 .../templates/datarequests/snippets/datarequest_item.html   | 2 +-
 .../templates/datarequests/snippets/followers.html          | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ckanext/datarequests/templates/datarequests/snippets/comment_item.html b/ckanext/datarequests/templates/datarequests/snippets/comment_item.html
index 5612e48c..f0aba590 100644
--- a/ckanext/datarequests/templates/datarequests/snippets/comment_item.html
+++ b/ckanext/datarequests/templates/datarequests/snippets/comment_item.html
@@ -6,7 +6,7 @@
 {% endif %}
 
 <div class="comment-wrapper">
-  <a href="{% url_for named_route='user.read', id=comment.user.get('name') %}"
+  <a href="{% url_for 'user.read', id=comment.user.get('name') %}"
     class="comment-avatar">
     {{ h.gravatar(comment.user.get('email_hash'), 48) }}
   </a>
@@ -16,7 +16,7 @@
         {% if h.check_access('delete_datarequest_comment', {'id':comment.id }) %}
           <div class="comment-action">
             {% set locale = h.dump_json({'content': _('Are you sure you want to delete this comment?')}) %}
-            <a class="subtle-btn" id="delete-comment-{{ comment.id }}" href="{% url_for named_route='datarequest.delete_comment', datarequest_id=datarequest.id, comment_id=comment.id %}" data-module="confirm-action" data-module-i18n="{{ locale }}"><i class="icon-remove fa fa-times"></i></a>
+            <a class="subtle-btn" id="delete-comment-{{ comment.id }}" href="{% url_for 'datarequest.delete_comment', datarequest_id=datarequest.id, comment_id=comment.id %}" data-module="confirm-action" data-module-i18n="{{ locale }}"><i class="icon-remove fa fa-times"></i></a>
           </div>
         {% endif %}
         {% if can_update %}
@@ -25,7 +25,7 @@
           </div>
         {% endif %}
         <div class="comment-header-text">
-          <a href="{% url_for named_route='user.read', id=comment.user.get('name') %}" class="author">{{ comment.user.get('display_name') }}</a>
+          <a href="{% url_for 'user.read', id=comment.user.get('name') %}" class="author">{{ comment.user.get('display_name') }}</a>
           {% trans %}commented{% endtrans %}
           <span title="{{comment.time}}">{{ h.time_ago_from_timestamp(comment.time).lower() }}</span>
         </div>
diff --git a/ckanext/datarequests/templates/datarequests/snippets/datarequest_form.html b/ckanext/datarequests/templates/datarequests/snippets/datarequest_form.html
index 590f0eec..3aaaa52c 100644
--- a/ckanext/datarequests/templates/datarequests/snippets/datarequest_form.html
+++ b/ckanext/datarequests/templates/datarequests/snippets/datarequest_form.html
@@ -45,7 +45,7 @@
       {% block delete_button %}
         {% if h.check_access('delete_datarequest', {'id': data.get('id', '')}) and not data.state == 'deleted' %}
           {% set locale = h.dump_json({'content': _('Are you sure you want to delete this data request?')}) %}
-          <a class="btn btn-danger pull-left" href="{% url_for named_route='datarequest.delete', id=data.get('id') %}" data-module="confirm-action" data-module-i18n="{{ locale }}">{% block delete_button_text %}{{ _('Delete') }}{% endblock %}</a>
+          <a class="btn btn-danger pull-left" href="{% url_for 'datarequest.delete', id=data.get('id') %}" data-module="confirm-action" data-module-i18n="{{ locale }}">{% block delete_button_text %}{{ _('Delete') }}{% endblock %}</a>
         {% endif %}
       {% endblock %}
       <button class="btn btn-primary" type="submit" name="save">{% block save_button_text %}{{ _('Create Data Request') }}{% endblock %}</button>
diff --git a/ckanext/datarequests/templates/datarequests/snippets/datarequest_item.html b/ckanext/datarequests/templates/datarequests/snippets/datarequest_item.html
index 7e12e456..7cb6c33f 100644
--- a/ckanext/datarequests/templates/datarequests/snippets/datarequest_item.html
+++ b/ckanext/datarequests/templates/datarequests/snippets/datarequest_item.html
@@ -23,7 +23,7 @@ <h3 class="dataset-heading">
       {% endif %}
       <div class="datarequest-properties">
         {% if h.show_comments_tab() %}
-          <a href="{% url_for named_route='datarequest.comment', id=datarequest.get('id','') %}" class="label label-default"><i class="icon-comment fa fa-comment"></i> {{ h.get_comments_number(datarequest.get('id', '')) }}</span></a>
+          <a href="{% url_for 'datarequest.comment', id=datarequest.get('id','') %}" class="label label-default"><i class="icon-comment fa fa-comment"></i> {{ h.get_comments_number(datarequest.get('id', '')) }}</span></a>
         {% endif %}
         <div class="divider"/>
         <span class="date-datarequests">{{ h.time_ago_from_timestamp(datarequest.open_time) }}</span>
diff --git a/ckanext/datarequests/templates/datarequests/snippets/followers.html b/ckanext/datarequests/templates/datarequests/snippets/followers.html
index aa56352e..02e16fa0 100644
--- a/ckanext/datarequests/templates/datarequests/snippets/followers.html
+++ b/ckanext/datarequests/templates/datarequests/snippets/followers.html
@@ -17,12 +17,12 @@ <h1 class="heading">{{ datarequest.get('title') }}</h1>
           <div class="follow_button">
             {% if h.check_access('follow_datarequest') %}
               {% if h.is_following_datarequest(datarequest.id) %}
-                <a href="{% url_for named_route='datarequest.unfollow', id=datarequest.id %}" class="{% block following_class %}btn btn-danger{% endblock %}" data-module="follow" data-module-type="datarequest" data-module-id="{{ datarequest.id }}" data-module-action="unfollow">
+                <a href="{% url_for 'datarequest.unfollow', id=datarequest.id %}" class="{% block following_class %}btn btn-danger{% endblock %}" data-module="follow" data-module-type="datarequest" data-module-id="{{ datarequest.id }}" data-module-action="unfollow">
                   <i class="fa fa-times-circle icon-remove-sign"></i>
                   {{ _('Unfollow') }}
                 </a>
               {% else %}
-                <a href="{% url_for named_route='datarequest.follow', id=datarequest.id %}" class="{% block unfollowing_class %}btn btn-success{% endblock %}" data-module="follow" data-module-type="datarequest" data-module-id="{{ datarequest.id }}" data-module-action="follow">
+                <a href="{% url_for 'datarequest.follow', id=datarequest.id %}" class="{% block unfollowing_class %}btn btn-success{% endblock %}" data-module="follow" data-module-type="datarequest" data-module-id="{{ datarequest.id }}" data-module-action="follow">
                   <i class="fa fa-plus-circle icon-plus-sign"></i>
                   {{ _('Follow') }}
                 </a>

From 0955b4103cee2acece9b001b1cf22f490a54b284 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Mon, 15 Nov 2021 11:25:46 +1000
Subject: [PATCH 203/276] [QOL-7970] fix data request routing

- adapt paths to Pylons or Flask according to CKAN version
- add icons when creating Flask nav entries
---
 ckanext/datarequests/plugin/__init__.py        |  1 +
 .../templates/datarequests/show.html           |  4 ++--
 .../templates/organization/read_base.html      | 18 ++++++++++++++----
 .../datarequests/templates/user/read_base.html |  2 +-
 4 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/ckanext/datarequests/plugin/__init__.py b/ckanext/datarequests/plugin/__init__.py
index a662468e..c6f0e1d9 100644
--- a/ckanext/datarequests/plugin/__init__.py
+++ b/ckanext/datarequests/plugin/__init__.py
@@ -139,6 +139,7 @@ def get_helpers(self):
             'get_open_datarequests_number': helpers.get_open_datarequests_number,
             'get_open_datarequests_badge': partial(helpers.get_open_datarequests_badge, self._show_datarequests_badge),
             'get_plus_icon': common.get_plus_icon,
+            'get_question_icon': common.get_question_icon,
             'is_following_datarequest': helpers.is_following_datarequest,
             'is_description_required': self.is_description_required,
             'closing_circumstances_enabled': self.closing_circumstances_enabled,
diff --git a/ckanext/datarequests/templates/datarequests/show.html b/ckanext/datarequests/templates/datarequests/show.html
index 7d0d8192..0c3d9db9 100644
--- a/ckanext/datarequests/templates/datarequests/show.html
+++ b/ckanext/datarequests/templates/datarequests/show.html
@@ -22,10 +22,10 @@
 {% endblock %}
 
 {% block content_primary_nav %}
-  {{ h.build_nav_icon('show_datarequest', _('Data Request'), id=datarequest_id) }}
+  {{ h.build_nav_icon('datarequest.show', _('Data Request'), id=datarequest_id, icon=h.get_question_icon()) }}
 
   {% if h.show_comments_tab() %}
-    {{ h.build_nav_icon('comment_datarequest', _('Comments') + ' ' + h.get_comments_badge(datarequest_id), id=datarequest_id) }}
+    {{ h.build_nav_icon('datarequest.comment', _('Comments') + ' ' + h.get_comments_badge(datarequest_id), id=datarequest_id, icon='comment') }}
   {% endif %}
 {% endblock %}
 
diff --git a/ckanext/datarequests/templates/organization/read_base.html b/ckanext/datarequests/templates/organization/read_base.html
index 88fac90a..858537a2 100644
--- a/ckanext/datarequests/templates/organization/read_base.html
+++ b/ckanext/datarequests/templates/organization/read_base.html
@@ -1,8 +1,18 @@
 {% ckan_extends %}
 
 {% block content_primary_nav %}
-  {{ h.build_nav_icon('organization_read', _('Datasets'), id=c.group_dict.name) }}
-  {{ h.build_nav_icon('organization_activity', _('Activity Stream'), id=c.group_dict.name, offset=0) }}
-  {{ h.build_nav_icon('organization_datarequests', _('Data Requests'), id=c.group_dict.name)}}
-  {{ h.build_nav_icon('organization_about', _('About'), id=c.group_dict.name) }}
+  {% if h.ckan_version()[:3] <= '2.7' %}
+    {% set org_datasets_nav = 'organization_datasets' %}
+    {% set org_activity_nav = 'organization_activity' %}
+    {% set org_about_nav = 'organization_about' %}
+  {% else %}
+    {% set org_datasets_nav = 'organization.read' %}
+    {% set org_activity_nav = 'organization.activity' %}
+    {% set org_about_nav = 'organization.about' %}
+  {% endif %}
+
+  {{ h.build_nav_icon(org_datasets_nav, _('Datasets'), id=c.group_dict.name) }}
+  {{ h.build_nav_icon(org_activity_nav, _('Activity Stream'), id=c.group_dict.name, offset=0) }}
+  {{ h.build_nav_icon('datarequest.organization', _('Data Requests'), id=c.group_dict.name, icon=h.get_question_icon())}}
+  {{ h.build_nav_icon(org_about_nav, _('About'), id=c.group_dict.name) }}
 {% endblock %}
diff --git a/ckanext/datarequests/templates/user/read_base.html b/ckanext/datarequests/templates/user/read_base.html
index 6fee95a8..85d8da9c 100644
--- a/ckanext/datarequests/templates/user/read_base.html
+++ b/ckanext/datarequests/templates/user/read_base.html
@@ -6,5 +6,5 @@
 
   {{ h.build_nav_icon(user_datasets_nav, _('Datasets'), id=user.name) }}
   {{ h.build_nav_icon(user_activity_nav, _('Activity Stream'), id=user.name) }}
-  {{ h.build_nav_icon('user_datarequests', _('Data Requests'), id=user.name) }}
+  {{ h.build_nav_icon('datarequest.user', _('Data Requests'), id=user.name, icon=h.get_question_icon()) }}
 {% endblock %}

From 9658662a01f33b85c7b97572164a9286d2b4e14b Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Mon, 15 Nov 2021 11:50:00 +1000
Subject: [PATCH 204/276] [QOL-7970] fix None case

---
 .../templates/datarequests/snippets/comment_item.html           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ckanext/datarequests/templates/datarequests/snippets/comment_item.html b/ckanext/datarequests/templates/datarequests/snippets/comment_item.html
index f0aba590..f80b220a 100644
--- a/ckanext/datarequests/templates/datarequests/snippets/comment_item.html
+++ b/ckanext/datarequests/templates/datarequests/snippets/comment_item.html
@@ -1,4 +1,4 @@
-{% set focus = updated_comment is not none and updated_comment.id == comment.id %}
+{% set focus = updated_comment is not None and updated_comment.id == comment.id %}
 {% set can_update = h.check_access('update_datarequest_comment', {'id':comment.id }) %}
 
 {% if focus %}

From 386384cdbe136cd126e4579d097bf942bade0fa0 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Mon, 15 Nov 2021 11:54:11 +1000
Subject: [PATCH 205/276] [QOL-7970] quote test field name

---
 test/features/steps/steps.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/features/steps/steps.py b/test/features/steps/steps.py
index a2437d2e..945cbae5 100644
--- a/test/features/steps/steps.py
+++ b/test/features/steps/steps.py
@@ -170,7 +170,7 @@ def log_in_create_a_datarequest(context):
     context.execute_steps(u"""
         When I log in and go to datarequest page
         And I click the link with text that contains "Add Data Request"
-        And I fill in title with random text
+        And I fill in "title" with random text
         And I fill in "description" with "Test description"
         And I press the element with xpath "//button[contains(string(), 'Create Data Request')]"
     """)

From 4f310f20d110298c107a78653d752a4913bcbd4d Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Mon, 15 Nov 2021 12:07:43 +1000
Subject: [PATCH 206/276] [QOL-7970] oops revert quoting as it's a fixed step
 name

---
 test/features/steps/steps.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/features/steps/steps.py b/test/features/steps/steps.py
index 945cbae5..a2437d2e 100644
--- a/test/features/steps/steps.py
+++ b/test/features/steps/steps.py
@@ -170,7 +170,7 @@ def log_in_create_a_datarequest(context):
     context.execute_steps(u"""
         When I log in and go to datarequest page
         And I click the link with text that contains "Add Data Request"
-        And I fill in "title" with random text
+        And I fill in title with random text
         And I fill in "description" with "Test description"
         And I press the element with xpath "//button[contains(string(), 'Create Data Request')]"
     """)

From 99d47192cb8fa4ed5fa3005542fd038e07426388 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Mon, 15 Nov 2021 12:23:37 +1000
Subject: [PATCH 207/276] [QOL-7970] oops revert none test

- it's a Jinja test, not the Python None object
---
 .../templates/datarequests/snippets/comment_item.html           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ckanext/datarequests/templates/datarequests/snippets/comment_item.html b/ckanext/datarequests/templates/datarequests/snippets/comment_item.html
index f80b220a..f0aba590 100644
--- a/ckanext/datarequests/templates/datarequests/snippets/comment_item.html
+++ b/ckanext/datarequests/templates/datarequests/snippets/comment_item.html
@@ -1,4 +1,4 @@
-{% set focus = updated_comment is not None and updated_comment.id == comment.id %}
+{% set focus = updated_comment is not none and updated_comment.id == comment.id %}
 {% set can_update = h.check_access('update_datarequest_comment', {'id':comment.id }) %}
 
 {% if focus %}

From e807595083e6c2f4d3f2b7d48943fae6825d53d2 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Mon, 15 Nov 2021 12:23:55 +1000
Subject: [PATCH 208/276] [QOL-7970] add mock SMTP server to silence errors

---
 .docker/scripts/serve.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.docker/scripts/serve.sh b/.docker/scripts/serve.sh
index 10f3dead..2c18729e 100755
--- a/.docker/scripts/serve.sh
+++ b/.docker/scripts/serve.sh
@@ -7,6 +7,8 @@ dockerize -wait tcp://redis:6379 -timeout 1m
 
 sed -i "s@SITE_URL@${SITE_URL}@g" $CKAN_INI
 
+python -m smtpd -n -c DebuggingServer localhost:8025 &
+
 if [ "$VENV_DIR" != "" ]; then
   . ${VENV_DIR}/bin/activate
 fi

From 32aa135d4513704a0878f6b40ba0d3c4b66755f6 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Mon, 15 Nov 2021 13:01:43 +1000
Subject: [PATCH 209/276] [QOL-7970] drop mock SMTP server as it clashes with
 mailmock

---
 .docker/scripts/serve.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.docker/scripts/serve.sh b/.docker/scripts/serve.sh
index 2c18729e..10f3dead 100755
--- a/.docker/scripts/serve.sh
+++ b/.docker/scripts/serve.sh
@@ -7,8 +7,6 @@ dockerize -wait tcp://redis:6379 -timeout 1m
 
 sed -i "s@SITE_URL@${SITE_URL}@g" $CKAN_INI
 
-python -m smtpd -n -c DebuggingServer localhost:8025 &
-
 if [ "$VENV_DIR" != "" ]; then
   . ${VENV_DIR}/bin/activate
 fi

From 32cc4bc594f2d81b6e3fab62ff177195011f19df Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Mon, 15 Nov 2021 13:03:54 +1000
Subject: [PATCH 210/276] [QOL-7970] use parentheses to fix expression order

---
 .../templates/datarequests/snippets/comment_item.html           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ckanext/datarequests/templates/datarequests/snippets/comment_item.html b/ckanext/datarequests/templates/datarequests/snippets/comment_item.html
index f0aba590..26085a2b 100644
--- a/ckanext/datarequests/templates/datarequests/snippets/comment_item.html
+++ b/ckanext/datarequests/templates/datarequests/snippets/comment_item.html
@@ -1,4 +1,4 @@
-{% set focus = updated_comment is not none and updated_comment.id == comment.id %}
+{% set focus = (updated_comment is not none and updated_comment.id == comment.id) %}
 {% set can_update = h.check_access('update_datarequest_comment', {'id':comment.id }) %}
 
 {% if focus %}

From 028d03fa2e6812dd4a0632cd160fc392b5d8b114 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Mon, 15 Nov 2021 13:56:01 +1000
Subject: [PATCH 211/276] [QOL-7970] verify comment attribute before showing

---
 .../templates/datarequests/snippets/comment_item.html           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ckanext/datarequests/templates/datarequests/snippets/comment_item.html b/ckanext/datarequests/templates/datarequests/snippets/comment_item.html
index 26085a2b..36cff8d8 100644
--- a/ckanext/datarequests/templates/datarequests/snippets/comment_item.html
+++ b/ckanext/datarequests/templates/datarequests/snippets/comment_item.html
@@ -1,4 +1,4 @@
-{% set focus = (updated_comment is not none and updated_comment.id == comment.id) %}
+{% set focus = (updated_comment is not none and 'id' in dir(updated_comment) and updated_comment.id == comment.id) %}
 {% set can_update = h.check_access('update_datarequest_comment', {'id':comment.id }) %}
 
 {% if focus %}

From 768a705f1923250ad29356c5b7fecfcc0def4d53 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Mon, 15 Nov 2021 14:42:31 +1000
Subject: [PATCH 212/276] [QOL-7970] adjust comment handling

- ensure we unwrap it from the Werkzeug LocalProxy so we can properly test for attribute presence
---
 .../datarequests/controllers/controller_functions.py   | 10 ++++++----
 .../templates/datarequests/snippets/comment_item.html  |  2 +-
 ckanext/datarequests/tests/test_ui_controller.py       |  9 +++++----
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/ckanext/datarequests/controllers/controller_functions.py b/ckanext/datarequests/controllers/controller_functions.py
index 7f233432..a18bc123 100644
--- a/ckanext/datarequests/controllers/controller_functions.py
+++ b/ckanext/datarequests/controllers/controller_functions.py
@@ -344,6 +344,7 @@ def comment(id):
 
         comment_text = request_helpers.get_first_post_param('comment', '')
         comment_id = request_helpers.get_first_post_param('comment-id', '')
+        updated_comment = None
 
         if request_helpers.get_post_params():
             action = constants.COMMENT_DATAREQUEST
@@ -377,14 +378,15 @@ def comment(id):
             # Other exceptions are not expected. Otherwise, the request will fail.
 
             # This is required to scroll the user to the appropriate comment
-            if 'updated_comment' in locals():
-                c.updated_comment = updated_comment
-            else:
-                c.updated_comment = {
+            if not updated_comment:
+                updated_comment = {
                     'id': comment_id,
                     'comment': comment_text
                 }
 
+        c.updated_comment = {
+            'comment': updated_comment
+        }
         # Comments should be retrieved once that the comment has been created
         get_comments_data_dict = {'datarequest_id': id}
         c.comments = tk.get_action(constants.LIST_DATAREQUEST_COMMENTS)(context, get_comments_data_dict)
diff --git a/ckanext/datarequests/templates/datarequests/snippets/comment_item.html b/ckanext/datarequests/templates/datarequests/snippets/comment_item.html
index 36cff8d8..cc3a7e5b 100644
--- a/ckanext/datarequests/templates/datarequests/snippets/comment_item.html
+++ b/ckanext/datarequests/templates/datarequests/snippets/comment_item.html
@@ -1,4 +1,4 @@
-{% set focus = (updated_comment is not none and 'id' in dir(updated_comment) and updated_comment.id == comment.id) %}
+{% set focus = (updated_comment and updated_comment.comment and updated_comment.comment.id == comment.id) %}
 {% set can_update = h.check_access('update_datarequest_comment', {'id':comment.id }) %}
 
 {% if focus %}
diff --git a/ckanext/datarequests/tests/test_ui_controller.py b/ckanext/datarequests/tests/test_ui_controller.py
index 1a7d016b..2d0cc340 100644
--- a/ckanext/datarequests/tests/test_ui_controller.py
+++ b/ckanext/datarequests/tests/test_ui_controller.py
@@ -917,16 +917,17 @@ def _get_action(action):
 
         if new_comment or update_comment:
 
-            # self.assertEquals(comment, controller.c.updated_comment['comment'])
+            # self.assertEquals(comment, controller.c.updated_comment.comment['comment'])
 
+            updated_comment_id = controller.c.updated_comment.comment['id']
             if new_comment:
                 if comment_or_update_exception:
-                    self.assertEquals('', controller.c.updated_comment['id'])
+                    self.assertEquals('', updated_comment_id)
                 else:
-                    self.assertEquals(new_comment_id, controller.c.updated_comment['id'])
+                    self.assertEquals(new_comment_id, updated_comment_id)
 
             if update_comment:
-                self.assertEquals(comment_id, controller.c.updated_comment['id'])
+                self.assertEquals(comment_id, updated_comment_id)
 
     ######################################################################
     ########################### DELETE COMMENT ###########################

From f0047134c887f22ee724ec2988eb43835a31d487 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Mon, 15 Nov 2021 14:51:34 +1000
Subject: [PATCH 213/276] [QOL-7970] oops use dict syntax not attribute

---
 .../templates/datarequests/snippets/comment_item.html           | 2 +-
 ckanext/datarequests/tests/test_ui_controller.py                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ckanext/datarequests/templates/datarequests/snippets/comment_item.html b/ckanext/datarequests/templates/datarequests/snippets/comment_item.html
index cc3a7e5b..6ed549b1 100644
--- a/ckanext/datarequests/templates/datarequests/snippets/comment_item.html
+++ b/ckanext/datarequests/templates/datarequests/snippets/comment_item.html
@@ -1,4 +1,4 @@
-{% set focus = (updated_comment and updated_comment.comment and updated_comment.comment.id == comment.id) %}
+{% set focus = (updated_comment and updated_comment['comment'] and updated_comment['comment'].id == comment.id) %}
 {% set can_update = h.check_access('update_datarequest_comment', {'id':comment.id }) %}
 
 {% if focus %}
diff --git a/ckanext/datarequests/tests/test_ui_controller.py b/ckanext/datarequests/tests/test_ui_controller.py
index 2d0cc340..1411535f 100644
--- a/ckanext/datarequests/tests/test_ui_controller.py
+++ b/ckanext/datarequests/tests/test_ui_controller.py
@@ -919,7 +919,7 @@ def _get_action(action):
 
             # self.assertEquals(comment, controller.c.updated_comment.comment['comment'])
 
-            updated_comment_id = controller.c.updated_comment.comment['id']
+            updated_comment_id = controller.c.updated_comment['comment']['id']
             if new_comment:
                 if comment_or_update_exception:
                     self.assertEquals('', updated_comment_id)

From c046e018f8a34869f36ba6cc8b555aeb9155f7a5 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Mon, 15 Nov 2021 15:14:04 +1000
Subject: [PATCH 214/276] [QOL-7970] debug view rendering

---
 ckanext/datarequests/controllers/controller_functions.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ckanext/datarequests/controllers/controller_functions.py b/ckanext/datarequests/controllers/controller_functions.py
index a18bc123..c51cbbe6 100644
--- a/ckanext/datarequests/controllers/controller_functions.py
+++ b/ckanext/datarequests/controllers/controller_functions.py
@@ -391,7 +391,9 @@ def comment(id):
         get_comments_data_dict = {'datarequest_id': id}
         c.comments = tk.get_action(constants.LIST_DATAREQUEST_COMMENTS)(context, get_comments_data_dict)
 
-        return tk.render('datarequests/comment.html')
+        rendered_view = tk.render('datarequests/comment.html')
+        log.debug("Returning comment view: %s", rendered_view)
+        return rendered_view
 
     except tk.ObjectNotFound as e:
         log.warn(e)

From d8009cafb6c755118dcac492cd69a69dfd3c5e85 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Mon, 15 Nov 2021 15:34:27 +1000
Subject: [PATCH 215/276] [QOL-7970] return redirects as views

---
 .../datarequests/controllers/controller_functions.py   | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/ckanext/datarequests/controllers/controller_functions.py b/ckanext/datarequests/controllers/controller_functions.py
index c51cbbe6..9f289786 100644
--- a/ckanext/datarequests/controllers/controller_functions.py
+++ b/ckanext/datarequests/controllers/controller_functions.py
@@ -241,7 +241,7 @@ def delete(id):
         tk.check_access(constants.DELETE_DATAREQUEST, context, data_dict)
         datarequest = tk.get_action(constants.DELETE_DATAREQUEST)(context, data_dict)
         helpers.flash_notice(tk._('Data Request %s has been deleted') % datarequest.get('title', ''))
-        tk.redirect_to(helpers.url_for('datarequest.index'))
+        return tk.redirect_to(helpers.url_for('datarequest.index'))
     except tk.ObjectNotFound as e:
         log.warn(e)
         tk.abort(404, tk._('Data Request %s not found') % id)
@@ -315,7 +315,7 @@ def _return_page(errors=None, errors_summary=None):
                 data_dict['condition'] = request_helpers.get_first_post_param('condition', None)
 
             tk.get_action(constants.CLOSE_DATAREQUEST)(context, data_dict)
-            tk.redirect_to(helpers.url_for('datarequest.show', id=data_dict['id']))
+            return tk.redirect_to(helpers.url_for('datarequest.show', id=data_dict['id']))
         else:   # GET
             return _return_page()
 
@@ -391,9 +391,7 @@ def comment(id):
         get_comments_data_dict = {'datarequest_id': id}
         c.comments = tk.get_action(constants.LIST_DATAREQUEST_COMMENTS)(context, get_comments_data_dict)
 
-        rendered_view = tk.render('datarequests/comment.html')
-        log.debug("Returning comment view: %s", rendered_view)
-        return rendered_view
+        return tk.render('datarequests/comment.html')
 
     except tk.ObjectNotFound as e:
         log.warn(e)
@@ -412,7 +410,7 @@ def delete_comment(datarequest_id, comment_id):
         tk.check_access(constants.DELETE_DATAREQUEST_COMMENT, context, data_dict)
         tk.get_action(constants.DELETE_DATAREQUEST_COMMENT)(context, data_dict)
         helpers.flash_notice(tk._('Comment has been deleted'))
-        tk.redirect_to(helpers.url_for('datarequest.comment', id=datarequest_id))
+        return tk.redirect_to(helpers.url_for('datarequest.comment', id=datarequest_id))
     except tk.ObjectNotFound as e:
         log.warn(e)
         tk.abort(404, tk._('Comment %s not found') % comment_id)

From ce4a15b180e1239f1a9393a6766389b2c78d129d Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Mon, 15 Nov 2021 15:46:18 +1000
Subject: [PATCH 216/276] [QOL-7970] fix assertions on redirect values

---
 ckanext/datarequests/tests/test_ui_controller.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ckanext/datarequests/tests/test_ui_controller.py b/ckanext/datarequests/tests/test_ui_controller.py
index 1411535f..514798d3 100644
--- a/ckanext/datarequests/tests/test_ui_controller.py
+++ b/ckanext/datarequests/tests/test_ui_controller.py
@@ -654,7 +654,7 @@ def test_delete(self):
 
         # Assertions
         # The result
-        self.assertIsNone(result)
+        self.assertIsNotNone(result)
 
         # Functions has been called
         expected_data_dict = {'id': datarequest_id}
@@ -765,7 +765,7 @@ def _get_action(action):
         controller.helpers.url_for.assert_called_once_with(
             'datarequest.show', id=datarequest_id)
         controller.tk.redirect_to.assert_called_once_with(controller.helpers.url_for.return_value)
-        self.assertIsNone(result)
+        self.assertIsNotNone(result)
 
     @parameterized.expand([
         (None,),

From 8ef2d9c4dbf6a87faf7ed947a3a9753d9ab26020 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Tue, 16 Nov 2021 15:55:28 +1000
Subject: [PATCH 217/276] [QOL-7970] fix Flask redirect on create

- The redirect needs to be returned to Flask as a view, it won't interrupt other processing
as it did on Pylons
---
 ckanext/datarequests/controllers/controller_functions.py | 9 +++------
 ckanext/datarequests/tests/test_ui_controller.py         | 4 ++--
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/ckanext/datarequests/controllers/controller_functions.py b/ckanext/datarequests/controllers/controller_functions.py
index 9f289786..4a00afe8 100644
--- a/ckanext/datarequests/controllers/controller_functions.py
+++ b/ckanext/datarequests/controllers/controller_functions.py
@@ -153,7 +153,7 @@ def _process_post(action, context):
 
         try:
             result = tk.get_action(action)(context, data_dict)
-            tk.redirect_to(helpers.url_for('datarequest.show', id=result['id']))
+            return tk.redirect_to(helpers.url_for('datarequest.show', id=result['id']))
 
         except tk.ValidationError as e:
             log.warn(e)
@@ -179,11 +179,8 @@ def new():
     # Check access
     try:
         tk.check_access(constants.CREATE_DATAREQUEST, context, None)
-        _process_post(constants.CREATE_DATAREQUEST, context)
-
-        # The form is always rendered
-        return tk.render('datarequests/new.html')
-
+        post_result = _process_post(constants.CREATE_DATAREQUEST, context)
+        return post_result or tk.render('datarequests/new.html')
     except tk.NotAuthorized as e:
         log.warn(e)
         tk.abort(403, tk._('Unauthorized to create a Data Request'))
diff --git a/ckanext/datarequests/tests/test_ui_controller.py b/ckanext/datarequests/tests/test_ui_controller.py
index 514798d3..859cd8b5 100644
--- a/ckanext/datarequests/tests/test_ui_controller.py
+++ b/ckanext/datarequests/tests/test_ui_controller.py
@@ -192,8 +192,8 @@ def test_new_post_content(self, authorized, validation_error):
 
         if authorized:
             self.assertEquals(0, controller.tk.abort.call_count)
-            self.assertEquals(controller.tk.render.return_value, result)
-            controller.tk.render.assert_called_once_with('datarequests/new.html')
+            self.assertEquals(controller.tk.redirect_to.return_value, result)
+            self.assertEquals(0, controller.tk.render.call_count)
 
             controller.tk.get_action.return_value.assert_called_once_with(self.expected_context, request_data)
 

From 2468884ad2b3eb506f48637d5ad4530fc1641a90 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Tue, 16 Nov 2021 16:22:59 +1000
Subject: [PATCH 218/276] [QOL-7970] handle test with/out validation error

---
 ckanext/datarequests/tests/test_ui_controller.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/ckanext/datarequests/tests/test_ui_controller.py b/ckanext/datarequests/tests/test_ui_controller.py
index 859cd8b5..e70d0e37 100644
--- a/ckanext/datarequests/tests/test_ui_controller.py
+++ b/ckanext/datarequests/tests/test_ui_controller.py
@@ -192,8 +192,12 @@ def test_new_post_content(self, authorized, validation_error):
 
         if authorized:
             self.assertEquals(0, controller.tk.abort.call_count)
-            self.assertEquals(controller.tk.redirect_to.return_value, result)
-            self.assertEquals(0, controller.tk.render.call_count)
+            if validation_error:
+                self.assertEquals(controller.tk.render.return_value, result)
+                controller.tk.render.assert_called_once_with('datarequests/new.html')
+            else:
+                self.assertEquals(controller.tk.redirect_to.return_value, result)
+                self.assertEquals(0, controller.tk.render.call_count)
 
             controller.tk.get_action.return_value.assert_called_once_with(self.expected_context, request_data)
 

From 9dfe86adf14d475cb377fad5bfc42d0549c430bc Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Tue, 16 Nov 2021 16:54:55 +1000
Subject: [PATCH 219/276] [QOL-7970] use standard 'behaving' step for dropdown

---
 test/features/datarequest_circumstances.feature | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/test/features/datarequest_circumstances.feature b/test/features/datarequest_circumstances.feature
index 21ea5820..5a154db3 100644
--- a/test/features/datarequest_circumstances.feature
+++ b/test/features/datarequest_circumstances.feature
@@ -111,8 +111,7 @@ Feature: Datarequest-circumstances
         When I log in and create a datarequest
         And I press the element with xpath "//a[contains(string(), 'Close')]"
         And I select "Open dataset already exists" from "close_circumstance"
-        # Have to use JS to change the selected value as the behaving framework does not work with autocomplete dropdown
-        Then I execute the script "document.getElementById('field-accepted_dataset_id').value = document.getElementById('field-accepted_dataset_id').options[1].value"
+        And I select "annakarenina" from "accepted_dataset_id"
         And I press the element with xpath "//button[contains(string(), 'Close Data Request')]"
         Then I should see "Accepted dataset" within 1 seconds
         And I should see "A Wonderful Story" within 1 seconds

From af28222f0e1cb402a2c3d7473b9114d4b829e493 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Wed, 17 Nov 2021 08:56:23 +1000
Subject: [PATCH 220/276] [QOL-7970] add debugging for closure datasets

---
 ckanext/datarequests/controllers/controller_functions.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ckanext/datarequests/controllers/controller_functions.py b/ckanext/datarequests/controllers/controller_functions.py
index 4a00afe8..9be1ffd9 100644
--- a/ckanext/datarequests/controllers/controller_functions.py
+++ b/ckanext/datarequests/controllers/controller_functions.py
@@ -266,7 +266,7 @@ def close(id):
     data_dict = {'id': id}
     context = _get_context()
 
-    # Basic intialization
+    # Basic initialization
     c.datarequest = {}
 
     def _return_page(errors=None, errors_summary=None):
@@ -284,6 +284,7 @@ def _return_page(errors=None, errors_summary=None):
             # Expected for CKAN 2.3
             base_datasets = tk.get_action('package_search')({'ignore_auth': True}, {'rows': 500})['results']
 
+        log.debug("Dataset candidates for closing data request: %s", base_datasets)
         c.datasets = []
         c.errors = errors
         c.errors_summary = errors_summary

From 53bac927f30b3276ac11ae36dabfc04d1a6dc7a2 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Wed, 17 Nov 2021 14:45:01 +1000
Subject: [PATCH 221/276] [QOL-7970] add debugging for data request creation

---
 test/features/steps/steps.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/features/steps/steps.py b/test/features/steps/steps.py
index a2437d2e..518fc406 100644
--- a/test/features/steps/steps.py
+++ b/test/features/steps/steps.py
@@ -172,5 +172,6 @@ def log_in_create_a_datarequest(context):
         And I click the link with text that contains "Add Data Request"
         And I fill in title with random text
         And I fill in "description" with "Test description"
+        And I take a screenshot
         And I press the element with xpath "//button[contains(string(), 'Create Data Request')]"
     """)

From c098e4a56ce341ed7cc41db280bc341a752cbbb7 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Wed, 17 Nov 2021 15:04:12 +1000
Subject: [PATCH 222/276] [QOL-7970] enable debugging for test dataset setup

---
 .docker/scripts/create-test-data.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.docker/scripts/create-test-data.sh b/.docker/scripts/create-test-data.sh
index 6ff9ab59..39064114 100644
--- a/.docker/scripts/create-test-data.sh
+++ b/.docker/scripts/create-test-data.sh
@@ -166,11 +166,11 @@ echo "Assigning test Datasets to Organisation open-data-administration-data-requ
 
 curl -LsH "Authorization: ${API_KEY}" \
     --data "id=annakarenina&owner_org=${DR_ORG_ID}" \
-    ${CKAN_ACTION_URL}/package_patch >> /dev/null
+    ${CKAN_ACTION_URL}/package_patch
 
 curl -LsH "Authorization: ${API_KEY}" \
     --data "id=warandpeace&owner_org=${DR_ORG_ID}" \
-    ${CKAN_ACTION_URL}/package_patch >> /dev/null
+    ${CKAN_ACTION_URL}/package_patch
 ##
 # END.
 #

From 6c3c48d7c2b0dfa006e260557e7664bcfa5e9e5f Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Wed, 17 Nov 2021 15:23:38 +1000
Subject: [PATCH 223/276] [QOL-7970] shorten scenario names for screenshotting

---
 .../features/datarequest_circumstances.feature | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/test/features/datarequest_circumstances.feature b/test/features/datarequest_circumstances.feature
index 5a154db3..aed5e24b 100644
--- a/test/features/datarequest_circumstances.feature
+++ b/test/features/datarequest_circumstances.feature
@@ -20,7 +20,7 @@ Feature: Datarequest-circumstances
         | DataRequestOrgAdmin   |
 
 
-    Scenario Outline: Data request creator, Sysadmin and Admin users, when I select a closing circumstance 'Open dataset already exists', accepted dataset is required
+    Scenario Outline: When I select closing circumstance 'Open dataset already exists', accepted dataset is required
         Given "<User>" as the persona
         When I log in and create a datarequest
         And I press the element with xpath "//a[contains(string(), 'Close')]"
@@ -36,7 +36,7 @@ Feature: Datarequest-circumstances
         | DataRequestOrgAdmin   |
 
 
-    Scenario Outline: Data request creator, Sysadmin and Admin users, when I select closing circumstance with condition 'To be released as open data at a later date', Approximate publishing date is required
+    Scenario Outline: When I select closing circumstance 'To be released as open data at a later date', Approximate publishing date is required
         Given "<User>" as the persona
         When I log in and create a datarequest
         And I press the element with xpath "//a[contains(string(), 'Close')]"
@@ -66,7 +66,7 @@ Feature: Datarequest-circumstances
         | DataRequestOrgAdmin   |
 
 
-    Scenario Outline: Data request creator, Sysadmin and Admin users, when I select closing circumstance 'Open dataset already exists', the Approximate publishing date element is not visible
+    Scenario Outline: When I select closing circumstance 'Open dataset already exists', the Approximate publishing date element is not visible
         Given "<User>" as the persona
         When I log in and create a datarequest
         And I press the element with xpath "//a[contains(string(), 'Close')]"
@@ -79,7 +79,7 @@ Feature: Datarequest-circumstances
         | DataRequestOrgAdmin   |
 
 
-    Scenario Outline: Data request creator, Sysadmin and Admin users, when I select closing circumstance 'To be released as open data at a later date', the accepted dataset element is not visible
+    Scenario Outline: When I select closing circumstance 'To be released as open data at a later date', the accepted dataset element is not visible
         Given "<User>" as the persona
         When I log in and create a datarequest
         And I press the element with xpath "//a[contains(string(), 'Close')]"
@@ -92,7 +92,7 @@ Feature: Datarequest-circumstances
         | DataRequestOrgAdmin   |
 
 
-    Scenario Outline: Data request creator, Sysadmin and Admin users, when I select closing circumstance 'Data openly available elsewhere', the accepted dataset and Approximate publishing date elements are not visible
+    Scenario Outline: When I select closing circumstance 'Data openly available elsewhere', the accepted dataset and Approximate publishing date elements are not visible
         Given "<User>" as the persona
         When I log in and create a datarequest
         And I press the element with xpath "//a[contains(string(), 'Close')]"
@@ -106,7 +106,7 @@ Feature: Datarequest-circumstances
         | DataRequestOrgAdmin   |
 
 
-    Scenario Outline: Data request creator, Sysadmin and Admin users, when I close a datarequest with accepted dataset, the accepted dataset should be visible on datarequest page
+    Scenario Outline: When I close a datarequest with accepted dataset, the accepted dataset should be visible on datarequest page
         Given "<User>" as the persona
         When I log in and create a datarequest
         And I press the element with xpath "//a[contains(string(), 'Close')]"
@@ -122,7 +122,7 @@ Feature: Datarequest-circumstances
         | DataRequestOrgAdmin   |
 
 
-    Scenario Outline: Data request creator, Sysadmin and Admin users, when I close a datarequest with Approximate publishing date, the Approximate publishing date should be visible on datarequest page
+    Scenario Outline: When I close a datarequest with Approximate publishing date, the Approximate publishing date should be visible on datarequest page
         Given "<User>" as the persona
         When I log in and create a datarequest
         And I press the element with xpath "//a[contains(string(), 'Close')]"
@@ -137,7 +137,7 @@ Feature: Datarequest-circumstances
         | DataRequestOrgAdmin   |
 
     @wip
-    Scenario Outline: Data request creator, Sysadmin and Admin users, when I close a datarequest with closing circumstance 'Requestor initiated closure', the circumstance should be visible on the datarequest page
+    Scenario Outline: When I select closing circumstance 'Requestor initiated closure', the circumstance should be visible on the datarequest page
         Given "<User>" as the persona
         When I log in and create a datarequest
         And I press the element with xpath "//a[contains(string(), 'Close')]"
@@ -152,7 +152,7 @@ Feature: Datarequest-circumstances
         | DataRequestOrgAdmin   |
 
 
-    Scenario Outline: Data request creator, Sysadmin and Admin users, when I close a datarequest with no accepted dataset or Approximate publishing date, they should not be visible on datarequest page
+    Scenario Outline: When I close a datarequest with no accepted dataset or Approximate publishing date, they should not be visible on datarequest page
         Given "<User>" as the persona
         When I log in and create a datarequest
         And I press the element with xpath "//a[contains(string(), 'Close')]"

From 23da8dcf06aabdcd42ba0329e5224122020264eb Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Wed, 17 Nov 2021 16:02:45 +1000
Subject: [PATCH 224/276] [QOL-7970] select dataset by text

---
 test/features/datarequest_circumstances.feature | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/features/datarequest_circumstances.feature b/test/features/datarequest_circumstances.feature
index aed5e24b..8c6bb9d5 100644
--- a/test/features/datarequest_circumstances.feature
+++ b/test/features/datarequest_circumstances.feature
@@ -109,9 +109,10 @@ Feature: Datarequest-circumstances
     Scenario Outline: When I close a datarequest with accepted dataset, the accepted dataset should be visible on datarequest page
         Given "<User>" as the persona
         When I log in and create a datarequest
+        And I take a screenshot
         And I press the element with xpath "//a[contains(string(), 'Close')]"
         And I select "Open dataset already exists" from "close_circumstance"
-        And I select "annakarenina" from "accepted_dataset_id"
+        And I select by text "A Novel By Tolstoy" from "accepted_dataset_id"
         And I press the element with xpath "//button[contains(string(), 'Close Data Request')]"
         Then I should see "Accepted dataset" within 1 seconds
         And I should see "A Wonderful Story" within 1 seconds

From 00ab218d757bdeb5e000fcc426ebec4408b7977e Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Thu, 18 Nov 2021 08:42:15 +1000
Subject: [PATCH 225/276] [QOL-7970] wait a second for jQuery to run

---
 test/features/datarequest_circumstances.feature | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/features/datarequest_circumstances.feature b/test/features/datarequest_circumstances.feature
index 8c6bb9d5..a14f9ef1 100644
--- a/test/features/datarequest_circumstances.feature
+++ b/test/features/datarequest_circumstances.feature
@@ -112,6 +112,7 @@ Feature: Datarequest-circumstances
         And I take a screenshot
         And I press the element with xpath "//a[contains(string(), 'Close')]"
         And I select "Open dataset already exists" from "close_circumstance"
+        And I wait for 1 seconds
         And I select by text "A Novel By Tolstoy" from "accepted_dataset_id"
         And I press the element with xpath "//button[contains(string(), 'Close Data Request')]"
         Then I should see "Accepted dataset" within 1 seconds

From 236dde4d88c7afc231e50dee893fedc4814b4024 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Thu, 25 Nov 2021 14:25:13 +1000
Subject: [PATCH 226/276] [QOL-7970] revert drop-down interaction

---
 test/features/datarequest_circumstances.feature | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/features/datarequest_circumstances.feature b/test/features/datarequest_circumstances.feature
index a14f9ef1..d7b5218d 100644
--- a/test/features/datarequest_circumstances.feature
+++ b/test/features/datarequest_circumstances.feature
@@ -113,7 +113,8 @@ Feature: Datarequest-circumstances
         And I press the element with xpath "//a[contains(string(), 'Close')]"
         And I select "Open dataset already exists" from "close_circumstance"
         And I wait for 1 seconds
-        And I select by text "A Novel By Tolstoy" from "accepted_dataset_id"
+        # Have to use JS to change the selected value as the behaving framework does not work with autocomplete dropdown
+        Then I execute the script "document.getElementById('field-accepted_dataset_id').value = document.getElementById('field-accepted_dataset_id').options[1].value"
         And I press the element with xpath "//button[contains(string(), 'Close Data Request')]"
         Then I should see "Accepted dataset" within 1 seconds
         And I should see "A Wonderful Story" within 1 seconds

From 697e58b05f866e2d85d651fd2cf79dfd3b0eef6c Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Thu, 25 Nov 2021 15:15:39 +1000
Subject: [PATCH 227/276] [QOL-7970] add admin user in 'init'

- There seems to be a race condition in setting up the default user,
so run just one CLI command at once at this step.
---
 .docker/scripts/create-test-data.sh | 1 -
 .docker/scripts/init.sh             | 6 ++++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/.docker/scripts/create-test-data.sh b/.docker/scripts/create-test-data.sh
index 39064114..d2410ec6 100644
--- a/.docker/scripts/create-test-data.sh
+++ b/.docker/scripts/create-test-data.sh
@@ -12,7 +12,6 @@ fi
 
 CKAN_USER_NAME="${CKAN_USER_NAME:-admin}"
 CKAN_DISPLAY_NAME="${CKAN_DISPLAY_NAME:-Administrator}"
-CKAN_USER_PASSWORD="${CKAN_USER_PASSWORD:-password}"
 CKAN_USER_EMAIL="${CKAN_USER_EMAIL:-admin@localhost}"
 
 add_user_if_needed () {
diff --git a/.docker/scripts/init.sh b/.docker/scripts/init.sh
index 8d2a46ae..a02641fc 100755
--- a/.docker/scripts/init.sh
+++ b/.docker/scripts/init.sh
@@ -10,5 +10,11 @@ fi
 CLICK_ARGS="--yes" ckan_cli db clean
 ckan_cli db init
 
+CKAN_USER_NAME="${CKAN_USER_NAME:-admin}"
+CKAN_DISPLAY_NAME="${CKAN_DISPLAY_NAME:-Administrator}"
+CKAN_USER_EMAIL="${CKAN_USER_EMAIL:-admin@localhost}"
+CKAN_USER_PASSWORD="${CKAN_USER_PASSWORD:-Password123!}"
+ckan_cli user add "$CKAN_USER_NAME" fullname="$CKAN_DISPLAY_NAME" email="$CKAN_USER_EMAIL" password="$CKAN_USER_PASSWORD"
+
 # Create some base test data
 . $APP_DIR/scripts/create-test-data.sh

From dea6520ada7b367079b8a8612ebf5ecb30e614ed Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Mon, 29 Nov 2021 11:51:43 +1000
Subject: [PATCH 228/276] [QOL-7970] use jQuery to select closure dataset

---
 test/features/datarequest_circumstances.feature | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/features/datarequest_circumstances.feature b/test/features/datarequest_circumstances.feature
index d7b5218d..62534737 100644
--- a/test/features/datarequest_circumstances.feature
+++ b/test/features/datarequest_circumstances.feature
@@ -114,7 +114,7 @@ Feature: Datarequest-circumstances
         And I select "Open dataset already exists" from "close_circumstance"
         And I wait for 1 seconds
         # Have to use JS to change the selected value as the behaving framework does not work with autocomplete dropdown
-        Then I execute the script "document.getElementById('field-accepted_dataset_id').value = document.getElementById('field-accepted_dataset_id').options[1].value"
+        Then I execute the script "$('#field-accepted_dataset_id').val($('#field-accepted_dataset_id option:eq(1)').attr('value'))"
         And I press the element with xpath "//button[contains(string(), 'Close Data Request')]"
         Then I should see "Accepted dataset" within 1 seconds
         And I should see "A Wonderful Story" within 1 seconds

From ddf033fd733f22e4012e4e5adfe0befd5ef8f925 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Mon, 29 Nov 2021 12:17:01 +1000
Subject: [PATCH 229/276] [QOL-7970] debug CKAN 2.9 failures

- Drop unnecessary screenshots
- Add screenshot that might help debug
- Add temporary debugging text
---
 .../datarequests/snippets/close_datarequest_form.html | 11 +++++++----
 test/features/datarequest_circumstances.feature       |  2 +-
 test/features/steps/steps.py                          |  1 -
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/ckanext/datarequests/templates/datarequests/snippets/close_datarequest_form.html b/ckanext/datarequests/templates/datarequests/snippets/close_datarequest_form.html
index 9f817759..c788afab 100644
--- a/ckanext/datarequests/templates/datarequests/snippets/close_datarequest_form.html
+++ b/ckanext/datarequests/templates/datarequests/snippets/close_datarequest_form.html
@@ -12,12 +12,12 @@
         {% resource 'datarequest/datarequest_close.js' %}
         {% set close_circumstances = h.get_closing_circumstances() %}
         {% set selected_close_circumstance = datarequest.get('close_circumstance', '') %}
-       
+
         <input type="hidden" id="field-condition" name="condition" />
         <div class="control-group control-full form-group">
           <label class="control-label" for="field-close_circumstance">{{ _("Circumstances") }}</label>
           <div class="controls">
-            <select id="field-close_circumstance" name="close_circumstance" >           
+            <select id="field-close_circumstance" name="close_circumstance" >
               {% for close_circumstance in close_circumstances  %}
                 {% set circumstance = close_circumstance.get('circumstance', '') %}
                 {% set condition = close_circumstance.get('condition', '') %}
@@ -34,8 +34,11 @@
     <div class="control-group control-full form-group">
       <label class="control-label" for="field-accepted_dataset_id">{{ _("Accep. Dataset") }}</label>
       <div class="controls">
+          {% for dataset in datasets  %}
+            <p> Dataset: {{ dataset.get('title') }} ({{ dataset.get('name') }})</p>
+          {% endfor %}
         <select id="field-accepted_dataset_id" name="accepted_dataset_id" data-module="autocomplete">
-    	  <option value="" selected="selected">No Dataset</option>
+          <option value="" selected="selected">No Dataset</option>
           {% for dataset in datasets  %}
             <option value="{{ dataset.get('name') }}">{{ dataset.get('title') }}</option>
           {% endfor %}
@@ -50,4 +53,4 @@
     </div>
   {% endblock %}
 
-</form>
\ No newline at end of file
+</form>
diff --git a/test/features/datarequest_circumstances.feature b/test/features/datarequest_circumstances.feature
index 62534737..724c22e8 100644
--- a/test/features/datarequest_circumstances.feature
+++ b/test/features/datarequest_circumstances.feature
@@ -109,10 +109,10 @@ Feature: Datarequest-circumstances
     Scenario Outline: When I close a datarequest with accepted dataset, the accepted dataset should be visible on datarequest page
         Given "<User>" as the persona
         When I log in and create a datarequest
-        And I take a screenshot
         And I press the element with xpath "//a[contains(string(), 'Close')]"
         And I select "Open dataset already exists" from "close_circumstance"
         And I wait for 1 seconds
+        And I take a screenshot
         # Have to use JS to change the selected value as the behaving framework does not work with autocomplete dropdown
         Then I execute the script "$('#field-accepted_dataset_id').val($('#field-accepted_dataset_id option:eq(1)').attr('value'))"
         And I press the element with xpath "//button[contains(string(), 'Close Data Request')]"
diff --git a/test/features/steps/steps.py b/test/features/steps/steps.py
index 518fc406..a2437d2e 100644
--- a/test/features/steps/steps.py
+++ b/test/features/steps/steps.py
@@ -172,6 +172,5 @@ def log_in_create_a_datarequest(context):
         And I click the link with text that contains "Add Data Request"
         And I fill in title with random text
         And I fill in "description" with "Test description"
-        And I take a screenshot
         And I press the element with xpath "//button[contains(string(), 'Create Data Request')]"
     """)

From 34273bd0b1f117a2179f7cf14515d179786e509d Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Mon, 29 Nov 2021 12:46:25 +1000
Subject: [PATCH 230/276] [QOL-7970] expand debugging

---
 .../templates/datarequests/snippets/close_datarequest_form.html  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ckanext/datarequests/templates/datarequests/snippets/close_datarequest_form.html b/ckanext/datarequests/templates/datarequests/snippets/close_datarequest_form.html
index c788afab..ad90af93 100644
--- a/ckanext/datarequests/templates/datarequests/snippets/close_datarequest_form.html
+++ b/ckanext/datarequests/templates/datarequests/snippets/close_datarequest_form.html
@@ -34,6 +34,7 @@
     <div class="control-group control-full form-group">
       <label class="control-label" for="field-accepted_dataset_id">{{ _("Accep. Dataset") }}</label>
       <div class="controls">
+          Available datasets:
           {% for dataset in datasets  %}
             <p> Dataset: {{ dataset.get('title') }} ({{ dataset.get('name') }})</p>
           {% endfor %}

From 3a1fea2397ece67bb4f657eb8b17287d7802468c Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Mon, 29 Nov 2021 13:11:00 +1000
Subject: [PATCH 231/276] [QOL-7970] expand debugging

---
 .../templates/datarequests/snippets/close_datarequest_form.html  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ckanext/datarequests/templates/datarequests/snippets/close_datarequest_form.html b/ckanext/datarequests/templates/datarequests/snippets/close_datarequest_form.html
index ad90af93..28dde350 100644
--- a/ckanext/datarequests/templates/datarequests/snippets/close_datarequest_form.html
+++ b/ckanext/datarequests/templates/datarequests/snippets/close_datarequest_form.html
@@ -38,6 +38,7 @@
           {% for dataset in datasets  %}
             <p> Dataset: {{ dataset.get('title') }} ({{ dataset.get('name') }})</p>
           {% endfor %}
+          Global object: {{ c }}
         <select id="field-accepted_dataset_id" name="accepted_dataset_id" data-module="autocomplete">
           <option value="" selected="selected">No Dataset</option>
           {% for dataset in datasets  %}

From e1446d2f4e534feb358bc2abdc257b0a272d8b3b Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Mon, 29 Nov 2021 13:54:58 +1000
Subject: [PATCH 232/276] [QOL-7970] pass datasets directly to rendering rather
 than using 'c'

---
 ckanext/datarequests/controllers/controller_functions.py | 6 +++---
 ckanext/datarequests/templates/datarequests/close.html   | 2 +-
 ckanext/datarequests/tests/test_ui_controller.py         | 6 ++----
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/ckanext/datarequests/controllers/controller_functions.py b/ckanext/datarequests/controllers/controller_functions.py
index 9be1ffd9..cf61db0b 100644
--- a/ckanext/datarequests/controllers/controller_functions.py
+++ b/ckanext/datarequests/controllers/controller_functions.py
@@ -285,17 +285,17 @@ def _return_page(errors=None, errors_summary=None):
             base_datasets = tk.get_action('package_search')({'ignore_auth': True}, {'rows': 500})['results']
 
         log.debug("Dataset candidates for closing data request: %s", base_datasets)
-        c.datasets = []
+        dataset_options = []
         c.errors = errors
         c.errors_summary = errors_summary
         for dataset in base_datasets:
-            c.datasets.append({'name': dataset.get('name'), 'title': dataset.get('title')})
+            dataset_options.append({'name': dataset.get('name'), 'title': dataset.get('title')})
 
         if tk.h.closing_circumstances_enabled:
             # This is required so the form can set the currently selected close_circumstance option in the select dropdown
             c.datarequest['close_circumstance'] = request_helpers.get_first_post_param('close_circumstance', None)
 
-        return tk.render('datarequests/close.html')
+        return tk.render('datarequests/close.html', extra_vars={'datasets': dataset_options})
 
     try:
         tk.check_access(constants.CLOSE_DATAREQUEST, context, data_dict)
diff --git a/ckanext/datarequests/templates/datarequests/close.html b/ckanext/datarequests/templates/datarequests/close.html
index 5716c78b..c2eb0b5f 100644
--- a/ckanext/datarequests/templates/datarequests/close.html
+++ b/ckanext/datarequests/templates/datarequests/close.html
@@ -10,7 +10,7 @@
 
 {% block primary_content_inner %}
   <h1 class="{% block page_heading_class %}page-heading{% endblock %}">{% block page_heading %}{{ _('Close Data Request') }}{% endblock %}</h1>
-  {% snippet "datarequests/snippets/close_datarequest_form.html", datarequest=c.datarequest, datasets=c.datasets, errors=c.errors, errors_summary=c.errors_summary  %}
+  {% snippet "datarequests/snippets/close_datarequest_form.html", datarequest=c.datarequest, datasets=datasets, errors=c.errors, errors_summary=c.errors_summary  %}
 {% endblock %}
 
 {% block page_header %}{% endblock %}
diff --git a/ckanext/datarequests/tests/test_ui_controller.py b/ckanext/datarequests/tests/test_ui_controller.py
index e70d0e37..c040da8e 100644
--- a/ckanext/datarequests/tests/test_ui_controller.py
+++ b/ckanext/datarequests/tests/test_ui_controller.py
@@ -734,7 +734,8 @@ def _get_action(action):
             package_search.assert_called_once_with({'ignore_auth': True}, {'rows': 500})
 
         # Assertions
-        controller.tk.render.assert_called_once_with('datarequests/close.html')
+        expected_datasets = packages_org if organization else packages_no_org
+        controller.tk.render.assert_called_once_with('datarequests/close.html', extra_vars={'datasets': expected_datasets})
         self.assertEquals(result, controller.tk.render.return_value)
 
         self.assertIsNone(controller.tk.response.location)
@@ -743,9 +744,6 @@ def _get_action(action):
         self.assertEquals(errors_summary, controller.c.errors_summary)
         self.assertEquals(datarequest, controller.c.datarequest)
 
-        expected_datasets = packages_org if organization else packages_no_org
-        self.assertEquals(expected_datasets, controller.c.datasets)
-
     def test_close_post_no_error(self):
         _patch_POST({'accepted_dataset': 'example_ds'})
 

From 117a6b5cd1a5147759b9a1a7a07bc15e8f6828f7 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Mon, 29 Nov 2021 13:59:37 +1000
Subject: [PATCH 233/276] [QOL-7970] fix 'c' debugging

---
 .../templates/datarequests/snippets/close_datarequest_form.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ckanext/datarequests/templates/datarequests/snippets/close_datarequest_form.html b/ckanext/datarequests/templates/datarequests/snippets/close_datarequest_form.html
index 28dde350..6722a38a 100644
--- a/ckanext/datarequests/templates/datarequests/snippets/close_datarequest_form.html
+++ b/ckanext/datarequests/templates/datarequests/snippets/close_datarequest_form.html
@@ -38,7 +38,7 @@
           {% for dataset in datasets  %}
             <p> Dataset: {{ dataset.get('title') }} ({{ dataset.get('name') }})</p>
           {% endfor %}
-          Global object: {{ c }}
+          Global object: {{ dir(c) }}
         <select id="field-accepted_dataset_id" name="accepted_dataset_id" data-module="autocomplete">
           <option value="" selected="selected">No Dataset</option>
           {% for dataset in datasets  %}

From f19053a78b3f1e015c63a0649b484b5f547e868e Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Mon, 29 Nov 2021 14:13:53 +1000
Subject: [PATCH 234/276] [QOL-7970] drop debugging of global object

---
 .../templates/datarequests/snippets/close_datarequest_form.html  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ckanext/datarequests/templates/datarequests/snippets/close_datarequest_form.html b/ckanext/datarequests/templates/datarequests/snippets/close_datarequest_form.html
index 6722a38a..ad90af93 100644
--- a/ckanext/datarequests/templates/datarequests/snippets/close_datarequest_form.html
+++ b/ckanext/datarequests/templates/datarequests/snippets/close_datarequest_form.html
@@ -38,7 +38,6 @@
           {% for dataset in datasets  %}
             <p> Dataset: {{ dataset.get('title') }} ({{ dataset.get('name') }})</p>
           {% endfor %}
-          Global object: {{ dir(c) }}
         <select id="field-accepted_dataset_id" name="accepted_dataset_id" data-module="autocomplete">
           <option value="" selected="selected">No Dataset</option>
           {% for dataset in datasets  %}

From 485ac69bf89bfcce419958f63f473531615b8237 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Mon, 29 Nov 2021 14:58:58 +1000
Subject: [PATCH 235/276] [QOL-7970] add debugging of dataset load

---
 ckanext/datarequests/controllers/controller_functions.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ckanext/datarequests/controllers/controller_functions.py b/ckanext/datarequests/controllers/controller_functions.py
index cf61db0b..a0427066 100644
--- a/ckanext/datarequests/controllers/controller_functions.py
+++ b/ckanext/datarequests/controllers/controller_functions.py
@@ -276,12 +276,14 @@ def _return_page(errors=None, errors_summary=None):
         # only the ones that belong to the organization are shown)
         organization_id = c.datarequest.get('organization_id', '')
         if organization_id:
+            LOG.debug("Loading datasets for organisation %s...", organization_id)
             base_datasets = tk.get_action('organization_show')({'ignore_auth': True}, {'id': organization_id, 'include_datasets': True})['packages']
         else:
             # FIXME: At this time, only the 500 last modified/created datasets are retrieved.
             # We assume that a user will close their data request with a recently added or modified dataset
             # In the future, we should fix this with an autocomplete form...
             # Expected for CKAN 2.3
+            LOG.debug("Loading first 500 datasets...")
             base_datasets = tk.get_action('package_search')({'ignore_auth': True}, {'rows': 500})['results']
 
         log.debug("Dataset candidates for closing data request: %s", base_datasets)

From 19182f6eb0ff0895e9c158ba83d8dbd9f495d062 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Mon, 29 Nov 2021 15:08:01 +1000
Subject: [PATCH 236/276] [QOL-7970] oops fix variable case

---
 ckanext/datarequests/controllers/controller_functions.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ckanext/datarequests/controllers/controller_functions.py b/ckanext/datarequests/controllers/controller_functions.py
index a0427066..58ba2b72 100644
--- a/ckanext/datarequests/controllers/controller_functions.py
+++ b/ckanext/datarequests/controllers/controller_functions.py
@@ -276,14 +276,14 @@ def _return_page(errors=None, errors_summary=None):
         # only the ones that belong to the organization are shown)
         organization_id = c.datarequest.get('organization_id', '')
         if organization_id:
-            LOG.debug("Loading datasets for organisation %s...", organization_id)
+            log.debug("Loading datasets for organisation %s...", organization_id)
             base_datasets = tk.get_action('organization_show')({'ignore_auth': True}, {'id': organization_id, 'include_datasets': True})['packages']
         else:
             # FIXME: At this time, only the 500 last modified/created datasets are retrieved.
             # We assume that a user will close their data request with a recently added or modified dataset
             # In the future, we should fix this with an autocomplete form...
             # Expected for CKAN 2.3
-            LOG.debug("Loading first 500 datasets...")
+            log.debug("Loading first 500 datasets...")
             base_datasets = tk.get_action('package_search')({'ignore_auth': True}, {'rows': 500})['results']
 
         log.debug("Dataset candidates for closing data request: %s", base_datasets)

From 8060aad28d42659d27a789e2d8b7dcf53d575337 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Mon, 29 Nov 2021 15:31:45 +1000
Subject: [PATCH 237/276] [QOL-7970] ensure Solr knows about test data

---
 .docker/scripts/create-test-data.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.docker/scripts/create-test-data.sh b/.docker/scripts/create-test-data.sh
index d2410ec6..17dde30c 100644
--- a/.docker/scripts/create-test-data.sh
+++ b/.docker/scripts/create-test-data.sh
@@ -174,6 +174,7 @@ curl -LsH "Authorization: ${API_KEY}" \
 # END.
 #
 
+ckan_cli search-index rebuild
 
 if [ "$VENV_DIR" != "" ]; then
   deactivate

From 4a25d63b16d92c70fa4c32bcfa9b3b019d7d7ca3 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Mon, 29 Nov 2021 16:03:09 +1000
Subject: [PATCH 238/276] [QOL-7970] debug organization_show call

---
 ckanext/datarequests/controllers/controller_functions.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ckanext/datarequests/controllers/controller_functions.py b/ckanext/datarequests/controllers/controller_functions.py
index 58ba2b72..1cfa8188 100644
--- a/ckanext/datarequests/controllers/controller_functions.py
+++ b/ckanext/datarequests/controllers/controller_functions.py
@@ -276,8 +276,9 @@ def _return_page(errors=None, errors_summary=None):
         # only the ones that belong to the organization are shown)
         organization_id = c.datarequest.get('organization_id', '')
         if organization_id:
-            log.debug("Loading datasets for organisation %s...", organization_id)
-            base_datasets = tk.get_action('organization_show')({'ignore_auth': True}, {'id': organization_id, 'include_datasets': True})['packages']
+            org_show = tk.get_action('organization_show')({'ignore_auth': True}, {'id': organization_id, 'include_datasets': True})
+            log.debug("Loading datasets for organisation %s, found %s", organization_id, org_show)
+            base_datasets = org_show['packages']
         else:
             # FIXME: At this time, only the 500 last modified/created datasets are retrieved.
             # We assume that a user will close their data request with a recently added or modified dataset

From d162fc4b1611ac3cee4afaa40f7ad8952ce69a66 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Mon, 29 Nov 2021 16:33:44 +1000
Subject: [PATCH 239/276] [QOL-7970] use package_search call even for org

---
 ckanext/datarequests/controllers/controller_functions.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ckanext/datarequests/controllers/controller_functions.py b/ckanext/datarequests/controllers/controller_functions.py
index 1cfa8188..e91d3e34 100644
--- a/ckanext/datarequests/controllers/controller_functions.py
+++ b/ckanext/datarequests/controllers/controller_functions.py
@@ -276,9 +276,9 @@ def _return_page(errors=None, errors_summary=None):
         # only the ones that belong to the organization are shown)
         organization_id = c.datarequest.get('organization_id', '')
         if organization_id:
-            org_show = tk.get_action('organization_show')({'ignore_auth': True}, {'id': organization_id, 'include_datasets': True})
+            org_show = tk.get_action('package_search')({'ignore_auth': True}, {'owner_org': organization_id})
             log.debug("Loading datasets for organisation %s, found %s", organization_id, org_show)
-            base_datasets = org_show['packages']
+            base_datasets = org_show['results']
         else:
             # FIXME: At this time, only the 500 last modified/created datasets are retrieved.
             # We assume that a user will close their data request with a recently added or modified dataset

From b69140540780c6a005f33eba81461720cf9e330e Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Mon, 29 Nov 2021 16:46:43 +1000
Subject: [PATCH 240/276] [QOL-7970] fix unit tests to expect package_search

---
 ckanext/datarequests/tests/test_ui_controller.py | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/ckanext/datarequests/tests/test_ui_controller.py b/ckanext/datarequests/tests/test_ui_controller.py
index c040da8e..dd0bf0f3 100644
--- a/ckanext/datarequests/tests/test_ui_controller.py
+++ b/ckanext/datarequests/tests/test_ui_controller.py
@@ -704,15 +704,11 @@ def _test_close(self, organization, post_content=None, errors=None, errors_summa
             datarequest['organization_id'] = organization
 
         show_datarequest = MagicMock(return_value=datarequest)
-        packages_org = [{'name': 'packo1', 'title': 'packo1'}, {'name': 'packo2', 'title': 'packo2'}]
-        organization_show = MagicMock(return_value={'packages': packages_org})
-        packages_no_org = [{'name': 'pack1', 'title': 'pack1'}, {'name': 'pack2', 'title': 'pack2'}]
-        package_search = MagicMock(return_value={'results': packages_no_org})
+        packages = [{'name': 'pack1', 'title': 'pack1'}, {'name': 'pack2', 'title': 'pack2'}]
+        package_search = MagicMock(return_value={'results': packages})
 
         def _get_action(action):
-            if action == 'organization_show':
-                return organization_show
-            elif action == 'package_search':
+            if action == 'package_search':
                 return package_search
             elif action == constants.SHOW_DATAREQUEST:
                 return show_datarequest
@@ -729,12 +725,12 @@ def _get_action(action):
         show_datarequest.assert_called_once_with(self.expected_context, {'id': datarequest_id})
 
         if organization:
-            organization_show.assert_called_once_with({'ignore_auth': True}, {'id': organization, 'include_datasets': True})
+            package_search.assert_called_once_with({'ignore_auth': True}, {'owner_org': organization})
         else:
             package_search.assert_called_once_with({'ignore_auth': True}, {'rows': 500})
 
         # Assertions
-        expected_datasets = packages_org if organization else packages_no_org
+        expected_datasets = packages
         controller.tk.render.assert_called_once_with('datarequests/close.html', extra_vars={'datasets': expected_datasets})
         self.assertEquals(result, controller.tk.render.return_value)
 

From cb647c8594369e4c7ee1905e4a142fd1d4b36e25 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Mon, 29 Nov 2021 17:08:20 +1000
Subject: [PATCH 241/276] [QOL-7970] oops fix package query syntax

---
 ckanext/datarequests/controllers/controller_functions.py  | 8 ++++----
 .../datarequests/snippets/close_datarequest_form.html     | 2 +-
 ckanext/datarequests/tests/test_ui_controller.py          | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ckanext/datarequests/controllers/controller_functions.py b/ckanext/datarequests/controllers/controller_functions.py
index e91d3e34..3dcccd94 100644
--- a/ckanext/datarequests/controllers/controller_functions.py
+++ b/ckanext/datarequests/controllers/controller_functions.py
@@ -276,16 +276,16 @@ def _return_page(errors=None, errors_summary=None):
         # only the ones that belong to the organization are shown)
         organization_id = c.datarequest.get('organization_id', '')
         if organization_id:
-            org_show = tk.get_action('package_search')({'ignore_auth': True}, {'owner_org': organization_id})
-            log.debug("Loading datasets for organisation %s, found %s", organization_id, org_show)
-            base_datasets = org_show['results']
+            log.debug("Loading datasets for organisation %s", organization_id)
+            search_data_dict = {'q': 'owner_org:' + organization_id}
         else:
             # FIXME: At this time, only the 500 last modified/created datasets are retrieved.
             # We assume that a user will close their data request with a recently added or modified dataset
             # In the future, we should fix this with an autocomplete form...
             # Expected for CKAN 2.3
             log.debug("Loading first 500 datasets...")
-            base_datasets = tk.get_action('package_search')({'ignore_auth': True}, {'rows': 500})['results']
+            search_data_dict = {'rows': 500}
+        base_datasets = tk.get_action('package_search')({'ignore_auth': True}, search_data_dict)['results']
 
         log.debug("Dataset candidates for closing data request: %s", base_datasets)
         dataset_options = []
diff --git a/ckanext/datarequests/templates/datarequests/snippets/close_datarequest_form.html b/ckanext/datarequests/templates/datarequests/snippets/close_datarequest_form.html
index ad90af93..b5645df4 100644
--- a/ckanext/datarequests/templates/datarequests/snippets/close_datarequest_form.html
+++ b/ckanext/datarequests/templates/datarequests/snippets/close_datarequest_form.html
@@ -35,7 +35,7 @@
       <label class="control-label" for="field-accepted_dataset_id">{{ _("Accep. Dataset") }}</label>
       <div class="controls">
           Available datasets:
-          {% for dataset in datasets  %}
+          {% for dataset in datasets %}
             <p> Dataset: {{ dataset.get('title') }} ({{ dataset.get('name') }})</p>
           {% endfor %}
         <select id="field-accepted_dataset_id" name="accepted_dataset_id" data-module="autocomplete">
diff --git a/ckanext/datarequests/tests/test_ui_controller.py b/ckanext/datarequests/tests/test_ui_controller.py
index dd0bf0f3..121558de 100644
--- a/ckanext/datarequests/tests/test_ui_controller.py
+++ b/ckanext/datarequests/tests/test_ui_controller.py
@@ -725,7 +725,7 @@ def _get_action(action):
         show_datarequest.assert_called_once_with(self.expected_context, {'id': datarequest_id})
 
         if organization:
-            package_search.assert_called_once_with({'ignore_auth': True}, {'owner_org': organization})
+            package_search.assert_called_once_with({'ignore_auth': True}, {'q': 'owner_org:' + organization})
         else:
             package_search.assert_called_once_with({'ignore_auth': True}, {'rows': 500})
 

From 2a3db138973ccee64a3294445a9d15018f76e0ef Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Tue, 30 Nov 2021 08:13:20 +1000
Subject: [PATCH 242/276] [QOL-7970] update test data command to handle CKAN
 2.9 CLI

---
 .docker/scripts/create-test-data.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.docker/scripts/create-test-data.sh b/.docker/scripts/create-test-data.sh
index 17dde30c..40e20c95 100644
--- a/.docker/scripts/create-test-data.sh
+++ b/.docker/scripts/create-test-data.sh
@@ -157,7 +157,7 @@ curl -LsH "Authorization: ${API_KEY}" \
 #
 
 # Use CKAN's built-in commands for creating some test datasets...
-ckan_cli create-test-data
+ckan_cli create-test-data basic
 
 # Datasets need to be assigned to an organisation
 

From 8540f65f04e33b9947a086a916052a0868c1ca49 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Tue, 30 Nov 2021 08:26:15 +1000
Subject: [PATCH 243/276] [QOL-7970] ensure test DB schema is up to date

---
 .docker/scripts/init.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.docker/scripts/init.sh b/.docker/scripts/init.sh
index a02641fc..02fc33d0 100755
--- a/.docker/scripts/init.sh
+++ b/.docker/scripts/init.sh
@@ -9,6 +9,7 @@ if [ "$VENV_DIR" != "" ]; then
 fi
 CLICK_ARGS="--yes" ckan_cli db clean
 ckan_cli db init
+ckan_cli db upgrade
 
 CKAN_USER_NAME="${CKAN_USER_NAME:-admin}"
 CKAN_DISPLAY_NAME="${CKAN_DISPLAY_NAME:-Administrator}"

From 5be0c7fa648c232ef8636b9e0dfe33a4e59f9c63 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Tue, 30 Nov 2021 13:04:03 +1000
Subject: [PATCH 244/276] [QOL-7970] clean up

- expand test flag comments to make their purpose clear
- drop debugging lines
---
 .env                                                        | 6 +++---
 .../datarequests/snippets/close_datarequest_form.html       | 4 ----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/.env b/.env
index 99109a19..f6224432 100644
--- a/.env
+++ b/.env
@@ -15,11 +15,11 @@ PROJECT="ckanext-datarequests"
 # Docker Compose project name. All containers will have this name.
 COMPOSE_PROJECT_NAME="$PROJECT"
 
-# Flag to allow code linting failures.
+# Flag to allow code linting failures. 0=enforce, 1=ignore
 ALLOW_LINT_FAIL=0
 
-# Flag to allow unit tests failures.
+# Flag to allow unit tests failures. 0=enforce, 1=ignore
 ALLOW_UNIT_FAIL=0
 
-# Flag to allow BDD tests failures.
+# Flag to allow BDD tests failures. 0=enforce, 1=ignore
 ALLOW_BDD_FAIL=0
diff --git a/ckanext/datarequests/templates/datarequests/snippets/close_datarequest_form.html b/ckanext/datarequests/templates/datarequests/snippets/close_datarequest_form.html
index b5645df4..f1e97a58 100644
--- a/ckanext/datarequests/templates/datarequests/snippets/close_datarequest_form.html
+++ b/ckanext/datarequests/templates/datarequests/snippets/close_datarequest_form.html
@@ -34,10 +34,6 @@
     <div class="control-group control-full form-group">
       <label class="control-label" for="field-accepted_dataset_id">{{ _("Accep. Dataset") }}</label>
       <div class="controls">
-          Available datasets:
-          {% for dataset in datasets %}
-            <p> Dataset: {{ dataset.get('title') }} ({{ dataset.get('name') }})</p>
-          {% endfor %}
         <select id="field-accepted_dataset_id" name="accepted_dataset_id" data-module="autocomplete">
           <option value="" selected="selected">No Dataset</option>
           {% for dataset in datasets  %}

From 818a5b9f2d94e6712a67b2668aed8e34278e7bea Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Tue, 30 Nov 2021 15:31:45 +1000
Subject: [PATCH 245/276] [QOL-7970] fix menu items for organisations

- use Pylons routing for CKAN 2.8 since it only has partial Flask
- fix Pylons route name for org dataset list
---
 ckanext/datarequests/templates/organization/read_base.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ckanext/datarequests/templates/organization/read_base.html b/ckanext/datarequests/templates/organization/read_base.html
index 858537a2..dba200d9 100644
--- a/ckanext/datarequests/templates/organization/read_base.html
+++ b/ckanext/datarequests/templates/organization/read_base.html
@@ -1,8 +1,8 @@
 {% ckan_extends %}
 
 {% block content_primary_nav %}
-  {% if h.ckan_version()[:3] <= '2.7' %}
-    {% set org_datasets_nav = 'organization_datasets' %}
+  {% if h.ckan_version()[:3] <= '2.8' %}
+    {% set org_datasets_nav = 'organization_read' %}
     {% set org_activity_nav = 'organization_activity' %}
     {% set org_about_nav = 'organization_about' %}
   {% else %}

From 9fb463a4eeac309bee3d73d0afa6e3453273b187 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Tue, 30 Nov 2021 15:38:11 +1000
Subject: [PATCH 246/276] [QOL-7970] revert to 'c' global object for passing
 datasets

- This means we don't need to change the QGOV theme,
and it turns out the missing datasets were for a different reason
(test data creation needed CLI syntax to be adjusted)
---
 ckanext/datarequests/controllers/controller_functions.py | 6 +++---
 ckanext/datarequests/templates/datarequests/close.html   | 2 +-
 ckanext/datarequests/tests/test_ui_controller.py         | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ckanext/datarequests/controllers/controller_functions.py b/ckanext/datarequests/controllers/controller_functions.py
index 3dcccd94..38320278 100644
--- a/ckanext/datarequests/controllers/controller_functions.py
+++ b/ckanext/datarequests/controllers/controller_functions.py
@@ -288,17 +288,17 @@ def _return_page(errors=None, errors_summary=None):
         base_datasets = tk.get_action('package_search')({'ignore_auth': True}, search_data_dict)['results']
 
         log.debug("Dataset candidates for closing data request: %s", base_datasets)
-        dataset_options = []
+        c.datasets = []
         c.errors = errors
         c.errors_summary = errors_summary
         for dataset in base_datasets:
-            dataset_options.append({'name': dataset.get('name'), 'title': dataset.get('title')})
+            c.datasets.append({'name': dataset.get('name'), 'title': dataset.get('title')})
 
         if tk.h.closing_circumstances_enabled:
             # This is required so the form can set the currently selected close_circumstance option in the select dropdown
             c.datarequest['close_circumstance'] = request_helpers.get_first_post_param('close_circumstance', None)
 
-        return tk.render('datarequests/close.html', extra_vars={'datasets': dataset_options})
+        return tk.render('datarequests/close.html')
 
     try:
         tk.check_access(constants.CLOSE_DATAREQUEST, context, data_dict)
diff --git a/ckanext/datarequests/templates/datarequests/close.html b/ckanext/datarequests/templates/datarequests/close.html
index c2eb0b5f..5716c78b 100644
--- a/ckanext/datarequests/templates/datarequests/close.html
+++ b/ckanext/datarequests/templates/datarequests/close.html
@@ -10,7 +10,7 @@
 
 {% block primary_content_inner %}
   <h1 class="{% block page_heading_class %}page-heading{% endblock %}">{% block page_heading %}{{ _('Close Data Request') }}{% endblock %}</h1>
-  {% snippet "datarequests/snippets/close_datarequest_form.html", datarequest=c.datarequest, datasets=datasets, errors=c.errors, errors_summary=c.errors_summary  %}
+  {% snippet "datarequests/snippets/close_datarequest_form.html", datarequest=c.datarequest, datasets=c.datasets, errors=c.errors, errors_summary=c.errors_summary  %}
 {% endblock %}
 
 {% block page_header %}{% endblock %}
diff --git a/ckanext/datarequests/tests/test_ui_controller.py b/ckanext/datarequests/tests/test_ui_controller.py
index 121558de..b35c5192 100644
--- a/ckanext/datarequests/tests/test_ui_controller.py
+++ b/ckanext/datarequests/tests/test_ui_controller.py
@@ -731,7 +731,7 @@ def _get_action(action):
 
         # Assertions
         expected_datasets = packages
-        controller.tk.render.assert_called_once_with('datarequests/close.html', extra_vars={'datasets': expected_datasets})
+        controller.tk.render.assert_called_once_with('datarequests/close.html')
         self.assertEquals(result, controller.tk.render.return_value)
 
         self.assertIsNone(controller.tk.response.location)

From eb1da7070f11ce4527ffbbaaf58cff47547ff7bc Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Tue, 30 Nov 2021 15:53:19 +1000
Subject: [PATCH 247/276] [QOL-7970] restore assertion of closure datasets

---
 ckanext/datarequests/tests/test_ui_controller.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ckanext/datarequests/tests/test_ui_controller.py b/ckanext/datarequests/tests/test_ui_controller.py
index b35c5192..92c6f065 100644
--- a/ckanext/datarequests/tests/test_ui_controller.py
+++ b/ckanext/datarequests/tests/test_ui_controller.py
@@ -740,6 +740,8 @@ def _get_action(action):
         self.assertEquals(errors_summary, controller.c.errors_summary)
         self.assertEquals(datarequest, controller.c.datarequest)
 
+        self.assertEquals(expected_datasets, controller.c.datasets)
+
     def test_close_post_no_error(self):
         _patch_POST({'accepted_dataset': 'example_ds'})
 

From 7bf06370380007836c9f9b5f9e7125c04c33d02f Mon Sep 17 00:00:00 2001
From: antuarc <carl.antuar@smartservice.qld.gov.au>
Date: Fri, 17 Jun 2022 16:09:21 +1000
Subject: [PATCH 248/276] [QOL-8952] set row limit on package_search even
 without org

- When retrieving datasets to associated with a closed data request, package_search returns only 10 rows by default.
organization_show relies on package_search and thus imposes the same limit. We need more than that, so set the 'rows' parameter.
---
 ckanext/datarequests/controllers/controller_functions.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ckanext/datarequests/controllers/controller_functions.py b/ckanext/datarequests/controllers/controller_functions.py
index 38320278..23efa8b8 100644
--- a/ckanext/datarequests/controllers/controller_functions.py
+++ b/ckanext/datarequests/controllers/controller_functions.py
@@ -274,17 +274,17 @@ def _return_page(errors=None, errors_summary=None):
         errors_summary = errors_summary or {}
         # Get datasets (if the data req belongs to an organization,
         # only the ones that belong to the organization are shown)
+        search_data_dict = {'rows': 500}
         organization_id = c.datarequest.get('organization_id', '')
         if organization_id:
             log.debug("Loading datasets for organisation %s", organization_id)
-            search_data_dict = {'q': 'owner_org:' + organization_id}
+            search_data_dict['q'] = 'owner_org:' + organization_id
         else:
             # FIXME: At this time, only the 500 last modified/created datasets are retrieved.
             # We assume that a user will close their data request with a recently added or modified dataset
             # In the future, we should fix this with an autocomplete form...
             # Expected for CKAN 2.3
             log.debug("Loading first 500 datasets...")
-            search_data_dict = {'rows': 500}
         base_datasets = tk.get_action('package_search')({'ignore_auth': True}, search_data_dict)['results']
 
         log.debug("Dataset candidates for closing data request: %s", base_datasets)

From bc7d8eedec7bc3cc124f33838b2d1588992d05dd Mon Sep 17 00:00:00 2001
From: antuarc <carl.antuar@smartservice.qld.gov.au>
Date: Fri, 17 Jun 2022 16:12:12 +1000
Subject: [PATCH 249/276] [QOL-8952] clean up test config

- update test CKAN to 2.9.5
- provide defaults so local builds are easier
- get ckantoolkit from PyPI instead of GitHub
---
 .ahoy.yml                           |  4 ++--
 .circleci/config.yml                |  5 +----
 .docker/Dockerfile.ckan             |  9 ++++-----
 .docker/scripts/create-test-data.sh |  1 -
 .docker/scripts/doctor.sh           |  2 +-
 .docker/scripts/init.sh             |  2 +-
 .docker/test.ini                    |  1 -
 .env                                |  3 +++
 .github/workflows/test.yml          | 11 +++++++----
 docker-compose.yml                  |  1 +
 requirements-dev.txt                |  5 +++--
 test/features/steps/steps.py        | 24 ++++++++++++------------
 12 files changed, 35 insertions(+), 33 deletions(-)

diff --git a/.ahoy.yml b/.ahoy.yml
index 66fed874..02a53cb8 100644
--- a/.ahoy.yml
+++ b/.ahoy.yml
@@ -121,8 +121,8 @@ commands:
       ahoy start-ckan-job-worker &
       ahoy start-mailmock &
       sleep 5 &&
-      ahoy cli "behave ${*:-test/features}" --tags @smoke && \
-      ahoy cli "behave ${*:-test/features}" || \
+      ahoy cli "behave -k ${*:-test/features}" --tags @smoke && \
+      ahoy cli "behave -k ${*:-test/features}" || \
       [ "${ALLOW_BDD_FAIL:-0}" -eq 1 ]
       ahoy stop-mailmock
       ahoy stop-ckan-job-worker
diff --git a/.circleci/config.yml b/.circleci/config.yml
index cf621ac0..b70b58fc 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -23,10 +23,7 @@ jobs:
           at: /workspace
       - checkout
       - *step_setup_remote_docker
-      - run:
-          command: .circleci/build.sh
-          environment:
-            CKAN_VERSION: 2.8.8
+      - run: .circleci/build.sh
       - run: .circleci/test.sh
       - run:
           name: Process artifacts
diff --git a/.docker/Dockerfile.ckan b/.docker/Dockerfile.ckan
index 676dae98..5fc19a38 100644
--- a/.docker/Dockerfile.ckan
+++ b/.docker/Dockerfile.ckan
@@ -1,6 +1,7 @@
 FROM amazeeio/python:2.7-ckan-21.8.0
 
 ARG SITE_URL=http://ckan:3000/
+ARG CKAN_REPO=ckan/ckan
 ARG CKAN_VERSION=2.8.8
 ENV SITE_URL="${SITE_URL}"
 ENV VENV_DIR=/app/ckan/default
@@ -11,7 +12,7 @@ WORKDIR "${APP_DIR}"
 
 ENV DOCKERIZE_VERSION v0.6.1
 RUN apk add --no-cache curl build-base \
-    && curl -s -L -O https://github.com/jwilder/dockerize/releases/download/${DOCKERIZE_VERSION}/dockerize-alpine-linux-amd64-${DOCKERIZE_VERSION}.tar.gz \
+    && curl -sLO https://github.com/jwilder/dockerize/releases/download/${DOCKERIZE_VERSION}/dockerize-alpine-linux-amd64-${DOCKERIZE_VERSION}.tar.gz \
     && tar -C /usr/local/bin -xzvf dockerize-alpine-linux-amd64-${DOCKERIZE_VERSION}.tar.gz \
     && rm dockerize-alpine-linux-amd64-${DOCKERIZE_VERSION}.tar.gz
 
@@ -19,7 +20,7 @@ RUN apk add --no-cache curl build-base \
 
 RUN . ${VENV_DIR}/bin/activate \
     && pip install setuptools==36.1 \
-    && pip install -e "git+https://github.com/ckan/ckan.git@ckan-${CKAN_VERSION}#egg=ckan" \
+    && pip install -e "git+https://github.com/${CKAN_REPO}.git@ckan-${CKAN_VERSION}#egg=ckan" \
     && sed -i "s/psycopg2==2.4.5/psycopg2==2.7.7/g" "${VENV_DIR}/src/ckan/requirements.txt" \
     && ((test -f "${VENV_DIR}/src/ckan/requirements-py2.txt" && \
         pip install -r "${VENV_DIR}/src/ckan/requirements-py2.txt") || \
@@ -31,15 +32,13 @@ RUN . ${VENV_DIR}/bin/activate \
 
 COPY .docker/test.ini $CKAN_INI
 
-# Add current extension and files.
 COPY . ${APP_DIR}/
 
 COPY .docker/scripts ${APP_DIR}/scripts
 
 COPY .docker/scripts/ckan_cli ${VENV_DIR}/bin/
 
-RUN chmod +x ${APP_DIR}/scripts/*.sh\
-    && chmod +x ${VENV_DIR}/bin/ckan_cli
+RUN chmod +x ${APP_DIR}/scripts/*.sh ${VENV_DIR}/bin/ckan_cli
 
 # Init current extension.
 RUN ${APP_DIR}/scripts/init-ext.sh
diff --git a/.docker/scripts/create-test-data.sh b/.docker/scripts/create-test-data.sh
index 40e20c95..c4a08f6f 100644
--- a/.docker/scripts/create-test-data.sh
+++ b/.docker/scripts/create-test-data.sh
@@ -32,7 +32,6 @@ if [ "$API_KEY" = "None" ]; then
     API_KEY=$(ckan_cli user token add "${CKAN_USER_NAME}" test_setup |grep -v '^API Token created' | tr -d '[:space:]')
 fi
 
-# #
 ##
 # BEGIN: Add sysadmin config values.
 # This needs to be done before closing datarequests as they require the below config values
diff --git a/.docker/scripts/doctor.sh b/.docker/scripts/doctor.sh
index 5bcf065c..d2e81dc8 100755
--- a/.docker/scripts/doctor.sh
+++ b/.docker/scripts/doctor.sh
@@ -75,7 +75,7 @@ main() {
     #      - container:amazeeio-ssh-agent
     #    ```
     # 4. When CLI container starts, the volume is mounted and an entrypoint script
-    #    adds SHH key into agent.
+    #    adds SSH key into agent.
     #    @see https://github.com/amazeeio/lagoon/blob/master/images/php/cli/10-ssh-agent.sh
     #
     #  Running `ssh-add -L` within CLI container should show that the SSH key
diff --git a/.docker/scripts/init.sh b/.docker/scripts/init.sh
index 02fc33d0..959d7426 100755
--- a/.docker/scripts/init.sh
+++ b/.docker/scripts/init.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 ##
-# Initialise CKAN instance.
+# Initialise CKAN data for testing.
 #
 set -e
 
diff --git a/.docker/test.ini b/.docker/test.ini
index 11b394f5..62562044 100644
--- a/.docker/test.ini
+++ b/.docker/test.ini
@@ -97,7 +97,6 @@ ckan.redis.url = redis://redis:6379
 #       Add ``datapusher`` to enable DataPusher
 #       Add ``resource_proxy`` to enable resource proxying and get around the
 #       same origin policy
-# @todo:setup Cleanup the list to use only required plugins.
 ckan.plugins = stats text_view image_view recline_view datastore datarequests
 
 # Define which views should be created by default
diff --git a/.env b/.env
index f6224432..e55f9727 100644
--- a/.env
+++ b/.env
@@ -23,3 +23,6 @@ ALLOW_UNIT_FAIL=0
 
 # Flag to allow BDD tests failures. 0=enforce, 1=ignore
 ALLOW_BDD_FAIL=0
+
+CKAN_REPO=ckan/ckan
+CKAN_VERSION=2.9.5
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index db0fa977..c463d047 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,20 +1,23 @@
 ---
-#based on https://raw.githubusercontent.com/ckan/ckanext-scheming/master/.github/workflows/test.yml
-# alternative https://github.com/ckan/ckan/blob/master/contrib/cookiecutter/ckan_extension/%7B%7Bcookiecutter.project%7D%7D/.github/workflows/test.yml
 name: Tests
-on: [push, pull_request]
+on:
+  push:
+  pull_request:
+    branches:
+      - master
 
 jobs:
   test:
     strategy:
       fail-fast: false
       matrix:
-        ckan-version: [2.8.8, 2.9.4]
+        ckan-version: [2.8.8, 2.9.5]
 
     name: Continuous Integration build on CKAN ${{ matrix.ckan-version }}
     runs-on: ubuntu-latest
     container: integratedexperts/ci-builder
     env:
+      CKAN_REPO: ckan/ckan
       CKAN_VERSION: ${{ matrix.ckan-version }}
 
     steps:
diff --git a/docker-compose.yml b/docker-compose.yml
index fde46592..4871988a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -24,6 +24,7 @@ services:
       dockerfile: .docker/Dockerfile.ckan
       args:
         SITE_URL: "http://${PROJECT}.docker.amazee.io"
+        CKAN_REPO:
         CKAN_VERSION:
     depends_on:
       - postgres
diff --git a/requirements-dev.txt b/requirements-dev.txt
index 313df4d4..bd2e372a 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -3,12 +3,13 @@ behave==1.2.6
 behaving==2.0.0
 Appium-Python-Client<=0.52
 ckanapi==4.3
+ckantoolkit>=0.0.4
 factory-boy==2.12.0
 flake8==3.8.3
 mock
 parameterized==0.8.1
 pytest-ckan
-splinter>=0.13.0
+splinter>=0.13.0,<0.17
 xlrd==1.2.0
 python-magic==0.4.18
 messytables==0.15.2
@@ -16,4 +17,4 @@ progressbar==2.5
 SQLAlchemy>=0.6.6
 requests==2.25.1
 six>=1.15.0
-git+https://github.com/ckan/ckantoolkit@release-0.0.4#egg=ckantoolkit
+
diff --git a/test/features/steps/steps.py b/test/features/steps/steps.py
index a2437d2e..7c633d64 100644
--- a/test/features/steps/steps.py
+++ b/test/features/steps/steps.py
@@ -2,17 +2,17 @@
 from behaving.personas.steps import *  # noqa: F401, F403
 from behaving.web.steps import *  # noqa: F401, F403
 from behaving.web.steps.url import when_i_visit_url
-import random
 import email
 import quopri
+import uuid
 
 
-@step('I go to homepage')
+@step(u'I go to homepage')
 def go_to_home(context):
     when_i_visit_url(context, '/')
 
 
-@step('I log in')
+@step(u'I log in')
 def log_in(context):
     assert context.persona
     context.execute_steps(u"""
@@ -22,7 +22,7 @@ def log_in(context):
     """)
 
 
-@step('I enter my credentials and login')
+@step(u'I enter my credentials and login')
 def submit_login(context):
     assert context.persona
     context.execute_steps(u"""
@@ -33,7 +33,7 @@ def submit_login(context):
     """)
 
 
-@step('I log in and go to datarequest page')
+@stepu('I log in and go to datarequest page')
 def log_in_go_to_datarequest(context):
     assert context.persona
     context.execute_steps(u"""
@@ -42,17 +42,17 @@ def log_in_go_to_datarequest(context):
     """)
 
 
-@step('I go to datarequest page')
+@step(u'I go to datarequest page')
 def go_to_datarequest(context):
     when_i_visit_url(context, '/datarequest')
 
 
-@step('I fill in title with random text')
+@step(u'I fill in title with random text')
 def title_random_text(context):
     assert context.persona
     context.execute_steps(u"""
         When I fill in "title" with "Test Title {0}"
-    """.format(random.randrange(100000)))
+    """.format(uuid.uuid4()))
 
 
 @step(u'I should see the add comment form')
@@ -71,7 +71,7 @@ def comment_form_not_visible(context):
     """)
 
 
-@step('I go to the data requests page')
+@step(u'I go to the data requests page')
 def go_to_data_requests_page(context):
     when_i_visit_url(context, '/datarequest')
 
@@ -150,7 +150,7 @@ def filter_contents(mail):
     assert context.mail.user_messages(address, filter_contents)
 
 
-@step('I log in and go to admin config page')
+@step(u'I log in and go to admin config page')
 def log_in_go_to_admin_config(context):
     assert context.persona
     context.execute_steps(u"""
@@ -159,12 +159,12 @@ def log_in_go_to_admin_config(context):
     """)
 
 
-@step('I go to admin config page')
+@step(u'I go to admin config page')
 def go_to_admin_config(context):
     when_i_visit_url(context, '/ckan-admin/config')
 
 
-@step('I log in and create a datarequest')
+@step(u'I log in and create a datarequest')
 def log_in_create_a_datarequest(context):
     assert context.persona
     context.execute_steps(u"""

From 30bf25775065f7cc52dd2baf8e81b3098298a89c Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Mon, 20 Jun 2022 09:20:05 +1000
Subject: [PATCH 250/276] [QOL-8952] fix test expectation to include 'rows'
 parameter

- also fix Behave step syntax
---
 ckanext/datarequests/controllers/controller_functions.py | 6 +++---
 ckanext/datarequests/tests/test_ui_controller.py         | 2 +-
 test/features/steps/steps.py                             | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ckanext/datarequests/controllers/controller_functions.py b/ckanext/datarequests/controllers/controller_functions.py
index 23efa8b8..061e6249 100644
--- a/ckanext/datarequests/controllers/controller_functions.py
+++ b/ckanext/datarequests/controllers/controller_functions.py
@@ -274,15 +274,15 @@ def _return_page(errors=None, errors_summary=None):
         errors_summary = errors_summary or {}
         # Get datasets (if the data req belongs to an organization,
         # only the ones that belong to the organization are shown)
+        # FIXME: At this time, only the 500 last modified/created datasets are retrieved.
+        # We assume that a user will close their data request with a recently added or modified dataset
+        # In the future, we should fix this with an autocomplete form...
         search_data_dict = {'rows': 500}
         organization_id = c.datarequest.get('organization_id', '')
         if organization_id:
             log.debug("Loading datasets for organisation %s", organization_id)
             search_data_dict['q'] = 'owner_org:' + organization_id
         else:
-            # FIXME: At this time, only the 500 last modified/created datasets are retrieved.
-            # We assume that a user will close their data request with a recently added or modified dataset
-            # In the future, we should fix this with an autocomplete form...
             # Expected for CKAN 2.3
             log.debug("Loading first 500 datasets...")
         base_datasets = tk.get_action('package_search')({'ignore_auth': True}, search_data_dict)['results']
diff --git a/ckanext/datarequests/tests/test_ui_controller.py b/ckanext/datarequests/tests/test_ui_controller.py
index 92c6f065..bac2b48e 100644
--- a/ckanext/datarequests/tests/test_ui_controller.py
+++ b/ckanext/datarequests/tests/test_ui_controller.py
@@ -725,7 +725,7 @@ def _get_action(action):
         show_datarequest.assert_called_once_with(self.expected_context, {'id': datarequest_id})
 
         if organization:
-            package_search.assert_called_once_with({'ignore_auth': True}, {'q': 'owner_org:' + organization})
+            package_search.assert_called_once_with({'ignore_auth': True}, {'q': 'owner_org:' + organization, 'rows': 500})
         else:
             package_search.assert_called_once_with({'ignore_auth': True}, {'rows': 500})
 
diff --git a/test/features/steps/steps.py b/test/features/steps/steps.py
index 7c633d64..4144121c 100644
--- a/test/features/steps/steps.py
+++ b/test/features/steps/steps.py
@@ -33,7 +33,7 @@ def submit_login(context):
     """)
 
 
-@stepu('I log in and go to datarequest page')
+@step(u'I log in and go to datarequest page')
 def log_in_go_to_datarequest(context):
     assert context.persona
     context.execute_steps(u"""

From 37e88627268e7cc978e98a5adcbf8148963cd9d9 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Mon, 20 Jun 2022 09:54:13 +1000
Subject: [PATCH 251/276] [QOL-8952] drop CKAN version from default parameters

---
 .env | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.env b/.env
index e55f9727..8cc7b5bd 100644
--- a/.env
+++ b/.env
@@ -25,4 +25,3 @@ ALLOW_UNIT_FAIL=0
 ALLOW_BDD_FAIL=0
 
 CKAN_REPO=ckan/ckan
-CKAN_VERSION=2.9.5

From 94377215007690fe3fd3b66f90385aaf9864dbe4 Mon Sep 17 00:00:00 2001
From: antuarc <carl.antuar@smartservice.qld.gov.au>
Date: Fri, 8 Jul 2022 14:10:09 +1000
Subject: [PATCH 252/276] [QOL-9055] clean up imports

- Explicitly mark relative imports so Py3 is happy
- Make better use of CKAN toolkit API
---
 ckanext/datarequests/actions.py               | 105 ++++++-----
 ckanext/datarequests/auth.py                  |  15 +-
 .../controllers/controller_functions.py       | 175 +++++++++---------
 ckanext/datarequests/tests/test_actions.py    |   3 +-
 4 files changed, 147 insertions(+), 151 deletions(-)

diff --git a/ckanext/datarequests/actions.py b/ckanext/datarequests/actions.py
index 0af7a7f2..d3f2ed16 100644
--- a/ckanext/datarequests/actions.py
+++ b/ckanext/datarequests/actions.py
@@ -22,16 +22,15 @@
 import cgi
 import db
 import logging
-import validator
-from ckan import model, plugins
-from ckan.common import config
-from ckan.lib import base, mailer
-from ckanext.datarequests import constants
+
+from ckan import model
+from ckan.plugins.toolkit import _, check_access, config, get_action, h, \
+    mail_user, render, ObjectNotFound, ValidationError
+
+from . import constants, validator
 
 
-c = plugins.toolkit.c
 log = logging.getLogger(__name__)
-tk = plugins.toolkit
 
 # Avoid user_show lag
 USERS_CACHE = {}
@@ -42,7 +41,7 @@ def _get_user(user_id):
         if user_id in USERS_CACHE:
             return USERS_CACHE[user_id]
         else:
-            user = tk.get_action('user_show')({'ignore_auth': True}, {'id': user_id})
+            user = get_action('user_show')({'ignore_auth': True}, {'id': user_id})
             USERS_CACHE[user_id] = user
             return user
     except Exception as e:
@@ -51,7 +50,7 @@ def _get_user(user_id):
 
 def _get_organization(organization_id):
     try:
-        organization_show = tk.get_action('organization_show')
+        organization_show = get_action('organization_show')
         return organization_show({'ignore_auth': True}, {'id': organization_id, 'include_users': True})
     except Exception as e:
         log.warn(e)
@@ -59,7 +58,7 @@ def _get_organization(organization_id):
 
 def _get_package(package_id):
     try:
-        package_show = tk.get_action('package_show')
+        package_show = get_action('package_show')
         return package_show({'ignore_auth': True}, {'id': package_id})
     except Exception as e:
         log.warn(e)
@@ -99,7 +98,7 @@ def _dictize_datarequest(datarequest):
     data_dict['followers'] = db.DataRequestFollower.get_datarequest_followers_number(
         datarequest_id=datarequest.id)
 
-    if tk.h.closing_circumstances_enabled:
+    if h.closing_circumstances_enabled:
         data_dict['close_circumstance'] = datarequest.close_circumstance
         data_dict['approx_publishing_date'] = datarequest.approx_publishing_date
 
@@ -115,7 +114,7 @@ def _undictize_datarequest_basic(datarequest, data_dict):
 
 
 def _undictize_datarequest_closing_circumstances(datarequest, data_dict):
-    if tk.h.closing_circumstances_enabled:
+    if h.closing_circumstances_enabled:
         datarequest.close_circumstance = data_dict.get('close_circumstance') or None
         datarequest.approx_publishing_date = data_dict.get('approx_publishing_date') or None
 
@@ -169,10 +168,10 @@ def _send_mail(user_ids, action_type, datarequest):
                 'site_url': config.get('ckan.site_url')
             }
 
-            subject = base.render_jinja2('emails/subjects/{0}.txt'.format(action_type), extra_vars)
-            body = base.render_jinja2('emails/bodies/{0}.txt'.format(action_type), extra_vars)
+            subject = render('emails/subjects/{0}.txt'.format(action_type), extra_vars)
+            body = render('emails/bodies/{0}.txt'.format(action_type), extra_vars)
 
-            mailer.mail_user(user_data, subject, body)
+            mail_user(user_data, subject, body)
 
         except Exception:
             log.exception("Error sending notification to {0}".format(user_id))
@@ -211,7 +210,7 @@ def create_datarequest(context, data_dict):
     db.init_db(model)
 
     # Check access
-    tk.check_access(constants.CREATE_DATAREQUEST, context, data_dict)
+    check_access(constants.CREATE_DATAREQUEST, context, data_dict)
 
     # Validate data
     validator.validate_datarequest(context, data_dict)
@@ -257,18 +256,18 @@ def show_datarequest(context, data_dict):
     datarequest_id = data_dict.get('id', '')
 
     if not datarequest_id:
-        raise tk.ValidationError(tk._('Data Request ID has not been included'))
+        raise ValidationError(_('Data Request ID has not been included'))
 
     # Init the data base
     db.init_db(model)
 
     # Check access
-    tk.check_access(constants.SHOW_DATAREQUEST, context, data_dict)
+    check_access(constants.SHOW_DATAREQUEST, context, data_dict)
 
     # Get the data request
     result = db.DataRequest.get(id=datarequest_id)
     if not result:
-        raise tk.ObjectNotFound(tk._('Data Request %s not found in the data base') % datarequest_id)
+        raise ObjectNotFound(_('Data Request %s not found in the data base') % datarequest_id)
 
     data_req = result[0]
     data_dict = _dictize_datarequest(data_req)
@@ -310,18 +309,18 @@ def update_datarequest(context, data_dict):
     datarequest_id = data_dict.get('id', '')
 
     if not datarequest_id:
-        raise tk.ValidationError(tk._('Data Request ID has not been included'))
+        raise ValidationError(_('Data Request ID has not been included'))
 
     # Init the data base
     db.init_db(model)
 
     # Check access
-    tk.check_access(constants.UPDATE_DATAREQUEST, context, data_dict)
+    check_access(constants.UPDATE_DATAREQUEST, context, data_dict)
 
     # Get the initial data
     result = db.DataRequest.get(id=datarequest_id)
     if not result:
-        raise tk.ObjectNotFound(tk._('Data Request %s not found in the data base') % datarequest_id)
+        raise ObjectNotFound(_('Data Request %s not found in the data base') % datarequest_id)
 
     data_req = result[0]
 
@@ -383,14 +382,14 @@ def list_datarequests(context, data_dict):
     '''
 
     model = context['model']
-    organization_show = tk.get_action('organization_show')
-    user_show = tk.get_action('user_show')
+    organization_show = get_action('organization_show')
+    user_show = get_action('user_show')
 
     # Init the data base
     db.init_db(model)
 
     # Check access
-    tk.check_access(constants.LIST_DATAREQUESTS, context, data_dict)
+    check_access(constants.LIST_DATAREQUESTS, context, data_dict)
 
     # Get the organization
     organization_id = data_dict.get('organization_id', None)
@@ -461,7 +460,7 @@ def list_datarequests(context, data_dict):
         if no_processed_state_facet[state]:
             state_facet.append({
                 'name': state.lower(),
-                'display_name': tk._(state),
+                'display_name': _(state),
                 'count': no_processed_state_facet[state]
             })
 
@@ -502,18 +501,18 @@ def delete_datarequest(context, data_dict):
 
     # Check id
     if not datarequest_id:
-        raise tk.ValidationError(tk._('Data Request ID has not been included'))
+        raise ValidationError(_('Data Request ID has not been included'))
 
     # Init the data base
     db.init_db(model)
 
     # Check access
-    tk.check_access(constants.DELETE_DATAREQUEST, context, data_dict)
+    check_access(constants.DELETE_DATAREQUEST, context, data_dict)
 
     # Get the data request
     result = db.DataRequest.get(id=datarequest_id)
     if not result:
-        raise tk.ObjectNotFound(tk._('Data Request %s not found in the data base') % datarequest_id)
+        raise ObjectNotFound(_('Data Request %s not found in the data base') % datarequest_id)
 
     data_req = result[0]
     session.delete(data_req)
@@ -548,18 +547,18 @@ def close_datarequest(context, data_dict):
 
     # Check id
     if not datarequest_id:
-        raise tk.ValidationError(tk._('Data Request ID has not been included'))
+        raise ValidationError(_('Data Request ID has not been included'))
 
     # Init the data base
     db.init_db(model)
 
     # Check access
-    tk.check_access(constants.CLOSE_DATAREQUEST, context, data_dict)
+    check_access(constants.CLOSE_DATAREQUEST, context, data_dict)
 
     # Get the data request
     result = db.DataRequest.get(id=datarequest_id)
     if not result:
-        raise tk.ObjectNotFound(tk._('Data Request %s not found in the data base') % datarequest_id)
+        raise ObjectNotFound(_('Data Request %s not found in the data base') % datarequest_id)
 
     # Validate data
     validator.validate_datarequest_closing(context, data_dict)
@@ -568,7 +567,7 @@ def close_datarequest(context, data_dict):
 
     # Was the data request previously closed?
     if data_req.closed:
-        raise tk.ValidationError([tk._('This Data Request is already closed')])
+        raise ValidationError([_('This Data Request is already closed')])
 
     data_req.closed = True
     data_req.accepted_dataset_id = data_dict.get('accepted_dataset_id') or None
@@ -611,13 +610,13 @@ def comment_datarequest(context, data_dict):
 
     # Check id
     if not datarequest_id:
-        raise tk.ValidationError([tk._('Data Request ID has not been included')])
+        raise ValidationError([_('Data Request ID has not been included')])
 
     # Init the data base
     db.init_db(model)
 
     # Check access
-    tk.check_access(constants.COMMENT_DATAREQUEST, context, data_dict)
+    check_access(constants.COMMENT_DATAREQUEST, context, data_dict)
 
     # Validate comment
     datarequest_dict = validator.validate_comment(context, data_dict)
@@ -657,18 +656,18 @@ def show_datarequest_comment(context, data_dict):
 
     # Check id
     if not comment_id:
-        raise tk.ValidationError([tk._('Comment ID has not been included')])
+        raise ValidationError([_('Comment ID has not been included')])
 
     # Init the data base
     db.init_db(model)
 
     # Check access
-    tk.check_access(constants.SHOW_DATAREQUEST_COMMENT, context, data_dict)
+    check_access(constants.SHOW_DATAREQUEST_COMMENT, context, data_dict)
 
     # Get comments
     result = db.Comment.get(id=comment_id)
     if not result:
-        raise tk.ObjectNotFound(tk._('Comment %s not found in the data base') % comment_id)
+        raise ObjectNotFound(_('Comment %s not found in the data base') % comment_id)
 
     return _dictize_comment(result[0])
 
@@ -703,7 +702,7 @@ def list_datarequest_comments(context, data_dict):
 
     # Check id
     if not datarequest_id:
-        raise tk.ValidationError(tk._('Data Request ID has not been included'))
+        raise ValidationError(_('Data Request ID has not been included'))
 
     # Init the data base
     db.init_db(model)
@@ -716,7 +715,7 @@ def list_datarequest_comments(context, data_dict):
         desc = True
 
     # Check access
-    tk.check_access(constants.LIST_DATAREQUEST_COMMENTS, context, data_dict)
+    check_access(constants.LIST_DATAREQUEST_COMMENTS, context, data_dict)
 
     # Get comments
     comments_db = db.Comment.get_ordered_by_date(datarequest_id=datarequest_id, desc=desc)
@@ -750,18 +749,18 @@ def update_datarequest_comment(context, data_dict):
     comment_id = data_dict.get('id', '')
 
     if not comment_id:
-        raise tk.ValidationError([tk._('Comment ID has not been included')])
+        raise ValidationError([_('Comment ID has not been included')])
 
     # Init the data base
     db.init_db(model)
 
     # Check access
-    tk.check_access(constants.UPDATE_DATAREQUEST_COMMENT, context, data_dict)
+    check_access(constants.UPDATE_DATAREQUEST_COMMENT, context, data_dict)
 
     # Get the data request
     result = db.Comment.get(id=comment_id)
     if not result:
-        raise tk.ObjectNotFound(tk._('Comment %s not found in the data base') % comment_id)
+        raise ObjectNotFound(_('Comment %s not found in the data base') % comment_id)
 
     comment = result[0]
 
@@ -796,18 +795,18 @@ def delete_datarequest_comment(context, data_dict):
     comment_id = data_dict.get('id', '')
 
     if not comment_id:
-        raise tk.ValidationError([tk._('Comment ID has not been included')])
+        raise ValidationError([_('Comment ID has not been included')])
 
     # Init the data base
     db.init_db(model)
 
     # Check access
-    tk.check_access(constants.DELETE_DATAREQUEST_COMMENT, context, data_dict)
+    check_access(constants.DELETE_DATAREQUEST_COMMENT, context, data_dict)
 
     # Get the comment
     result = db.Comment.get(id=comment_id)
     if not result:
-        raise tk.ObjectNotFound(tk._('Comment %s not found in the data base') % comment_id)
+        raise ObjectNotFound(_('Comment %s not found in the data base') % comment_id)
 
     comment = result[0]
 
@@ -838,24 +837,24 @@ def follow_datarequest(context, data_dict):
     datarequest_id = data_dict.get('id', '')
 
     if not datarequest_id:
-        raise tk.ValidationError([tk._('Data Request ID has not been included')])
+        raise ValidationError([_('Data Request ID has not been included')])
 
     # Init the data base
     db.init_db(model)
 
     # Check access
-    tk.check_access(constants.FOLLOW_DATAREQUEST, context, data_dict)
+    check_access(constants.FOLLOW_DATAREQUEST, context, data_dict)
 
     # Get the data request
     result = db.DataRequest.get(id=datarequest_id)
     if not result:
-        raise tk.ObjectNotFound(tk._('Data Request %s not found in the data base') % datarequest_id)
+        raise ObjectNotFound(_('Data Request %s not found in the data base') % datarequest_id)
 
     # Is already following?
     user_id = context['auth_user_obj'].id
     result = db.DataRequestFollower.get(datarequest_id=datarequest_id, user_id=user_id)
     if result:
-        raise tk.ValidationError([tk._('The user is already following the given Data Request')])
+        raise ValidationError([_('The user is already following the given Data Request')])
 
     # Store the data
     follower = db.DataRequestFollower()
@@ -890,19 +889,19 @@ def unfollow_datarequest(context, data_dict):
     datarequest_id = data_dict.get('id', '')
 
     if not datarequest_id:
-        raise tk.ValidationError([tk._('Data Request ID has not been included')])
+        raise ValidationError([_('Data Request ID has not been included')])
 
     # Init the data base
     db.init_db(model)
 
     # Check access
-    tk.check_access(constants.UNFOLLOW_DATAREQUEST, context, data_dict)
+    check_access(constants.UNFOLLOW_DATAREQUEST, context, data_dict)
 
     # Is already following?
     user_id = context['auth_user_obj'].id
     result = db.DataRequestFollower.get(datarequest_id=datarequest_id, user_id=user_id)
     if not result:
-        raise tk.ObjectNotFound([tk._('The user is not following the given Data Request')])
+        raise ObjectNotFound([_('The user is not following the given Data Request')])
 
     follower = result[0]
 
diff --git a/ckanext/datarequests/auth.py b/ckanext/datarequests/auth.py
index ed231fc6..5bfa7c24 100644
--- a/ckanext/datarequests/auth.py
+++ b/ckanext/datarequests/auth.py
@@ -17,15 +17,16 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with CKAN Data Requests Extension. If not, see <http://www.gnu.org/licenses/>.
 
-import constants
-from ckan.plugins import toolkit as tk
+from ckan.plugins.toolkit import auth_allow_anonymous_access, get_action
+
+from . import constants
 
 
 def create_datarequest(context, data_dict):
     return {'success': True}
 
 
-@tk.auth_allow_anonymous_access
+@auth_allow_anonymous_access
 def show_datarequest(context, data_dict):
     return {'success': True}
 
@@ -33,7 +34,7 @@ def show_datarequest(context, data_dict):
 def auth_if_creator(context, data_dict, show_function):
     # Sometimes data_dict only contains the 'id'
     if 'user_id' not in data_dict:
-        function = tk.get_action(show_function)
+        function = get_action(show_function)
         data_dict = function({'ignore_auth': True}, {'id': data_dict.get('id')})
 
     return {'success': data_dict['user_id'] == context.get('auth_user_obj').id}
@@ -43,7 +44,7 @@ def update_datarequest(context, data_dict):
     return auth_if_creator(context, data_dict, constants.SHOW_DATAREQUEST)
 
 
-@tk.auth_allow_anonymous_access
+@auth_allow_anonymous_access
 def list_datarequests(context, data_dict):
     return {'success': True}
 
@@ -60,13 +61,13 @@ def comment_datarequest(context, data_dict):
     return {'success': True}
 
 
-@tk.auth_allow_anonymous_access
+@auth_allow_anonymous_access
 def list_datarequest_comments(context, data_dict):
     new_data_dict = {'id': data_dict['datarequest_id']}
     return show_datarequest(context, new_data_dict)
 
 
-@tk.auth_allow_anonymous_access
+@auth_allow_anonymous_access
 def show_datarequest_comment(context, data_dict):
     return {'success': True}
 
diff --git a/ckanext/datarequests/controllers/controller_functions.py b/ckanext/datarequests/controllers/controller_functions.py
index 061e6249..349c423d 100644
--- a/ckanext/datarequests/controllers/controller_functions.py
+++ b/ckanext/datarequests/controllers/controller_functions.py
@@ -7,16 +7,16 @@
 
 from six.moves.urllib.parse import urlencode
 
-from ckan import model, plugins
+from ckan import model
 from ckan.lib import helpers
+from ckan.plugins.toolkit import _, abort, c, check_access, get_action, h, redirect_to, render,  url_for, NotAuthorized, ObjectNotFound, ValidationError
+
 from ckanext.datarequests import constants, request_helpers
 
 
 _link = re.compile(r'(?:(https?://)|(www\.))(\S+\b/?)([!"#$%&\'()*+,\-./:;<=>?@[\\\]^_`{|}~]*)(\s|$)', re.I)
 
 log = logging.getLogger(__name__)
-tk = plugins.toolkit
-c = tk.c
 
 
 def _get_errors_summary(errors):
@@ -39,17 +39,17 @@ def url_with_params(url, params):
 
 
 def search_url(params):
-    url = helpers.url_for('datarequest.index')
+    url = url_for('datarequest.index')
     return url_with_params(url, params)
 
 
 def org_datarequest_url(params, id):
-    url = helpers.url_for('datarequest.organization', id=id)
+    url = url_for('datarequest.organization', id=id)
     return url_with_params(url, params)
 
 
 def user_datarequest_url(params, id):
-    url = helpers.url_for('datarequest.user', id=id)
+    url = url_for('datarequest.user', id=id)
     return url_with_params(url, params)
 
 
@@ -100,10 +100,10 @@ def pager_url(state=None, sort=None, q=None, page=None):
         if sort is not None:
             data_dict['sort'] = sort
 
-        tk.check_access(constants.LIST_DATAREQUESTS, context, data_dict)
-        datarequests_list = tk.get_action(constants.LIST_DATAREQUESTS)(context, data_dict)
+        check_access(constants.LIST_DATAREQUESTS, context, data_dict)
+        datarequests_list = get_action(constants.LIST_DATAREQUESTS)(context, data_dict)
 
-        c.filters = [(tk._('Newest'), 'desc'), (tk._('Oldest'), 'asc')]
+        c.filters = [(_('Newest'), 'desc'), (_('Oldest'), 'asc')]
         c.sort = sort
         c.q = q
         c.organization = organization_id
@@ -119,21 +119,21 @@ def pager_url(state=None, sort=None, q=None, page=None):
             items_per_page=limit
         )
         c.facet_titles = {
-            'state': tk._('State'),
+            'state': _('State'),
         }
 
         # Organization facet cannot be shown when the user is viewing an org
         if include_organization_facet is True:
-            c.facet_titles['organization'] = tk._('Organizations')
+            c.facet_titles['organization'] = _('Organizations')
 
-        return tk.render(file_to_render, extra_vars={'user_dict': c.user_dict if hasattr(c, 'user_dict') else None, 'group_type': 'organization'})
+        return render(file_to_render, extra_vars={'user_dict': c.user_dict if hasattr(c, 'user_dict') else None, 'group_type': 'organization'})
     except ValueError as e:
         # This exception should only occur if the page value is not valid
         log.warn(e)
-        tk.abort(400, tk._('"page" parameter must be an integer'))
-    except tk.NotAuthorized as e:
+        return abort(400, _('"page" parameter must be an integer'))
+    except NotAuthorized as e:
         log.warn(e)
-        tk.abort(403, tk._('Unauthorized to list Data Requests'))
+        return abort(403, _('Unauthorized to list Data Requests'))
 
 
 def index():
@@ -152,10 +152,10 @@ def _process_post(action, context):
             data_dict['id'] = request_helpers.get_first_post_param('id', '')
 
         try:
-            result = tk.get_action(action)(context, data_dict)
-            return tk.redirect_to(helpers.url_for('datarequest.show', id=result['id']))
+            result = get_action(action)(context, data_dict)
+            return redirect_to(url_for('datarequest.show', id=result['id']))
 
-        except tk.ValidationError as e:
+        except ValidationError as e:
             log.warn(e)
             # Fill the fields that will display some information in the page
             c.datarequest = {
@@ -178,12 +178,12 @@ def new():
 
     # Check access
     try:
-        tk.check_access(constants.CREATE_DATAREQUEST, context, None)
+        check_access(constants.CREATE_DATAREQUEST, context, None)
         post_result = _process_post(constants.CREATE_DATAREQUEST, context)
-        return post_result or tk.render('datarequests/new.html')
-    except tk.NotAuthorized as e:
+        return post_result or render('datarequests/new.html')
+    except NotAuthorized as e:
         log.warn(e)
-        tk.abort(403, tk._('Unauthorized to create a Data Request'))
+        return abort(403, _('Unauthorized to create a Data Request'))
 
 
 def show(id):
@@ -191,19 +191,18 @@ def show(id):
     context = _get_context()
 
     try:
-        tk.check_access(constants.SHOW_DATAREQUEST, context, data_dict)
-        c.datarequest = tk.get_action(constants.SHOW_DATAREQUEST)(context, data_dict)
+        check_access(constants.SHOW_DATAREQUEST, context, data_dict)
+        c.datarequest = get_action(constants.SHOW_DATAREQUEST)(context, data_dict)
 
         context_ignore_auth = context.copy()
         context_ignore_auth['ignore_auth'] = True
 
-        return tk.render('datarequests/show.html')
-    except tk.ObjectNotFound:
-        tk.abort(404, tk._('Data Request %s not found') % id)
-    except tk.NotAuthorized as e:
+        return render('datarequests/show.html')
+    except ObjectNotFound:
+        return abort(404, _('Data Request %s not found') % id)
+    except NotAuthorized as e:
         log.warn(e)
-        tk.abort(403, tk._('You are not authorized to view the Data Request %s'
-                           % id))
+        return abort(403, _('You are not authorized to view the Data Request %s' % id))
 
 
 def update(id):
@@ -216,18 +215,17 @@ def update(id):
     c.errors_summary = {}
 
     try:
-        tk.check_access(constants.UPDATE_DATAREQUEST, context, data_dict)
-        c.datarequest = tk.get_action(constants.SHOW_DATAREQUEST)(context, data_dict)
+        check_access(constants.UPDATE_DATAREQUEST, context, data_dict)
+        c.datarequest = get_action(constants.SHOW_DATAREQUEST)(context, data_dict)
         c.original_title = c.datarequest.get('title')
         _process_post(constants.UPDATE_DATAREQUEST, context)
-        return tk.render('datarequests/edit.html')
-    except tk.ObjectNotFound as e:
+        return render('datarequests/edit.html')
+    except ObjectNotFound as e:
         log.warn(e)
-        tk.abort(404, tk._('Data Request %s not found') % id)
-    except tk.NotAuthorized as e:
+        return abort(404, _('Data Request %s not found') % id)
+    except NotAuthorized as e:
         log.warn(e)
-        tk.abort(403, tk._('You are not authorized to update the Data Request %s'
-                           % id))
+        return abort(403, _('You are not authorized to update the Data Request %s' % id))
 
 
 def delete(id):
@@ -235,29 +233,28 @@ def delete(id):
     context = _get_context()
 
     try:
-        tk.check_access(constants.DELETE_DATAREQUEST, context, data_dict)
-        datarequest = tk.get_action(constants.DELETE_DATAREQUEST)(context, data_dict)
-        helpers.flash_notice(tk._('Data Request %s has been deleted') % datarequest.get('title', ''))
-        return tk.redirect_to(helpers.url_for('datarequest.index'))
-    except tk.ObjectNotFound as e:
+        check_access(constants.DELETE_DATAREQUEST, context, data_dict)
+        datarequest = get_action(constants.DELETE_DATAREQUEST)(context, data_dict)
+        h.flash_notice(_('Data Request %s has been deleted') % datarequest.get('title', ''))
+        return redirect_to(url_for('datarequest.index'))
+    except ObjectNotFound as e:
         log.warn(e)
-        tk.abort(404, tk._('Data Request %s not found') % id)
-    except tk.NotAuthorized as e:
+        return abort(404, _('Data Request %s not found') % id)
+    except NotAuthorized as e:
         log.warn(e)
-        tk.abort(403, tk._('You are not authorized to delete the Data Request %s'
-                           % id))
+        return abort(403, _('You are not authorized to delete the Data Request %s' % id))
 
 
 def organization(id):
     context = _get_context()
-    c.group_dict = tk.get_action('organization_show')(context, {'id': id})
+    c.group_dict = get_action('organization_show')(context, {'id': id})
     url_func = functools.partial(org_datarequest_url, id=id)
     return _show_index(None, id, False, url_func, 'organization/datarequests.html')
 
 
 def user(id):
     context = _get_context()
-    c.user_dict = tk.get_action('user_show')(context, {'id': id, 'include_num_followers': True})
+    c.user_dict = get_action('user_show')(context, {'id': id, 'include_num_followers': True})
     url_func = functools.partial(user_datarequest_url, id=id)
     return _show_index(id, request_helpers.get_first_query_param('organization', ''), True, url_func, 'user/datarequests.html')
 
@@ -285,7 +282,7 @@ def _return_page(errors=None, errors_summary=None):
         else:
             # Expected for CKAN 2.3
             log.debug("Loading first 500 datasets...")
-        base_datasets = tk.get_action('package_search')({'ignore_auth': True}, search_data_dict)['results']
+        base_datasets = get_action('package_search')({'ignore_auth': True}, search_data_dict)['results']
 
         log.debug("Dataset candidates for closing data request: %s", base_datasets)
         c.datasets = []
@@ -294,43 +291,42 @@ def _return_page(errors=None, errors_summary=None):
         for dataset in base_datasets:
             c.datasets.append({'name': dataset.get('name'), 'title': dataset.get('title')})
 
-        if tk.h.closing_circumstances_enabled:
+        if h.closing_circumstances_enabled:
             # This is required so the form can set the currently selected close_circumstance option in the select dropdown
             c.datarequest['close_circumstance'] = request_helpers.get_first_post_param('close_circumstance', None)
 
-        return tk.render('datarequests/close.html')
+        return render('datarequests/close.html')
 
     try:
-        tk.check_access(constants.CLOSE_DATAREQUEST, context, data_dict)
-        c.datarequest = tk.get_action(constants.SHOW_DATAREQUEST)(context, data_dict)
+        check_access(constants.CLOSE_DATAREQUEST, context, data_dict)
+        c.datarequest = get_action(constants.SHOW_DATAREQUEST)(context, data_dict)
 
         if c.datarequest.get('closed', False):
-            tk.abort(403, tk._('This data request is already closed'))
+            return abort(403, _('This data request is already closed'))
         elif request_helpers.get_post_params():
             data_dict = {}
             data_dict['accepted_dataset_id'] = request_helpers.get_first_post_param('accepted_dataset_id', None)
             data_dict['id'] = id
-            if tk.h.closing_circumstances_enabled:
+            if h.closing_circumstances_enabled:
                 data_dict['close_circumstance'] = request_helpers.get_first_post_param('close_circumstance', None)
                 data_dict['approx_publishing_date'] = request_helpers.get_first_post_param('approx_publishing_date', None)
                 data_dict['condition'] = request_helpers.get_first_post_param('condition', None)
 
-            tk.get_action(constants.CLOSE_DATAREQUEST)(context, data_dict)
-            return tk.redirect_to(helpers.url_for('datarequest.show', id=data_dict['id']))
+            get_action(constants.CLOSE_DATAREQUEST)(context, data_dict)
+            return redirect_to(url_for('datarequest.show', id=data_dict['id']))
         else:   # GET
             return _return_page()
 
-    except tk.ValidationError as e:     # Accepted Dataset is not valid
+    except ValidationError as e:     # Accepted Dataset is not valid
         log.warn(e)
         errors_summary = _get_errors_summary(e.error_dict)
         return _return_page(e.error_dict, errors_summary)
-    except tk.ObjectNotFound as e:
+    except ObjectNotFound as e:
         log.warn(e)
-        tk.abort(404, tk._('Data Request %s not found') % id)
-    except tk.NotAuthorized as e:
+        return abort(404, _('Data Request %s not found') % id)
+    except NotAuthorized as e:
         log.warn(e)
-        tk.abort(403, tk._('You are not authorized to close the Data Request %s'
-                           % id))
+        return abort(403, _('You are not authorized to close the Data Request %s' % id))
 
 
 def comment(id):
@@ -338,10 +334,10 @@ def comment(id):
         context = _get_context()
         data_dict_comment_list = {'datarequest_id': id}
         data_dict_dr_show = {'id': id}
-        tk.check_access(constants.LIST_DATAREQUEST_COMMENTS, context, data_dict_comment_list)
+        check_access(constants.LIST_DATAREQUEST_COMMENTS, context, data_dict_comment_list)
 
         # Raises 404 Not Found if the data request does not exist
-        c.datarequest = tk.get_action(constants.SHOW_DATAREQUEST)(context, data_dict_dr_show)
+        c.datarequest = get_action(constants.SHOW_DATAREQUEST)(context, data_dict_dr_show)
 
         comment_text = request_helpers.get_first_post_param('comment', '')
         comment_id = request_helpers.get_first_post_param('comment-id', '')
@@ -357,25 +353,25 @@ def comment(id):
 
             try:
                 comment_data_dict = {'datarequest_id': id, 'comment': comment_text, 'id': comment_id}
-                updated_comment = tk.get_action(action)(context, comment_data_dict)
+                updated_comment = get_action(action)(context, comment_data_dict)
 
                 if not comment_id:
-                    flash_message = tk._('Comment has been published')
+                    flash_message = _('Comment has been published')
                 else:
-                    flash_message = tk._('Comment has been updated')
+                    flash_message = _('Comment has been updated')
 
-                helpers.flash_notice(flash_message)
+                h.flash_notice(flash_message)
 
-            except tk.NotAuthorized as e:
+            except NotAuthorized as e:
                 log.warn(e)
-                tk.abort(403, tk._('You are not authorized to %s' % action_text))
-            except tk.ValidationError as e:
+                return abort(403, _('You are not authorized to %s' % action_text))
+            except ValidationError as e:
                 log.warn(e)
                 c.errors = e.error_dict
                 c.errors_summary = _get_errors_summary(c.errors)
-            except tk.ObjectNotFound as e:
+            except ObjectNotFound as e:
                 log.warn(e)
-                tk.abort(404, tk._(str(e)))
+                return abort(404, _(str(e)))
             # Other exceptions are not expected. Otherwise, the request will fail.
 
             # This is required to scroll the user to the appropriate comment
@@ -390,34 +386,33 @@ def comment(id):
         }
         # Comments should be retrieved once that the comment has been created
         get_comments_data_dict = {'datarequest_id': id}
-        c.comments = tk.get_action(constants.LIST_DATAREQUEST_COMMENTS)(context, get_comments_data_dict)
+        c.comments = get_action(constants.LIST_DATAREQUEST_COMMENTS)(context, get_comments_data_dict)
 
-        return tk.render('datarequests/comment.html')
+        return render('datarequests/comment.html')
 
-    except tk.ObjectNotFound as e:
+    except ObjectNotFound as e:
         log.warn(e)
-        tk.abort(404, tk._('Data Request %s not found' % id))
+        return abort(404, _('Data Request %s not found' % id))
 
-    except tk.NotAuthorized as e:
+    except NotAuthorized as e:
         log.warn(e)
-        tk.abort(403, tk._('You are not authorized to list the comments of the Data Request %s'
-                           % id))
+        return abort(403, _('You are not authorized to list the comments of the Data Request %s' % id))
 
 
 def delete_comment(datarequest_id, comment_id):
     try:
         context = _get_context()
         data_dict = {'id': comment_id}
-        tk.check_access(constants.DELETE_DATAREQUEST_COMMENT, context, data_dict)
-        tk.get_action(constants.DELETE_DATAREQUEST_COMMENT)(context, data_dict)
-        helpers.flash_notice(tk._('Comment has been deleted'))
-        return tk.redirect_to(helpers.url_for('datarequest.comment', id=datarequest_id))
-    except tk.ObjectNotFound as e:
+        check_access(constants.DELETE_DATAREQUEST_COMMENT, context, data_dict)
+        get_action(constants.DELETE_DATAREQUEST_COMMENT)(context, data_dict)
+        h.flash_notice(_('Comment has been deleted'))
+        return redirect_to(url_for('datarequest.comment', id=datarequest_id))
+    except ObjectNotFound as e:
         log.warn(e)
-        tk.abort(404, tk._('Comment %s not found') % comment_id)
-    except tk.NotAuthorized as e:
+        return abort(404, _('Comment %s not found') % comment_id)
+    except NotAuthorized as e:
         log.warn(e)
-        tk.abort(403, tk._('You are not authorized to delete this comment'))
+        return abort(403, _('You are not authorized to delete this comment'))
 
 
 def follow(datarequest_id):
diff --git a/ckanext/datarequests/tests/test_actions.py b/ckanext/datarequests/tests/test_actions.py
index e4af8808..eb8817f0 100644
--- a/ckanext/datarequests/tests/test_actions.py
+++ b/ckanext/datarequests/tests/test_actions.py
@@ -19,12 +19,13 @@
 
 from ckanext.datarequests import actions, constants
 import datetime
-import test_actions_data as test_data
 import unittest
 
 from mock import MagicMock, patch
 from parameterized import parameterized
 
+from . import test_actions_data as test_data
+
 
 class ActionsTest(unittest.TestCase):
 

From 72f2feca7caabfcab38bc3e354383b853b51024e Mon Sep 17 00:00:00 2001
From: antuarc <carl.antuar@smartservice.qld.gov.au>
Date: Fri, 8 Jul 2022 14:13:10 +1000
Subject: [PATCH 253/276] [QOL-9055] explicitly mark relative db import

---
 ckanext/datarequests/actions.py | 3 +--
 ckanext/datarequests/helpers.py | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/ckanext/datarequests/actions.py b/ckanext/datarequests/actions.py
index d3f2ed16..a83284bc 100644
--- a/ckanext/datarequests/actions.py
+++ b/ckanext/datarequests/actions.py
@@ -20,14 +20,13 @@
 
 import datetime
 import cgi
-import db
 import logging
 
 from ckan import model
 from ckan.plugins.toolkit import _, check_access, config, get_action, h, \
     mail_user, render, ObjectNotFound, ValidationError
 
-from . import constants, validator
+from . import constants, db, validator
 
 
 log = logging.getLogger(__name__)
diff --git a/ckanext/datarequests/helpers.py b/ckanext/datarequests/helpers.py
index 845e2660..875341b6 100644
--- a/ckanext/datarequests/helpers.py
+++ b/ckanext/datarequests/helpers.py
@@ -17,12 +17,12 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with CKAN Data Requests Extension. If not, see <http://www.gnu.org/licenses/>.
 
-import db
-
 from ckan import model
 from ckan.common import c
 import ckan.plugins.toolkit as tk
 
+from . import db
+
 
 def get_comments_number(datarequest_id):
     # DB should be intialized

From 6552e23e109617d3bd9d56c0e5720060d800c870 Mon Sep 17 00:00:00 2001
From: antuarc <carl.antuar@smartservice.qld.gov.au>
Date: Fri, 8 Jul 2022 15:05:18 +1000
Subject: [PATCH 254/276] [QOL-9055] revert interactions with toolkit API to
 fix test mocks

---
 .../controllers/controller_functions.py       | 161 +++++++++---------
 .../datarequests/tests/test_ui_controller.py  |  30 ++--
 2 files changed, 96 insertions(+), 95 deletions(-)

diff --git a/ckanext/datarequests/controllers/controller_functions.py b/ckanext/datarequests/controllers/controller_functions.py
index 349c423d..79729f44 100644
--- a/ckanext/datarequests/controllers/controller_functions.py
+++ b/ckanext/datarequests/controllers/controller_functions.py
@@ -9,7 +9,8 @@
 
 from ckan import model
 from ckan.lib import helpers
-from ckan.plugins.toolkit import _, abort, c, check_access, get_action, h, redirect_to, render,  url_for, NotAuthorized, ObjectNotFound, ValidationError
+from ckan.plugins import toolkit as tk
+from ckan.plugins.toolkit import c, h
 
 from ckanext.datarequests import constants, request_helpers
 
@@ -39,23 +40,23 @@ def url_with_params(url, params):
 
 
 def search_url(params):
-    url = url_for('datarequest.index')
+    url = tk.url_for('datarequest.index')
     return url_with_params(url, params)
 
 
 def org_datarequest_url(params, id):
-    url = url_for('datarequest.organization', id=id)
+    url = tk.url_for('datarequest.organization', id=id)
     return url_with_params(url, params)
 
 
 def user_datarequest_url(params, id):
-    url = url_for('datarequest.user', id=id)
+    url = tk.url_for('datarequest.user', id=id)
     return url_with_params(url, params)
 
 
 def _get_context():
     return {'model': model, 'session': model.Session,
-            'user': c.user, 'auth_user_obj': c.userobj}
+            'user': tk.c.user, 'auth_user_obj': c.userobj}
 
 
 def _show_index(user_id, organization_id, include_organization_facet, url_func, file_to_render):
@@ -100,10 +101,10 @@ def pager_url(state=None, sort=None, q=None, page=None):
         if sort is not None:
             data_dict['sort'] = sort
 
-        check_access(constants.LIST_DATAREQUESTS, context, data_dict)
-        datarequests_list = get_action(constants.LIST_DATAREQUESTS)(context, data_dict)
+        tk.check_access(constants.LIST_DATAREQUESTS, context, data_dict)
+        datarequests_list = tk.get_action(constants.LIST_DATAREQUESTS)(context, data_dict)
 
-        c.filters = [(_('Newest'), 'desc'), (_('Oldest'), 'asc')]
+        c.filters = [(tk._('Newest'), 'desc'), (tk._('Oldest'), 'asc')]
         c.sort = sort
         c.q = q
         c.organization = organization_id
@@ -119,21 +120,21 @@ def pager_url(state=None, sort=None, q=None, page=None):
             items_per_page=limit
         )
         c.facet_titles = {
-            'state': _('State'),
+            'state': tk._('State'),
         }
 
         # Organization facet cannot be shown when the user is viewing an org
         if include_organization_facet is True:
-            c.facet_titles['organization'] = _('Organizations')
+            c.facet_titles['organization'] = tk._('Organizations')
 
-        return render(file_to_render, extra_vars={'user_dict': c.user_dict if hasattr(c, 'user_dict') else None, 'group_type': 'organization'})
+        return tk.render(file_to_render, extra_vars={'user_dict': c.user_dict if hasattr(c, 'user_dict') else None, 'group_type': 'organization'})
     except ValueError as e:
         # This exception should only occur if the page value is not valid
         log.warn(e)
-        return abort(400, _('"page" parameter must be an integer'))
-    except NotAuthorized as e:
+        return tk.abort(400, tk._('"page" parameter must be an integer'))
+    except tk.NotAuthorized as e:
         log.warn(e)
-        return abort(403, _('Unauthorized to list Data Requests'))
+        return tk.abort(403, tk._('Unauthorized to list Data Requests'))
 
 
 def index():
@@ -152,10 +153,10 @@ def _process_post(action, context):
             data_dict['id'] = request_helpers.get_first_post_param('id', '')
 
         try:
-            result = get_action(action)(context, data_dict)
-            return redirect_to(url_for('datarequest.show', id=result['id']))
+            result = tk.get_action(action)(context, data_dict)
+            return tk.redirect_to(tk.url_for('datarequest.show', id=result['id']))
 
-        except ValidationError as e:
+        except tk.ValidationError as e:
             log.warn(e)
             # Fill the fields that will display some information in the page
             c.datarequest = {
@@ -178,12 +179,12 @@ def new():
 
     # Check access
     try:
-        check_access(constants.CREATE_DATAREQUEST, context, None)
+        tk.check_access(constants.CREATE_DATAREQUEST, context, None)
         post_result = _process_post(constants.CREATE_DATAREQUEST, context)
         return post_result or render('datarequests/new.html')
-    except NotAuthorized as e:
+    except tk.NotAuthorized as e:
         log.warn(e)
-        return abort(403, _('Unauthorized to create a Data Request'))
+        return tk.abort(403, tk._('Unauthorized to create a Data Request'))
 
 
 def show(id):
@@ -191,18 +192,18 @@ def show(id):
     context = _get_context()
 
     try:
-        check_access(constants.SHOW_DATAREQUEST, context, data_dict)
-        c.datarequest = get_action(constants.SHOW_DATAREQUEST)(context, data_dict)
+        tk.check_access(constants.SHOW_DATAREQUEST, context, data_dict)
+        c.datarequest = tk.get_action(constants.SHOW_DATAREQUEST)(context, data_dict)
 
         context_ignore_auth = context.copy()
         context_ignore_auth['ignore_auth'] = True
 
-        return render('datarequests/show.html')
-    except ObjectNotFound:
-        return abort(404, _('Data Request %s not found') % id)
-    except NotAuthorized as e:
+        return tk.render('datarequests/show.html')
+    except tk.ObjectNotFound:
+        return tk.abort(404, tk._('Data Request %s not found') % id)
+    except tk.NotAuthorized as e:
         log.warn(e)
-        return abort(403, _('You are not authorized to view the Data Request %s' % id))
+        return tk.abort(403, tk._('You are not authorized to view the Data Request %s' % id))
 
 
 def update(id):
@@ -215,17 +216,17 @@ def update(id):
     c.errors_summary = {}
 
     try:
-        check_access(constants.UPDATE_DATAREQUEST, context, data_dict)
-        c.datarequest = get_action(constants.SHOW_DATAREQUEST)(context, data_dict)
+        tk.check_access(constants.UPDATE_DATAREQUEST, context, data_dict)
+        c.datarequest = tk.get_action(constants.SHOW_DATAREQUEST)(context, data_dict)
         c.original_title = c.datarequest.get('title')
         _process_post(constants.UPDATE_DATAREQUEST, context)
-        return render('datarequests/edit.html')
-    except ObjectNotFound as e:
+        return tk.render('datarequests/edit.html')
+    except tk.ObjectNotFound as e:
         log.warn(e)
-        return abort(404, _('Data Request %s not found') % id)
-    except NotAuthorized as e:
+        return tk.abort(404, tk._('Data Request %s not found') % id)
+    except tk.NotAuthorized as e:
         log.warn(e)
-        return abort(403, _('You are not authorized to update the Data Request %s' % id))
+        return tk.abort(403, tk._('You are not authorized to update the Data Request %s' % id))
 
 
 def delete(id):
@@ -233,28 +234,28 @@ def delete(id):
     context = _get_context()
 
     try:
-        check_access(constants.DELETE_DATAREQUEST, context, data_dict)
-        datarequest = get_action(constants.DELETE_DATAREQUEST)(context, data_dict)
-        h.flash_notice(_('Data Request %s has been deleted') % datarequest.get('title', ''))
-        return redirect_to(url_for('datarequest.index'))
-    except ObjectNotFound as e:
+        tk.check_access(constants.DELETE_DATAREQUEST, context, data_dict)
+        datarequest = tk.get_action(constants.DELETE_DATAREQUEST)(context, data_dict)
+        h.flash_notice(tk._('Data Request %s has been deleted') % datarequest.get('title', ''))
+        return tk.redirect_to(tk.url_for('datarequest.index'))
+    except tk.ObjectNotFound as e:
         log.warn(e)
-        return abort(404, _('Data Request %s not found') % id)
-    except NotAuthorized as e:
+        return tk.abort(404, tk._('Data Request %s not found') % id)
+    except tk.NotAuthorized as e:
         log.warn(e)
-        return abort(403, _('You are not authorized to delete the Data Request %s' % id))
+        return tk.abort(403, tk._('You are not authorized to delete the Data Request %s' % id))
 
 
 def organization(id):
     context = _get_context()
-    c.group_dict = get_action('organization_show')(context, {'id': id})
+    c.group_dict = tk.get_action('organization_show')(context, {'id': id})
     url_func = functools.partial(org_datarequest_url, id=id)
     return _show_index(None, id, False, url_func, 'organization/datarequests.html')
 
 
 def user(id):
     context = _get_context()
-    c.user_dict = get_action('user_show')(context, {'id': id, 'include_num_followers': True})
+    c.user_dict = tk.get_action('user_show')(context, {'id': id, 'include_num_followers': True})
     url_func = functools.partial(user_datarequest_url, id=id)
     return _show_index(id, request_helpers.get_first_query_param('organization', ''), True, url_func, 'user/datarequests.html')
 
@@ -282,7 +283,7 @@ def _return_page(errors=None, errors_summary=None):
         else:
             # Expected for CKAN 2.3
             log.debug("Loading first 500 datasets...")
-        base_datasets = get_action('package_search')({'ignore_auth': True}, search_data_dict)['results']
+        base_datasets = tk.get_action('package_search')({'ignore_auth': True}, search_data_dict)['results']
 
         log.debug("Dataset candidates for closing data request: %s", base_datasets)
         c.datasets = []
@@ -295,14 +296,14 @@ def _return_page(errors=None, errors_summary=None):
             # This is required so the form can set the currently selected close_circumstance option in the select dropdown
             c.datarequest['close_circumstance'] = request_helpers.get_first_post_param('close_circumstance', None)
 
-        return render('datarequests/close.html')
+        return tk.render('datarequests/close.html')
 
     try:
-        check_access(constants.CLOSE_DATAREQUEST, context, data_dict)
-        c.datarequest = get_action(constants.SHOW_DATAREQUEST)(context, data_dict)
+        tk.check_access(constants.CLOSE_DATAREQUEST, context, data_dict)
+        c.datarequest = tk.get_action(constants.SHOW_DATAREQUEST)(context, data_dict)
 
         if c.datarequest.get('closed', False):
-            return abort(403, _('This data request is already closed'))
+            return tk.abort(403, tk._('This data request is already closed'))
         elif request_helpers.get_post_params():
             data_dict = {}
             data_dict['accepted_dataset_id'] = request_helpers.get_first_post_param('accepted_dataset_id', None)
@@ -312,21 +313,21 @@ def _return_page(errors=None, errors_summary=None):
                 data_dict['approx_publishing_date'] = request_helpers.get_first_post_param('approx_publishing_date', None)
                 data_dict['condition'] = request_helpers.get_first_post_param('condition', None)
 
-            get_action(constants.CLOSE_DATAREQUEST)(context, data_dict)
-            return redirect_to(url_for('datarequest.show', id=data_dict['id']))
+            tk.get_action(constants.CLOSE_DATAREQUEST)(context, data_dict)
+            return tk.redirect_to(tk.url_for('datarequest.show', id=data_dict['id']))
         else:   # GET
             return _return_page()
 
-    except ValidationError as e:     # Accepted Dataset is not valid
+    except tk.ValidationError as e:     # Accepted Dataset is not valid
         log.warn(e)
         errors_summary = _get_errors_summary(e.error_dict)
         return _return_page(e.error_dict, errors_summary)
-    except ObjectNotFound as e:
+    except tk.ObjectNotFound as e:
         log.warn(e)
-        return abort(404, _('Data Request %s not found') % id)
-    except NotAuthorized as e:
+        return tk.abort(404, tk._('Data Request %s not found') % id)
+    except tk.NotAuthorized as e:
         log.warn(e)
-        return abort(403, _('You are not authorized to close the Data Request %s' % id))
+        return tk.abort(403, tk._('You are not authorized to close the Data Request %s' % id))
 
 
 def comment(id):
@@ -334,10 +335,10 @@ def comment(id):
         context = _get_context()
         data_dict_comment_list = {'datarequest_id': id}
         data_dict_dr_show = {'id': id}
-        check_access(constants.LIST_DATAREQUEST_COMMENTS, context, data_dict_comment_list)
+        tk.check_access(constants.LIST_DATAREQUEST_COMMENTS, context, data_dict_comment_list)
 
         # Raises 404 Not Found if the data request does not exist
-        c.datarequest = get_action(constants.SHOW_DATAREQUEST)(context, data_dict_dr_show)
+        c.datarequest = tk.get_action(constants.SHOW_DATAREQUEST)(context, data_dict_dr_show)
 
         comment_text = request_helpers.get_first_post_param('comment', '')
         comment_id = request_helpers.get_first_post_param('comment-id', '')
@@ -353,25 +354,25 @@ def comment(id):
 
             try:
                 comment_data_dict = {'datarequest_id': id, 'comment': comment_text, 'id': comment_id}
-                updated_comment = get_action(action)(context, comment_data_dict)
+                updated_comment = tk.get_action(action)(context, comment_data_dict)
 
                 if not comment_id:
-                    flash_message = _('Comment has been published')
+                    flash_message = tk._('Comment has been published')
                 else:
-                    flash_message = _('Comment has been updated')
+                    flash_message = tk._('Comment has been updated')
 
                 h.flash_notice(flash_message)
 
-            except NotAuthorized as e:
+            except tk.NotAuthorized as e:
                 log.warn(e)
-                return abort(403, _('You are not authorized to %s' % action_text))
-            except ValidationError as e:
+                return tk.abort(403, tk._('You are not authorized to %s' % action_text))
+            except tk.ValidationError as e:
                 log.warn(e)
                 c.errors = e.error_dict
                 c.errors_summary = _get_errors_summary(c.errors)
-            except ObjectNotFound as e:
+            except tk.ObjectNotFound as e:
                 log.warn(e)
-                return abort(404, _(str(e)))
+                return tk.abort(404, tk._(str(e)))
             # Other exceptions are not expected. Otherwise, the request will fail.
 
             # This is required to scroll the user to the appropriate comment
@@ -386,33 +387,33 @@ def comment(id):
         }
         # Comments should be retrieved once that the comment has been created
         get_comments_data_dict = {'datarequest_id': id}
-        c.comments = get_action(constants.LIST_DATAREQUEST_COMMENTS)(context, get_comments_data_dict)
+        c.comments = tk.get_action(constants.LIST_DATAREQUEST_COMMENTS)(context, get_comments_data_dict)
 
-        return render('datarequests/comment.html')
+        return tk.render('datarequests/comment.html')
 
-    except ObjectNotFound as e:
+    except tk.ObjectNotFound as e:
         log.warn(e)
-        return abort(404, _('Data Request %s not found' % id))
+        return tk.abort(404, tk._('Data Request %s not found' % id))
 
-    except NotAuthorized as e:
+    except tk.NotAuthorized as e:
         log.warn(e)
-        return abort(403, _('You are not authorized to list the comments of the Data Request %s' % id))
+        return tk.abort(403, tk._('You are not authorized to list the comments of the Data Request %s' % id))
 
 
 def delete_comment(datarequest_id, comment_id):
     try:
         context = _get_context()
         data_dict = {'id': comment_id}
-        check_access(constants.DELETE_DATAREQUEST_COMMENT, context, data_dict)
-        get_action(constants.DELETE_DATAREQUEST_COMMENT)(context, data_dict)
-        h.flash_notice(_('Comment has been deleted'))
-        return redirect_to(url_for('datarequest.comment', id=datarequest_id))
-    except ObjectNotFound as e:
+        tk.check_access(constants.DELETE_DATAREQUEST_COMMENT, context, data_dict)
+        tk.get_action(constants.DELETE_DATAREQUEST_COMMENT)(context, data_dict)
+        h.flash_notice(tk._('Comment has been deleted'))
+        return tk.redirect_to(tk.url_for('datarequest.comment', id=datarequest_id))
+    except tk.ObjectNotFound as e:
         log.warn(e)
-        return abort(404, _('Comment %s not found') % comment_id)
-    except NotAuthorized as e:
+        return tk.abort(404, tk._('Comment %s not found') % comment_id)
+    except tk.NotAuthorized as e:
         log.warn(e)
-        return abort(403, _('You are not authorized to delete this comment'))
+        return tk.abort(403, tk._('You are not authorized to delete this comment'))
 
 
 def follow(datarequest_id):
diff --git a/ckanext/datarequests/tests/test_ui_controller.py b/ckanext/datarequests/tests/test_ui_controller.py
index bac2b48e..0be3ac06 100644
--- a/ckanext/datarequests/tests/test_ui_controller.py
+++ b/ckanext/datarequests/tests/test_ui_controller.py
@@ -215,9 +215,9 @@ def test_new_post_content(self, authorized, validation_error):
                 self.assertEquals({}, controller.c.errors)
                 self.assertEquals({}, controller.c.errors_summary)
                 self.assertEquals({}, controller.c.datarequest)
-                controller.helpers.url_for.assert_called_once_with(
+                controller.tk.url_for.assert_called_once_with(
                     'datarequest.show', id=datarequest_id)
-                controller.tk.redirect_to.assert_called_once_with(controller.helpers.url_for.return_value)
+                controller.tk.redirect_to.assert_called_once_with(controller.tk.url_for.return_value)
         else:
             controller.tk.abort.assert_called_once_with(403, 'Unauthorized to create a Data Request')
             self.assertEquals(0, controller.tk.render.call_count)
@@ -425,9 +425,9 @@ def _get_action(action):
                 self.assertEquals({}, controller.c.errors)
                 self.assertEquals({}, controller.c.errors_summary)
                 self.assertEquals(original_dr, controller.c.datarequest)
-                controller.helpers.url_for.assert_called_once_with(
+                controller.tk.url_for.assert_called_once_with(
                     'datarequest.show', id=datarequest_id)
-                controller.tk.redirect_to.assert_called_once_with(controller.helpers.url_for.return_value)
+                controller.tk.redirect_to.assert_called_once_with(controller.tk.url_for.return_value)
         else:
             controller.tk.abort.assert_called_once_with(403, 'You are not authorized to update the Data Request %s' % datarequest_id)
             self.assertEquals(0, controller.tk.render.call_count)
@@ -558,7 +558,7 @@ def _get_action(action):
                 return list_datarequests
 
         controller.tk.get_action.side_effect = _get_action
-        controller.helpers.url_for.return_value = base_url
+        controller.tk.url_for.return_value = base_url
 
         # Call the function
         function = getattr(controller, func)
@@ -608,15 +608,15 @@ def _get_action(action):
         self.assertEquals("%s?%ssort=%s&page=%d" % (base_url, query_param, expected_sort, silly_page),
                           page_arguments['url'](q=query, page=silly_page))
 
-        # When URL function is called, helpers.url_for is called to get the final URL
+        # When URL function is called, tk.url_for is called to get the final URL
         if func == INDEX_FUNCTION:
-            controller.helpers.url_for.assert_called_once_with(
+            controller.tk.url_for.assert_called_once_with(
                 'datarequest.index')
         elif func == ORGANIZATION_DATAREQUESTS_FUNCTION:
-            controller.helpers.url_for.assert_called_once_with(
+            controller.tk.url_for.assert_called_once_with(
                 'datarequest.organization', id=organization)
         elif func == USER_DATAREQUESTS_FUNCTION:
-            controller.helpers.url_for.assert_called_once_with(
+            controller.tk.url_for.assert_called_once_with(
                 'datarequest.user', id=user)
 
         # Check the facets
@@ -668,9 +668,9 @@ def test_delete(self):
             'Data Request %s has been deleted' % datarequest.get('title')))
 
         # Redirection
-        controller.helpers.url_for.assert_called_once_with(
+        controller.tk.url_for.assert_called_once_with(
             'datarequest.index')
-        controller.tk.redirect_to.assert_called_once_with(controller.helpers.url_for.return_value)
+        controller.tk.redirect_to.assert_called_once_with(controller.tk.url_for.return_value)
 
     ######################################################################
     ################################ CLOSE ###############################
@@ -762,9 +762,9 @@ def _get_action(action):
         result = controller.close(datarequest_id)
 
         # Checks
-        controller.helpers.url_for.assert_called_once_with(
+        controller.tk.url_for.assert_called_once_with(
             'datarequest.show', id=datarequest_id)
-        controller.tk.redirect_to.assert_called_once_with(controller.helpers.url_for.return_value)
+        controller.tk.redirect_to.assert_called_once_with(controller.tk.url_for.return_value)
         self.assertIsNotNone(result)
 
     @parameterized.expand([
@@ -974,9 +974,9 @@ def test_delete_comment(self):
         delete_datarequest_comment.assert_called_once_with(self.expected_context, {'id': comment_id})
 
         # Check redirection
-        controller.helpers.url_for.assert_called_once_with(
+        controller.tk.url_for.assert_called_once_with(
             'datarequest.comment', id=datarequest_id)
-        controller.tk.redirect_to.assert_called_once_with(controller.helpers.url_for.return_value)
+        controller.tk.redirect_to.assert_called_once_with(controller.tk.url_for.return_value)
 
     ######################################################################
     ########################## FOLLOW/UNFOLLOW ###########################

From d56429948a96a43690064675ca1d4de3160568d8 Mon Sep 17 00:00:00 2001
From: antuarc <carl.antuar@smartservice.qld.gov.au>
Date: Fri, 8 Jul 2022 15:09:11 +1000
Subject: [PATCH 255/276] [QOL-9055] mark test module to enable relative
 imports

---
 ckanext/datarequests/tests/__init__.py | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 ckanext/datarequests/tests/__init__.py

diff --git a/ckanext/datarequests/tests/__init__.py b/ckanext/datarequests/tests/__init__.py
new file mode 100644
index 00000000..e69de29b

From ffd1cfa806322fb5d49d6e6f0b627af80c9f6582 Mon Sep 17 00:00:00 2001
From: antuarc <carl.antuar@smartservice.qld.gov.au>
Date: Fri, 8 Jul 2022 15:10:28 +1000
Subject: [PATCH 256/276] [QOL-9055] oops restore 'tk' reference to render call

---
 ckanext/datarequests/controllers/controller_functions.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ckanext/datarequests/controllers/controller_functions.py b/ckanext/datarequests/controllers/controller_functions.py
index 79729f44..3313e2c3 100644
--- a/ckanext/datarequests/controllers/controller_functions.py
+++ b/ckanext/datarequests/controllers/controller_functions.py
@@ -181,7 +181,7 @@ def new():
     try:
         tk.check_access(constants.CREATE_DATAREQUEST, context, None)
         post_result = _process_post(constants.CREATE_DATAREQUEST, context)
-        return post_result or render('datarequests/new.html')
+        return post_result or tk.render('datarequests/new.html')
     except tk.NotAuthorized as e:
         log.warn(e)
         return tk.abort(403, tk._('Unauthorized to create a Data Request'))

From 902dff58f17c32ed2bd63b50dc532873f4a0e987 Mon Sep 17 00:00:00 2001
From: antuarc <carl.antuar@smartservice.qld.gov.au>
Date: Fri, 8 Jul 2022 15:35:03 +1000
Subject: [PATCH 257/276] [QOL-9055] revert toolkit access to fix tests

---
 ckanext/datarequests/actions.py | 97 +++++++++++++++++----------------
 1 file changed, 49 insertions(+), 48 deletions(-)

diff --git a/ckanext/datarequests/actions.py b/ckanext/datarequests/actions.py
index a83284bc..62d76286 100644
--- a/ckanext/datarequests/actions.py
+++ b/ckanext/datarequests/actions.py
@@ -23,8 +23,9 @@
 import logging
 
 from ckan import model
-from ckan.plugins.toolkit import _, check_access, config, get_action, h, \
-    mail_user, render, ObjectNotFound, ValidationError
+from ckan.lib import mailer
+from ckan.plugins import toolkit as tk
+from ckan.plugins.toolkit import h
 
 from . import constants, db, validator
 
@@ -40,7 +41,7 @@ def _get_user(user_id):
         if user_id in USERS_CACHE:
             return USERS_CACHE[user_id]
         else:
-            user = get_action('user_show')({'ignore_auth': True}, {'id': user_id})
+            user = tk.get_action('user_show')({'ignore_auth': True}, {'id': user_id})
             USERS_CACHE[user_id] = user
             return user
     except Exception as e:
@@ -49,7 +50,7 @@ def _get_user(user_id):
 
 def _get_organization(organization_id):
     try:
-        organization_show = get_action('organization_show')
+        organization_show = tk.get_action('organization_show')
         return organization_show({'ignore_auth': True}, {'id': organization_id, 'include_users': True})
     except Exception as e:
         log.warn(e)
@@ -57,7 +58,7 @@ def _get_organization(organization_id):
 
 def _get_package(package_id):
     try:
-        package_show = get_action('package_show')
+        package_show = tk.get_action('package_show')
         return package_show({'ignore_auth': True}, {'id': package_id})
     except Exception as e:
         log.warn(e)
@@ -163,14 +164,14 @@ def _send_mail(user_ids, action_type, datarequest):
             extra_vars = {
                 'datarequest': datarequest,
                 'user': user_data,
-                'site_title': config.get('ckan.site_title'),
-                'site_url': config.get('ckan.site_url')
+                'site_title': tk.config.get('ckan.site_title'),
+                'site_url': tk.config.get('ckan.site_url')
             }
 
-            subject = render('emails/subjects/{0}.txt'.format(action_type), extra_vars)
-            body = render('emails/bodies/{0}.txt'.format(action_type), extra_vars)
+            subject = tk.render('emails/subjects/{0}.txt'.format(action_type), extra_vars)
+            body = tk.render('emails/bodies/{0}.txt'.format(action_type), extra_vars)
 
-            mail_user(user_data, subject, body)
+            mailer.mail_user(user_data, subject, body)
 
         except Exception:
             log.exception("Error sending notification to {0}".format(user_id))
@@ -209,7 +210,7 @@ def create_datarequest(context, data_dict):
     db.init_db(model)
 
     # Check access
-    check_access(constants.CREATE_DATAREQUEST, context, data_dict)
+    tk.check_access(constants.CREATE_DATAREQUEST, context, data_dict)
 
     # Validate data
     validator.validate_datarequest(context, data_dict)
@@ -255,18 +256,18 @@ def show_datarequest(context, data_dict):
     datarequest_id = data_dict.get('id', '')
 
     if not datarequest_id:
-        raise ValidationError(_('Data Request ID has not been included'))
+        raise tk.ValidationError(tk._('Data Request ID has not been included'))
 
     # Init the data base
     db.init_db(model)
 
     # Check access
-    check_access(constants.SHOW_DATAREQUEST, context, data_dict)
+    tk.check_access(constants.SHOW_DATAREQUEST, context, data_dict)
 
     # Get the data request
     result = db.DataRequest.get(id=datarequest_id)
     if not result:
-        raise ObjectNotFound(_('Data Request %s not found in the data base') % datarequest_id)
+        raise tk.ObjectNotFound(tk._('Data Request %s not found in the data base') % datarequest_id)
 
     data_req = result[0]
     data_dict = _dictize_datarequest(data_req)
@@ -308,18 +309,18 @@ def update_datarequest(context, data_dict):
     datarequest_id = data_dict.get('id', '')
 
     if not datarequest_id:
-        raise ValidationError(_('Data Request ID has not been included'))
+        raise tk.ValidationError(tk._('Data Request ID has not been included'))
 
     # Init the data base
     db.init_db(model)
 
     # Check access
-    check_access(constants.UPDATE_DATAREQUEST, context, data_dict)
+    tk.check_access(constants.UPDATE_DATAREQUEST, context, data_dict)
 
     # Get the initial data
     result = db.DataRequest.get(id=datarequest_id)
     if not result:
-        raise ObjectNotFound(_('Data Request %s not found in the data base') % datarequest_id)
+        raise tk.ObjectNotFound(tk._('Data Request %s not found in the data base') % datarequest_id)
 
     data_req = result[0]
 
@@ -381,14 +382,14 @@ def list_datarequests(context, data_dict):
     '''
 
     model = context['model']
-    organization_show = get_action('organization_show')
-    user_show = get_action('user_show')
+    organization_show = tk.get_action('organization_show')
+    user_show = tk.get_action('user_show')
 
     # Init the data base
     db.init_db(model)
 
     # Check access
-    check_access(constants.LIST_DATAREQUESTS, context, data_dict)
+    tk.check_access(constants.LIST_DATAREQUESTS, context, data_dict)
 
     # Get the organization
     organization_id = data_dict.get('organization_id', None)
@@ -459,7 +460,7 @@ def list_datarequests(context, data_dict):
         if no_processed_state_facet[state]:
             state_facet.append({
                 'name': state.lower(),
-                'display_name': _(state),
+                'display_name': tk._(state),
                 'count': no_processed_state_facet[state]
             })
 
@@ -500,18 +501,18 @@ def delete_datarequest(context, data_dict):
 
     # Check id
     if not datarequest_id:
-        raise ValidationError(_('Data Request ID has not been included'))
+        raise tk.ValidationError(tk._('Data Request ID has not been included'))
 
     # Init the data base
     db.init_db(model)
 
     # Check access
-    check_access(constants.DELETE_DATAREQUEST, context, data_dict)
+    tk.check_access(constants.DELETE_DATAREQUEST, context, data_dict)
 
     # Get the data request
     result = db.DataRequest.get(id=datarequest_id)
     if not result:
-        raise ObjectNotFound(_('Data Request %s not found in the data base') % datarequest_id)
+        raise tk.ObjectNotFound(tk._('Data Request %s not found in the data base') % datarequest_id)
 
     data_req = result[0]
     session.delete(data_req)
@@ -546,18 +547,18 @@ def close_datarequest(context, data_dict):
 
     # Check id
     if not datarequest_id:
-        raise ValidationError(_('Data Request ID has not been included'))
+        raise tk.ValidationError(tk._('Data Request ID has not been included'))
 
     # Init the data base
     db.init_db(model)
 
     # Check access
-    check_access(constants.CLOSE_DATAREQUEST, context, data_dict)
+    tk.check_access(constants.CLOSE_DATAREQUEST, context, data_dict)
 
     # Get the data request
     result = db.DataRequest.get(id=datarequest_id)
     if not result:
-        raise ObjectNotFound(_('Data Request %s not found in the data base') % datarequest_id)
+        raise tk.ObjectNotFound(tk._('Data Request %s not found in the data base') % datarequest_id)
 
     # Validate data
     validator.validate_datarequest_closing(context, data_dict)
@@ -566,7 +567,7 @@ def close_datarequest(context, data_dict):
 
     # Was the data request previously closed?
     if data_req.closed:
-        raise ValidationError([_('This Data Request is already closed')])
+        raise tk.ValidationError([tk._('This Data Request is already closed')])
 
     data_req.closed = True
     data_req.accepted_dataset_id = data_dict.get('accepted_dataset_id') or None
@@ -609,13 +610,13 @@ def comment_datarequest(context, data_dict):
 
     # Check id
     if not datarequest_id:
-        raise ValidationError([_('Data Request ID has not been included')])
+        raise tk.ValidationError([tk._('Data Request ID has not been included')])
 
     # Init the data base
     db.init_db(model)
 
     # Check access
-    check_access(constants.COMMENT_DATAREQUEST, context, data_dict)
+    tk.check_access(constants.COMMENT_DATAREQUEST, context, data_dict)
 
     # Validate comment
     datarequest_dict = validator.validate_comment(context, data_dict)
@@ -655,18 +656,18 @@ def show_datarequest_comment(context, data_dict):
 
     # Check id
     if not comment_id:
-        raise ValidationError([_('Comment ID has not been included')])
+        raise tk.ValidationError([tk._('Comment ID has not been included')])
 
     # Init the data base
     db.init_db(model)
 
     # Check access
-    check_access(constants.SHOW_DATAREQUEST_COMMENT, context, data_dict)
+    tk.check_access(constants.SHOW_DATAREQUEST_COMMENT, context, data_dict)
 
     # Get comments
     result = db.Comment.get(id=comment_id)
     if not result:
-        raise ObjectNotFound(_('Comment %s not found in the data base') % comment_id)
+        raise tk.ObjectNotFound(tk._('Comment %s not found in the data base') % comment_id)
 
     return _dictize_comment(result[0])
 
@@ -701,7 +702,7 @@ def list_datarequest_comments(context, data_dict):
 
     # Check id
     if not datarequest_id:
-        raise ValidationError(_('Data Request ID has not been included'))
+        raise tk.ValidationError(tk._('Data Request ID has not been included'))
 
     # Init the data base
     db.init_db(model)
@@ -714,7 +715,7 @@ def list_datarequest_comments(context, data_dict):
         desc = True
 
     # Check access
-    check_access(constants.LIST_DATAREQUEST_COMMENTS, context, data_dict)
+    tk.check_access(constants.LIST_DATAREQUEST_COMMENTS, context, data_dict)
 
     # Get comments
     comments_db = db.Comment.get_ordered_by_date(datarequest_id=datarequest_id, desc=desc)
@@ -748,18 +749,18 @@ def update_datarequest_comment(context, data_dict):
     comment_id = data_dict.get('id', '')
 
     if not comment_id:
-        raise ValidationError([_('Comment ID has not been included')])
+        raise tk.ValidationError([tk._('Comment ID has not been included')])
 
     # Init the data base
     db.init_db(model)
 
     # Check access
-    check_access(constants.UPDATE_DATAREQUEST_COMMENT, context, data_dict)
+    tk.check_access(constants.UPDATE_DATAREQUEST_COMMENT, context, data_dict)
 
     # Get the data request
     result = db.Comment.get(id=comment_id)
     if not result:
-        raise ObjectNotFound(_('Comment %s not found in the data base') % comment_id)
+        raise tk.ObjectNotFound(tk._('Comment %s not found in the data base') % comment_id)
 
     comment = result[0]
 
@@ -794,18 +795,18 @@ def delete_datarequest_comment(context, data_dict):
     comment_id = data_dict.get('id', '')
 
     if not comment_id:
-        raise ValidationError([_('Comment ID has not been included')])
+        raise tk.ValidationError([tk._('Comment ID has not been included')])
 
     # Init the data base
     db.init_db(model)
 
     # Check access
-    check_access(constants.DELETE_DATAREQUEST_COMMENT, context, data_dict)
+    tk.check_access(constants.DELETE_DATAREQUEST_COMMENT, context, data_dict)
 
     # Get the comment
     result = db.Comment.get(id=comment_id)
     if not result:
-        raise ObjectNotFound(_('Comment %s not found in the data base') % comment_id)
+        raise tk.ObjectNotFound(tk._('Comment %s not found in the data base') % comment_id)
 
     comment = result[0]
 
@@ -836,24 +837,24 @@ def follow_datarequest(context, data_dict):
     datarequest_id = data_dict.get('id', '')
 
     if not datarequest_id:
-        raise ValidationError([_('Data Request ID has not been included')])
+        raise tk.ValidationError([tk._('Data Request ID has not been included')])
 
     # Init the data base
     db.init_db(model)
 
     # Check access
-    check_access(constants.FOLLOW_DATAREQUEST, context, data_dict)
+    tk.check_access(constants.FOLLOW_DATAREQUEST, context, data_dict)
 
     # Get the data request
     result = db.DataRequest.get(id=datarequest_id)
     if not result:
-        raise ObjectNotFound(_('Data Request %s not found in the data base') % datarequest_id)
+        raise tk.ObjectNotFound(tk._('Data Request %s not found in the data base') % datarequest_id)
 
     # Is already following?
     user_id = context['auth_user_obj'].id
     result = db.DataRequestFollower.get(datarequest_id=datarequest_id, user_id=user_id)
     if result:
-        raise ValidationError([_('The user is already following the given Data Request')])
+        raise tk.ValidationError([tk._('The user is already following the given Data Request')])
 
     # Store the data
     follower = db.DataRequestFollower()
@@ -888,19 +889,19 @@ def unfollow_datarequest(context, data_dict):
     datarequest_id = data_dict.get('id', '')
 
     if not datarequest_id:
-        raise ValidationError([_('Data Request ID has not been included')])
+        raise tk.ValidationError([tk._('Data Request ID has not been included')])
 
     # Init the data base
     db.init_db(model)
 
     # Check access
-    check_access(constants.UNFOLLOW_DATAREQUEST, context, data_dict)
+    tk.check_access(constants.UNFOLLOW_DATAREQUEST, context, data_dict)
 
     # Is already following?
     user_id = context['auth_user_obj'].id
     result = db.DataRequestFollower.get(datarequest_id=datarequest_id, user_id=user_id)
     if not result:
-        raise ObjectNotFound([_('The user is not following the given Data Request')])
+        raise tk.ObjectNotFound([tk._('The user is not following the given Data Request')])
 
     follower = result[0]
 

From c8771a37ac4998933f5b10a7f10ddd7812241746 Mon Sep 17 00:00:00 2001
From: antuarc <carl.antuar@smartservice.qld.gov.au>
Date: Fri, 8 Jul 2022 15:54:55 +1000
Subject: [PATCH 258/276] [QOL-9055] drop obsolete test mocks

---
 ckanext/datarequests/tests/test_ui_controller.py | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/ckanext/datarequests/tests/test_ui_controller.py b/ckanext/datarequests/tests/test_ui_controller.py
index 0be3ac06..c62955d4 100644
--- a/ckanext/datarequests/tests/test_ui_controller.py
+++ b/ckanext/datarequests/tests/test_ui_controller.py
@@ -45,9 +45,6 @@ def _patch_POST(params):
 class UIControllerTest(unittest.TestCase):
 
     def setUp(self):
-        self._plugins = controller.plugins
-        controller.plugins = MagicMock()
-
         self._tk = controller.tk
         controller.tk = MagicMock()
         controller.tk._ = self._tk._
@@ -67,8 +64,6 @@ def setUp(self):
         self._helpers = controller.helpers
         controller.helpers = MagicMock()
 
-        self._datarequests_per_page = controller.constants.DATAREQUESTS_PER_PAGE
-
         self.expected_context = {
             'model': controller.model,
             'session': controller.model.Session,
@@ -77,13 +72,11 @@ def setUp(self):
         }
 
     def tearDown(self):
-        controller.plugins = self._plugins
         controller.tk = self._tk
         controller.c = self._c
         request_helpers.request = self._request
         controller.model = self._model
         controller.helpers = self._helpers
-        controller.constants.DATAREQUESTS_PER_PAGE = self._datarequests_per_page
 
     ######################################################################
     ################################# AUX ################################

From 3a59b1fb5cc7a3798a5ceae796e607972196e864 Mon Sep 17 00:00:00 2001
From: antuarc <carl.antuar@smartservice.qld.gov.au>
Date: Fri, 8 Jul 2022 15:56:50 +1000
Subject: [PATCH 259/276] [QOL-9055] drop obsolete test mock

---
 ckanext/datarequests/tests/test_actions.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/ckanext/datarequests/tests/test_actions.py b/ckanext/datarequests/tests/test_actions.py
index eb8817f0..7e3a4509 100644
--- a/ckanext/datarequests/tests/test_actions.py
+++ b/ckanext/datarequests/tests/test_actions.py
@@ -38,9 +38,6 @@ def setUp(self):
         actions.tk.ValidationError = self._tk.ValidationError
         actions.tk.h.closing_circumstances_enabled = False
 
-        self._c = actions.c
-        actions.c = MagicMock()
-
         self._db = actions.db
         actions.db = MagicMock()
 
@@ -60,7 +57,6 @@ def setUp(self):
     def tearDown(self):
         # Unmock
         actions.tk = self._tk
-        actions.c = self._c
         actions.db = self._db
         actions.validator = self._validator
         actions.datetime = self._datetime

From 345ad339688635d43745f154d7b30645487764d6 Mon Sep 17 00:00:00 2001
From: antuarc <carl.antuar@smartservice.qld.gov.au>
Date: Fri, 8 Jul 2022 16:25:25 +1000
Subject: [PATCH 260/276] [QOL-9055] update mockery of helpers

- 'h' is now imported into 'actions' at the top level
---
 ckanext/datarequests/tests/test_actions.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ckanext/datarequests/tests/test_actions.py b/ckanext/datarequests/tests/test_actions.py
index 7e3a4509..5e9ce43b 100644
--- a/ckanext/datarequests/tests/test_actions.py
+++ b/ckanext/datarequests/tests/test_actions.py
@@ -36,7 +36,7 @@ def setUp(self):
         actions.USERS_CACHE = {}
         actions.tk.ObjectNotFound = self._tk.ObjectNotFound
         actions.tk.ValidationError = self._tk.ValidationError
-        actions.tk.h.closing_circumstances_enabled = False
+        actions.h.closing_circumstances_enabled = False
 
         self._db = actions.db
         actions.db = MagicMock()

From 0cd5506b9dd55e9d94ddcb56bb5b8dbd318f05cb Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Tue, 12 Jul 2022 14:03:32 +1000
Subject: [PATCH 261/276] [QOL-9055] adjust test mocks

- mock toolkit.render instead of base.render_jinja2
---
 ckanext/datarequests/actions.py            |  6 +++---
 ckanext/datarequests/tests/test_actions.py | 20 ++++++++++----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/ckanext/datarequests/actions.py b/ckanext/datarequests/actions.py
index 62d76286..a95fdd3a 100644
--- a/ckanext/datarequests/actions.py
+++ b/ckanext/datarequests/actions.py
@@ -25,7 +25,7 @@
 from ckan import model
 from ckan.lib import mailer
 from ckan.plugins import toolkit as tk
-from ckan.plugins.toolkit import h
+from ckan.plugins.toolkit import h, config
 
 from . import constants, db, validator
 
@@ -164,8 +164,8 @@ def _send_mail(user_ids, action_type, datarequest):
             extra_vars = {
                 'datarequest': datarequest,
                 'user': user_data,
-                'site_title': tk.config.get('ckan.site_title'),
-                'site_url': tk.config.get('ckan.site_url')
+                'site_title': config.get('ckan.site_title'),
+                'site_url': config.get('ckan.site_url')
             }
 
             subject = tk.render('emails/subjects/{0}.txt'.format(action_type), extra_vars)
diff --git a/ckanext/datarequests/tests/test_actions.py b/ckanext/datarequests/tests/test_actions.py
index 5e9ce43b..d9a8efaa 100644
--- a/ckanext/datarequests/tests/test_actions.py
+++ b/ckanext/datarequests/tests/test_actions.py
@@ -232,9 +232,9 @@ def test_get_involved_users_org(self, list_comments_mock):
 
     @patch('ckanext.datarequests.actions.config')
     @patch('ckanext.datarequests.actions.mailer')
-    @patch('ckanext.datarequests.actions.base')
+    @patch('ckanext.datarequests.actions.tk')
     @patch('ckanext.datarequests.actions.model')
-    def test_send_mail_two_users(self, model_mock, base_mock, mailer_mock, config_mock):
+    def test_send_mail_two_users(self, model_mock, toolkit_mock, mailer_mock, config_mock):
 
         subject = 'SUBJECT'
         body = 'BODY'
@@ -243,7 +243,7 @@ def test_send_mail_two_users(self, model_mock, base_mock, mailer_mock, config_mo
         get_users_side_effect = [user1, user2]
         model_mock.User.get.side_effect = get_users_side_effect
         config_mock.get.side_effect = lambda x: x
-        base_mock.render_jinja2.side_effect = lambda x, y: body if 'bodies' in x else subject
+        toolkit_mock.render.side_effect = lambda x, y: body if 'bodies' in x else subject
 
         users = ['user1', 'user2']
         action_type = 'new_datarequest'
@@ -258,23 +258,23 @@ def test_send_mail_two_users(self, model_mock, base_mock, mailer_mock, config_mo
                 'site_title': 'ckan.site_title',
                 'site_url': 'ckan.site_url'
             }
-            base_mock.render_jinja2.assert_any_call('emails/subjects/{0}.txt'.format(action_type), extra_args)
-            base_mock.render_jinja2.assert_any_call('emails/bodies/{0}.txt'.format(action_type), extra_args)
+            toolkit_mock.render.assert_any_call('emails/subjects/{0}.txt'.format(action_type), extra_args)
+            toolkit_mock.render.assert_any_call('emails/bodies/{0}.txt'.format(action_type), extra_args)
 
             mailer_mock.mail_user.assert_any_call(get_users_side_effect[i], subject, body)
 
     @patch('ckanext.datarequests.actions.config')
     @patch('ckanext.datarequests.actions.mailer')
-    @patch('ckanext.datarequests.actions.base')
+    @patch('ckanext.datarequests.actions.tk')
     @patch('ckanext.datarequests.actions.model')
-    def test_send_mail_exception_no_risen(self, model_mock, base_mock, mailer_mock, config_mock):
+    def test_send_mail_exception_no_risen(self, model_mock, toolkit_mock, mailer_mock, config_mock):
 
         subject = 'SUBJECT'
         body = 'BODY'
         user = MagicMock()
         model_mock.User.get.return_value = user
         config_mock.get.side_effect = lambda x: x
-        base_mock.render_jinja2.side_effect = lambda x, y: body if 'bodies' in x else subject
+        toolkit_mock.render.side_effect = lambda x, y: body if 'bodies' in x else subject
         mailer_mock.mail_user.side_effect = Exception()
 
         users = ['user1']
@@ -289,8 +289,8 @@ def test_send_mail_exception_no_risen(self, model_mock, base_mock, mailer_mock,
             'site_title': 'ckan.site_title',
             'site_url': 'ckan.site_url'
         }
-        base_mock.render_jinja2.assert_any_call('emails/subjects/{0}.txt'.format(action_type), extra_args)
-        base_mock.render_jinja2.assert_any_call('emails/bodies/{0}.txt'.format(action_type), extra_args)
+        toolkit_mock.render.assert_any_call('emails/subjects/{0}.txt'.format(action_type), extra_args)
+        toolkit_mock.render.assert_any_call('emails/bodies/{0}.txt'.format(action_type), extra_args)
 
         mailer_mock.mail_user.assert_any_call(user, subject, body)
 

From 19dc15ae597025e72e5240bd31c84ed413081e12 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Tue, 12 Jul 2022 14:07:01 +1000
Subject: [PATCH 262/276] [QOL-9055] adjust test mocks

- mock 'get_action' function directly instead of via 'tk'
---
 ckanext/datarequests/tests/test_auth.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/ckanext/datarequests/tests/test_auth.py b/ckanext/datarequests/tests/test_auth.py
index 1bc27a00..e1b59e84 100644
--- a/ckanext/datarequests/tests/test_auth.py
+++ b/ckanext/datarequests/tests/test_auth.py
@@ -52,11 +52,11 @@
 class AuthTest(unittest.TestCase):
 
     def setUp(self):
-        self._tk = auth.tk
-        auth.tk = MagicMock()
+        self._get_action = auth.get_action
+        auth.get_action = MagicMock()
 
     def tearDown(self):
-        auth.tk = self._tk
+        auth.get_action = self._get_action
 
     @parameterized.expand([
         # Data Requests
@@ -130,7 +130,7 @@ def test_update_delete_datarequest(self, function, show_function, user_id, reque
 
         if action_called:
             initial_request_data = {'id': request_data['id']}
-            xyz_show = auth.tk.get_action.return_value
+            xyz_show = auth.get_action.return_value
             xyz_show.return_value = request_data
         else:
             initial_request_data = request_data
@@ -139,8 +139,8 @@ def test_update_delete_datarequest(self, function, show_function, user_id, reque
         self.assertEquals(expected_result, result)
 
         if action_called:
-            auth.tk.get_action.assert_called_once_with(show_function)
-            xyz_show = auth.tk.get_action.return_value
+            auth.get_action.assert_called_once_with(show_function)
+            xyz_show = auth.get_action.return_value
             xyz_show.assert_called_once_with({'ignore_auth': True}, {'id': request_data['id']})
         else:
-            self.assertEquals(0, auth.tk.get_action.call_count)
+            self.assertEquals(0, auth.get_action.call_count)

From d7184ed8ddc5e82c0151dc130f7bcb49156953c2 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Tue, 12 Jul 2022 14:12:05 +1000
Subject: [PATCH 263/276] [QOL-9055] use 'c' import instead of double-handling

---
 ckanext/datarequests/controllers/controller_functions.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ckanext/datarequests/controllers/controller_functions.py b/ckanext/datarequests/controllers/controller_functions.py
index 3313e2c3..e7fc0bb0 100644
--- a/ckanext/datarequests/controllers/controller_functions.py
+++ b/ckanext/datarequests/controllers/controller_functions.py
@@ -56,7 +56,7 @@ def user_datarequest_url(params, id):
 
 def _get_context():
     return {'model': model, 'session': model.Session,
-            'user': tk.c.user, 'auth_user_obj': c.userobj}
+            'user': c.user, 'auth_user_obj': c.userobj}
 
 
 def _show_index(user_id, organization_id, include_organization_facet, url_func, file_to_render):

From 24b2f55bbc49b0ffacafbf9755bfe7b226a19d11 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Tue, 12 Jul 2022 14:12:30 +1000
Subject: [PATCH 264/276] [QOL-9055] clean up scenario tests

---
 test/features/comments.feature | 2 +-
 test/features/homepage.feature | 2 +-
 test/features/login.feature    | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/test/features/comments.feature b/test/features/comments.feature
index 2dc931da..b595226d 100644
--- a/test/features/comments.feature
+++ b/test/features/comments.feature
@@ -10,7 +10,7 @@ Feature: Comments
         Then I should see "This is a test comment" within 10 seconds
 
     @comment-delete
-    Scenario: When an Sysadmin visits a data request, they can delete a comment and should not see text 'This comment was deleted.'
+    Scenario: When an admin visits a data request, they can delete a comment and should not see text 'This comment was deleted.'
         Given "SysAdmin" as the persona
         When I log in
         And I go to data request "Test Request" comments
diff --git a/test/features/homepage.feature b/test/features/homepage.feature
index b7b1f37a..fdf4cae7 100644
--- a/test/features/homepage.feature
+++ b/test/features/homepage.feature
@@ -4,4 +4,4 @@ Feature: Homepage
     @homepage
     Scenario: Smoke test to ensure Homepage is accessible
         When I go to homepage
-        Then I take a screenshot
+
diff --git a/test/features/login.feature b/test/features/login.feature
index ca7a0e55..6c6ad78f 100644
--- a/test/features/login.feature
+++ b/test/features/login.feature
@@ -4,4 +4,3 @@ Feature: Login
     Scenario: Smoke test to ensure Login step works
         Given "SysAdmin" as the persona
         When I log in
-        Then I take a screenshot

From ae1894dc8083c0d0aec98a161984ea5b45cc85be Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Tue, 12 Jul 2022 14:40:59 +1000
Subject: [PATCH 265/276] [QOL-9055] fix controller tests to handle a response
 on abort

- Returning something is necessary under Flask
---
 .../datarequests/tests/test_ui_controller.py    | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/ckanext/datarequests/tests/test_ui_controller.py b/ckanext/datarequests/tests/test_ui_controller.py
index c62955d4..49b613f9 100644
--- a/ckanext/datarequests/tests/test_ui_controller.py
+++ b/ckanext/datarequests/tests/test_ui_controller.py
@@ -51,6 +51,7 @@ def setUp(self):
         controller.tk.ValidationError = self._tk.ValidationError
         controller.tk.NotAuthorized = self._tk.NotAuthorized
         controller.tk.ObjectNotFound = self._tk.ObjectNotFound
+        controller.tk.abort.side_effect = 'aborted'
 
         self._c = controller.c
         controller.c = MagicMock()
@@ -93,7 +94,7 @@ def _test_not_authorized(self, function, action, check_access_func):
         controller.tk.check_access.assert_called_once_with(check_access_func, self.expected_context, {'id': datarequest_id})
         controller.tk.abort.assert_called_once_with(403, 'You are not authorized to %s the Data Request %s' % (action, datarequest_id))
         self.assertEquals(0, controller.tk.render.call_count)
-        self.assertIsNone(result)
+        self.assertEquals(result, 'aborted')
 
     def _test_not_found(self, function, get_action_func):
         datarequest_id = 'example_uuidv4'
@@ -114,7 +115,7 @@ def _get_action(action):
         controller.tk.get_action.assert_any_call(get_action_func)
         controller.tk.abort.assert_called_once_with(404, 'Data Request %s not found' % datarequest_id)
         self.assertEquals(0, controller.tk.render.call_count)
-        self.assertIsNone(result)
+        self.assertEquals(result, 'aborted')
 
     ######################################################################
     ################################# NEW ################################
@@ -443,7 +444,7 @@ def test_index_not_authorized(self):
         controller.tk.abort.assert_called_once_with(403, 'Unauthorized to list Data Requests')
         self.assertEquals(0, controller.tk.get_action.call_count)
         self.assertEquals(0, controller.tk.render.call_count)
-        self.assertIsNone(result)
+        self.assertEquals(result, 'aborted')
 
     def test_index_invalid_page(self):
         _patch_GET({'page': '2a'})
@@ -456,7 +457,7 @@ def test_index_invalid_page(self):
         self.assertEquals(0, controller.tk.check_access.call_count)
         self.assertEquals(0, controller.tk.get_action.call_count)
         self.assertEquals(0, controller.tk.render.call_count)
-        self.assertIsNone(result)
+        self.assertEquals(result, 'aborted')
 
     @parameterized.expand([
         (INDEX_FUNCTION, '1', 'conwet', '', 0,    10),
@@ -788,7 +789,7 @@ def test_comment_list_not_authorized(self):
         controller.tk.check_access.assert_called_once_with(constants.LIST_DATAREQUEST_COMMENTS, self.expected_context, {'datarequest_id': datarequest_id})
         controller.tk.abort.assert_called_once_with(403, 'You are not authorized to list the comments of the Data Request %s' % datarequest_id)
         self.assertEquals(0, controller.tk.render.call_count)
-        self.assertIsNone(result)
+        self.assertEquals(result, 'aborted')
 
     def test_comment_list_not_found(self):
         datarequest_id = 'example_uuidv4'
@@ -801,7 +802,7 @@ def test_comment_list_not_found(self):
         controller.tk.get_action(constants.COMMENT_DATAREQUEST)
         controller.tk.abort.assert_called_once_with(404, 'Data Request %s not found' % datarequest_id)
         self.assertEquals(0, controller.tk.render.call_count)
-        self.assertIsNone(result)
+        self.assertEquals(result, 'aborted')
 
     @parameterized.expand([
         (),
@@ -938,7 +939,7 @@ def test_delete_comment_not_authorized(self):
                                                            self.expected_context, {'id': comment_id})
         controller.tk.abort.assert_called_once_with(403, 'You are not authorized to delete this comment')
         self.assertEquals(0, controller.tk.render.call_count)
-        self.assertIsNone(result)
+        self.assertEquals(result, 'aborted')
 
     def test_delete_comment_not_found(self):
         datarequest_id = 'example_uuidv4'
@@ -952,7 +953,7 @@ def test_delete_comment_not_found(self):
         controller.tk.get_action(constants.DELETE_DATAREQUEST_COMMENT)
         controller.tk.abort.assert_called_once_with(404, 'Comment %s not found' % comment_id)
         self.assertEquals(0, controller.tk.render.call_count)
-        self.assertIsNone(result)
+        self.assertEquals(result, 'aborted')
 
     def test_delete_comment(self):
         datarequest_id = 'example_uuidv4'

From 27883c412abe077303c35c66ec5f658c00b8c91a Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Wed, 13 Jul 2022 09:27:49 +1000
Subject: [PATCH 266/276] [QOL-9055] use 'return_value' not 'side_effect' for
 regular return

---
 ckanext/datarequests/tests/test_ui_controller.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ckanext/datarequests/tests/test_ui_controller.py b/ckanext/datarequests/tests/test_ui_controller.py
index 49b613f9..75a7ee84 100644
--- a/ckanext/datarequests/tests/test_ui_controller.py
+++ b/ckanext/datarequests/tests/test_ui_controller.py
@@ -51,7 +51,7 @@ def setUp(self):
         controller.tk.ValidationError = self._tk.ValidationError
         controller.tk.NotAuthorized = self._tk.NotAuthorized
         controller.tk.ObjectNotFound = self._tk.ObjectNotFound
-        controller.tk.abort.side_effect = 'aborted'
+        controller.tk.abort.return_value = 'aborted'
 
         self._c = controller.c
         controller.c = MagicMock()

From f93e58e8d684fe272ff13cad83816419562360b4 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Wed, 13 Jul 2022 09:28:03 +1000
Subject: [PATCH 267/276] [QOL-9055] add test mock for the 'h' import

---
 ckanext/datarequests/tests/test_ui_controller.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ckanext/datarequests/tests/test_ui_controller.py b/ckanext/datarequests/tests/test_ui_controller.py
index 75a7ee84..85d49eab 100644
--- a/ckanext/datarequests/tests/test_ui_controller.py
+++ b/ckanext/datarequests/tests/test_ui_controller.py
@@ -65,6 +65,9 @@ def setUp(self):
         self._helpers = controller.helpers
         controller.helpers = MagicMock()
 
+        self._h = controller.h
+        controller.h = MagicMock()
+
         self.expected_context = {
             'model': controller.model,
             'session': controller.model.Session,
@@ -78,6 +81,7 @@ def tearDown(self):
         request_helpers.request = self._request
         controller.model = self._model
         controller.helpers = self._helpers
+        controller.h = self._h
 
     ######################################################################
     ################################# AUX ################################
@@ -658,7 +662,7 @@ def test_delete(self):
         expected_data_dict = {'id': datarequest_id}
         controller.tk.check_access.assert_called_once_with(constants.DELETE_DATAREQUEST, self.expected_context, expected_data_dict)
         delete_datarequest.assert_called_once_with(self.expected_context, expected_data_dict)
-        controller.helpers.flash_notice.assert_called_once_with(controller.tk._(
+        controller.h.flash_notice.assert_called_once_with(controller.tk._(
             'Data Request %s has been deleted' % datarequest.get('title')))
 
         # Redirection

From dd5d9b6109540b02d28797967e9a04c39468a468 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Wed, 13 Jul 2022 10:19:57 +1000
Subject: [PATCH 268/276] [QOL-9055] swap test assertions for clearer debugging

- put assert_equals first so we can tell what value was actually returned if it's wrong
---
 ckanext/datarequests/tests/test_ui_controller.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ckanext/datarequests/tests/test_ui_controller.py b/ckanext/datarequests/tests/test_ui_controller.py
index 85d49eab..819d8f55 100644
--- a/ckanext/datarequests/tests/test_ui_controller.py
+++ b/ckanext/datarequests/tests/test_ui_controller.py
@@ -870,8 +870,8 @@ def _get_action(action):
         result = controller.comment(datarequest_id)
 
         # Check the result
-        controller.tk.render.assert_called_once_with('datarequests/comment.html')
         self.assertEquals(result, controller.tk.render.return_value)
+        controller.tk.render.assert_called_once_with('datarequests/comment.html')
 
         # Verify comments and data request
         self.assertEquals(controller.c.datarequest, datarequest)

From e23e3d1721da04dd27fa738cf964254713a609a5 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Wed, 13 Jul 2022 10:42:30 +1000
Subject: [PATCH 269/276] [QOL-9055] fix test assertions after calling 'abort'

- execution should end immediately, so 'render' won't get called
---
 .../datarequests/tests/test_ui_controller.py  | 74 ++++++++++---------
 1 file changed, 38 insertions(+), 36 deletions(-)

diff --git a/ckanext/datarequests/tests/test_ui_controller.py b/ckanext/datarequests/tests/test_ui_controller.py
index 819d8f55..99379e70 100644
--- a/ckanext/datarequests/tests/test_ui_controller.py
+++ b/ckanext/datarequests/tests/test_ui_controller.py
@@ -869,40 +869,19 @@ def _get_action(action):
         # Call the function
         result = controller.comment(datarequest_id)
 
-        # Check the result
-        self.assertEquals(result, controller.tk.render.return_value)
-        controller.tk.render.assert_called_once_with('datarequests/comment.html')
-
-        # Verify comments and data request
-        self.assertEquals(controller.c.datarequest, datarequest)
-        self.assertEquals(controller.c.comments, comments_list)
-
-        # Check calls
-        show_datarequest.assert_called_once_with(self.expected_context, {'id': datarequest_id})
-        list_datarequest_comments.assert_called_once_with(self.expected_context, {'datarequest_id': datarequest_id})
-
-        if new_comment:
-            controller.tk.get_action.assert_any_call(constants.COMMENT_DATAREQUEST)
-        elif update_comment:
-            controller.tk.get_action.assert_any_call(constants.UPDATE_DATAREQUEST_COMMENT)
-
-        if new_comment or update_comment:
-            default_action.assert_called_once_with(
-                self.expected_context, {
-                    'datarequest_id': datarequest_id,
-                    'comment': comment, 'id': comment_id if update_comment else ''
-                })
-
         if comment_or_update_exception == controller.tk.NotAuthorized:
             action = 'comment' if new_comment else 'update comment'
             controller.tk.abort.assert_called_once_with(403, 'You are not authorized to %s' % action)
+            self.assertEquals(result, 'aborted')
 
-        if type(comment_or_update_exception) == controller.tk.ObjectNotFound:
+        elif type(comment_or_update_exception) == controller.tk.ObjectNotFound:
             controller.tk.abort.assert_called_once_with(404, str(comment_or_update_exception))
+            self.assertEquals(result, 'aborted')
 
-        if type(comment_or_update_exception) == controller.tk.ValidationError:
+        elif type(comment_or_update_exception) == controller.tk.ValidationError:
             # Abort never called
             self.assertEquals(0, controller.tk.abort.call_count)
+            self.assertEquals(result, 'aborted')
 
             # Check controller.c values
             self.assertEquals(comment_or_update_exception.error_dict, controller.c.errors)
@@ -912,20 +891,43 @@ def _get_action(action):
                 for key, error in comment_or_update_exception.error_dict.items()}
 
             self.assertEquals(errors_summary, controller.c.errors_summary)
+        else:
 
-        if new_comment or update_comment:
+            # Check the result
+            self.assertEquals(result, controller.tk.render.return_value)
+            controller.tk.render.assert_called_once_with('datarequests/comment.html')
 
-            # self.assertEquals(comment, controller.c.updated_comment.comment['comment'])
+            # Verify comments and data request
+            self.assertEquals(controller.c.datarequest, datarequest)
+            self.assertEquals(controller.c.comments, comments_list)
 
-            updated_comment_id = controller.c.updated_comment['comment']['id']
-            if new_comment:
-                if comment_or_update_exception:
-                    self.assertEquals('', updated_comment_id)
-                else:
-                    self.assertEquals(new_comment_id, updated_comment_id)
+            # Check calls
+            show_datarequest.assert_called_once_with(self.expected_context, {'id': datarequest_id})
+            list_datarequest_comments.assert_called_once_with(self.expected_context, {'datarequest_id': datarequest_id})
 
-            if update_comment:
-                self.assertEquals(comment_id, updated_comment_id)
+            if new_comment:
+                controller.tk.get_action.assert_any_call(constants.COMMENT_DATAREQUEST)
+            elif update_comment:
+                controller.tk.get_action.assert_any_call(constants.UPDATE_DATAREQUEST_COMMENT)
+
+            if new_comment or update_comment:
+                default_action.assert_called_once_with(
+                    self.expected_context, {
+                        'datarequest_id': datarequest_id,
+                        'comment': comment, 'id': comment_id if update_comment else ''
+                    })
+
+                # self.assertEquals(comment, controller.c.updated_comment.comment['comment'])
+
+                updated_comment_id = controller.c.updated_comment['comment']['id']
+                if new_comment:
+                    if comment_or_update_exception:
+                        self.assertEquals('', updated_comment_id)
+                    else:
+                        self.assertEquals(new_comment_id, updated_comment_id)
+
+                if update_comment:
+                    self.assertEquals(comment_id, updated_comment_id)
 
     ######################################################################
     ########################### DELETE COMMENT ###########################

From 4fbf6111c41667a77b32136a432a738f0dc092a2 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Wed, 13 Jul 2022 10:56:13 +1000
Subject: [PATCH 270/276] [QOL-9055] fix test spelling of 'comment'

---
 ckanext/datarequests/tests/test_ui_controller.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ckanext/datarequests/tests/test_ui_controller.py b/ckanext/datarequests/tests/test_ui_controller.py
index 99379e70..07620733 100644
--- a/ckanext/datarequests/tests/test_ui_controller.py
+++ b/ckanext/datarequests/tests/test_ui_controller.py
@@ -816,8 +816,8 @@ def test_comment_list_not_found(self):
         (False, True,  controller.tk.NotAuthorized),
         (True,  False, controller.tk.ObjectNotFound('Exception')),
         (False, True,  controller.tk.ObjectNotFound('Exception')),
-        (True,  False, controller.tk.ValidationError({'commnet': ['error1', 'error2']})),
-        (False, True, controller.tk.ValidationError({'commnet': ['error1', 'error2']}))
+        (True,  False, controller.tk.ValidationError({'comment': ['error1', 'error2']})),
+        (False, True, controller.tk.ValidationError({'comment': ['error1', 'error2']}))
 
     ])
     def test_comment_list(self, new_comment=False, update_comment=False,
@@ -839,10 +839,10 @@ def test_comment_list(self, new_comment=False, update_comment=False,
         datarequest = {'id': 'uuid4', 'user_id': 'user_uuid4', 'title': 'example_title'}
         comments_list = [
             {'comment': 'Comment 1\nwith new line'},
-            {'comment': 'Commnet 2\nwith two\nnew lines'},
+            {'comment': 'Comment 2\nwith two\nnew lines'},
             {'comment': 'Comment 3 with link https://fiware.org/some/path?param1=1&param2=2'},
             {'comment': 'Comment 4 with two links https://fiware.org/some/path?param1=1&param2=2 and https://google.es'},
-            {'comment': 'Coment\nwith http://fiware.org\nhttp://fiware.eu'}
+            {'comment': 'Comment\nwith http://fiware.org\nhttp://fiware.eu'}
         ]
 
         default_action_return = {

From ea66906c8e2dda85ddc71456704d8a49ecf10e9e Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Wed, 13 Jul 2022 11:13:18 +1000
Subject: [PATCH 271/276] [QOL-9055] fix test to not expect 'abort' on
 validation error

- We need extra logic to check the validation outcome, but the page will still be rendered
---
 .../datarequests/tests/test_ui_controller.py  | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/ckanext/datarequests/tests/test_ui_controller.py b/ckanext/datarequests/tests/test_ui_controller.py
index 07620733..bb91f38c 100644
--- a/ckanext/datarequests/tests/test_ui_controller.py
+++ b/ckanext/datarequests/tests/test_ui_controller.py
@@ -878,20 +878,19 @@ def _get_action(action):
             controller.tk.abort.assert_called_once_with(404, str(comment_or_update_exception))
             self.assertEquals(result, 'aborted')
 
-        elif type(comment_or_update_exception) == controller.tk.ValidationError:
-            # Abort never called
-            self.assertEquals(0, controller.tk.abort.call_count)
-            self.assertEquals(result, 'aborted')
+        else:
+            if type(comment_or_update_exception) == controller.tk.ValidationError:
+                # Abort never called
+                self.assertEquals(0, controller.tk.abort.call_count)
 
-            # Check controller.c values
-            self.assertEquals(comment_or_update_exception.error_dict, controller.c.errors)
+                # Check controller.c values
+                self.assertEquals(comment_or_update_exception.error_dict, controller.c.errors)
 
-            errors_summary = {
-                key: ', '.join(error)
-                for key, error in comment_or_update_exception.error_dict.items()}
+                errors_summary = {
+                    key: ', '.join(error)
+                    for key, error in comment_or_update_exception.error_dict.items()}
 
-            self.assertEquals(errors_summary, controller.c.errors_summary)
-        else:
+                self.assertEquals(errors_summary, controller.c.errors_summary)
 
             # Check the result
             self.assertEquals(result, controller.tk.render.return_value)

From e1c1e5b6f424631ca2e874a112f84572c8cc3d15 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Wed, 13 Jul 2022 11:44:59 +1000
Subject: [PATCH 272/276] [QOL-9055] provide CKAN version for CircleCI build

---
 .circleci/config.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index b70b58fc..c3be0c63 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -23,7 +23,10 @@ jobs:
           at: /workspace
       - checkout
       - *step_setup_remote_docker
-      - run: .circleci/build.sh
+      - run:
+          command: .circleci/build.sh
+          environment:
+            CKAN_VERSION: 2.9.5
       - run: .circleci/test.sh
       - run:
           name: Process artifacts

From 429909e17f1406b63a7d19f3d9f95304d557403f Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Wed, 13 Jul 2022 12:58:47 +1000
Subject: [PATCH 273/276] [QOL-9055] fix handling of POST results

- ensure redirects are actioned, not thrown away
---
 ckanext/datarequests/controllers/controller_functions.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ckanext/datarequests/controllers/controller_functions.py b/ckanext/datarequests/controllers/controller_functions.py
index e7fc0bb0..ce158dec 100644
--- a/ckanext/datarequests/controllers/controller_functions.py
+++ b/ckanext/datarequests/controllers/controller_functions.py
@@ -219,8 +219,8 @@ def update(id):
         tk.check_access(constants.UPDATE_DATAREQUEST, context, data_dict)
         c.datarequest = tk.get_action(constants.SHOW_DATAREQUEST)(context, data_dict)
         c.original_title = c.datarequest.get('title')
-        _process_post(constants.UPDATE_DATAREQUEST, context)
-        return tk.render('datarequests/edit.html')
+        post_result = _process_post(constants.UPDATE_DATAREQUEST, context)
+        return post_result or tk.render('datarequests/edit.html')
     except tk.ObjectNotFound as e:
         log.warn(e)
         return tk.abort(404, tk._('Data Request %s not found') % id)

From b57a1a5021e870bfc1ab889f4145cc620abc9c54 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Wed, 13 Jul 2022 13:37:01 +1000
Subject: [PATCH 274/276] [QOL-9055] fix tests for POST results

- expect a redirect if no validation errors
---
 ckanext/datarequests/tests/test_ui_controller.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/ckanext/datarequests/tests/test_ui_controller.py b/ckanext/datarequests/tests/test_ui_controller.py
index bb91f38c..ce8266ff 100644
--- a/ckanext/datarequests/tests/test_ui_controller.py
+++ b/ckanext/datarequests/tests/test_ui_controller.py
@@ -361,7 +361,7 @@ def test_update_post_content(self, authorized, validation_error):
 
         original_dr = {
             'id': datarequest_id,
-            'title': 'A completly different title',
+            'title': 'A completely different title',
             'description': 'Other description'
         }
 
@@ -402,8 +402,6 @@ def _get_action(action):
 
         if authorized:
             self.assertEquals(0, controller.tk.abort.call_count)
-            self.assertEquals(controller.tk.render.return_value, result)
-            controller.tk.render.assert_called_once_with('datarequests/edit.html')
 
             show_datarequest.assert_called_once_with(self.expected_context, {'id': datarequest_id})
             update_datarequest.assert_called_once_with(self.expected_context, request_data)
@@ -419,10 +417,13 @@ def _get_action(action):
                 self.assertEquals(expected_request_data, controller.c.datarequest)
                 self.assertEquals(errors_summary, controller.c.errors_summary)
                 self.assertEquals(original_dr['title'], controller.c.original_title)
+                self.assertEquals(controller.tk.render.return_value, result)
+                controller.tk.render.assert_called_once_with('datarequests/edit.html')
             else:
                 self.assertEquals({}, controller.c.errors)
                 self.assertEquals({}, controller.c.errors_summary)
                 self.assertEquals(original_dr, controller.c.datarequest)
+                self.assertEquals(controller.tk.redirect_to.return_value, result)
                 controller.tk.url_for.assert_called_once_with(
                     'datarequest.show', id=datarequest_id)
                 controller.tk.redirect_to.assert_called_once_with(controller.tk.url_for.return_value)

From ea6ba6de4b4c72204b1e576096723c2a231f1923 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Wed, 13 Jul 2022 15:26:00 +1000
Subject: [PATCH 275/276] restore conwetlab README

---
 README.md | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 52 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index c77ed528..a31b86a8 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,54 @@
-# ckanext-datarequests
-A custom CKAN extension for Data.Qld
+# CKAN Data Requests [![Build Status](https://travis-ci.org/conwetlab/ckanext-datarequests.svg?branch=develop)](https://travis-ci.org/conwetlab/ckanext-datarequests) [![Coverage Status](https://coveralls.io/repos/github/conwetlab/ckanext-datarequests/badge.svg?branch=develop)](https://coveralls.io/github/conwetlab/ckanext-datarequests?branch=develop)
+
+CKAN extension that allows users to ask for datasets that are not already published in the CKAN instance. In this way we can set up a Data Market, not only with data supplies but also with data demands.
+
+## How it works
+
+You have two ways for creating, updating, deleting, viewing and closing a datarequest: you can use the graphical interface or the programatic API.
+
+### User Interface
+If you prefer to use the graphical interface, you should click on the "Data Requests" section that will appear in the header of your CKAN instance. In this section you'll be able to view the current data requests. In addition, there will be a button that will allow you to create a new data request. In the form that will appear, you will have to introduce the following information:
+
+* **Title**: a title for your data request
+* **Description**: a long description for your data request. You should include as much details as you can in order to allow others to understand you needs and upload a dataset that fulfil your requeriments.
+* **Organization**: in some cases, you want to ask specific data to an specific organization. If you are in such situation, you should complete this field.
+
+Once that you have created your data request, you can view it by clicking on the link provided when you created it. When you are the owner of a data request, you will also be able to:
+* **Close the data request** if you consider that there is a new dataset that fulfil your needs
+* **Update the data request** if you can to add/remove some information
+* **Delete the data request** if you do not want it to be available any more
+
+### API
+On the other hand, you can also use the API. To access this API, you should POST the following URL (as you do for other actions):
+
+``http[s]://[CKAN_HOST]:[CKAN_PORT]/api/action/[ACTION_NAME]``
+
+Here you have a brief description of all the implemented actions:
+
+#### `create_datarequest(context, data_dict)`
+Action to create a new data request. This function checks the access rights of the user before creating the data request. If the user is not allowed, a `NotAuthorized` exception will be risen.
+
+In addition, you should note that the parameters will be checked and an exception (`ValidationError`) will be risen if some of these parameters are not valid.
+
+##### Parameters (included in `data_dict`):
+* **`title`** (string): the title of the data request
+* **`description`** (string): a brief description for your data request
+* **`organization_id`** (string): The ID of the organization you want to asign the data request (optional).
+
+##### Returns:
+A dict with the data request (`id`, `user_id`, `title`, `description`,`organization_id`, `open_time`, `accepted_dataset`, `close_time`, `closed`, `followers`).
+
+#### `show_datarequest(context, data_dict)`
+Action to retrieve the information of a data request. The only required parameter is the `id` of the data request. A `NotFound` exception will be risen if the `id` is not found.
+
+Access rights will be checked before returning the information and an exception will be risen (`NotAuthorized`) if the user is not authorized.
+
+##### Parameters (included in `data_dict`):
+* **`id`** (string): the ID of the datarequest to be returned.
+
+##### Returns:
+A dict with the data request (`id`, `user_id`, `title`, `description`,`organization_id`, `open_time`, `accepted_dataset`, `close_time`, `closed`, `followers`).
 
-[![CircleCI](https://circleci.com/gh/qld-gov-au/ckanext-datarequests/tree/develop.svg?style=shield)](https://circleci.com/gh/qld-gov-au/ckanext-datarequests/tree/develop)
 
 ## Local environment setup
 - Make sure that you have latest versions of all required software installed:
@@ -217,11 +264,11 @@ Install this extension in your CKAN instance is as easy as installing any other
 ```
 * Install the extension
 ```
-pip install 'git+https://github.com/qld-gov-au/ckanext-datarequests.git#egg=ckanext-datarequests'
+pip install 'git+https://github.com/conwetlab/ckanext-datarequests.git#egg=ckanext-datarequests'
 ```
 > **Note**: If you prefer, you can download the source code as well and install in 'develop' mode for easy editing. To do so, use the '-e' flag:
 > ```
-> pip install -e 'git+https://github.com/qld-gov-au/ckanext-datarequests.git#egg=ckanext-datarequests'
+> pip install -e 'git+https://github.com/conwetlab/ckanext-datarequests.git#egg=ckanext-datarequests'
 > ```
 
 * Modify your configuration file (generally in `/etc/ckan/default/production.ini`) and add `datarequests` in the `ckan.plugins` property.

From e4a867ac43d52cb97661972056364b3d536dc155 Mon Sep 17 00:00:00 2001
From: ThrawnCA <shell_layer-github@yahoo.com.au>
Date: Mon, 20 Mar 2023 09:15:17 +1000
Subject: [PATCH 276/276] replace obsolete integratedexperts container

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index c463d047..ece09000 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -15,7 +15,7 @@ jobs:
 
     name: Continuous Integration build on CKAN ${{ matrix.ckan-version }}
     runs-on: ubuntu-latest
-    container: integratedexperts/ci-builder
+    container: drevops/ci-builder
     env:
       CKAN_REPO: ckan/ckan
       CKAN_VERSION: ${{ matrix.ckan-version }}