Merge pull request #711 from City-of-Helsinki/release/v0.11.0

Release/v0.11.0

.sanitizerconfig

@@ -357,10 +357,10 @@ strategy:
     id: null
     location: null
     max_period: null
-    max_price_per_hour: null
+    max_price: null
     max_reservations_per_user: null
     min_period: null
-    min_price_per_hour: null
+    min_price: null
     modified_at: null
     modified_by_id: null
     name: null

README.md

@@ -29,7 +29,7 @@ Table of Contents
 Contributing
 ------------
 
-Your contributions are always welcome! 
+Your contributions are always welcome!
 
 Our main issue tracking is in [Jira](https://helsinkisolutionoffice.atlassian.net/projects/RESPA/issues). However, we also monitor this repository's issues and import them to Jira. If you want to report a bug or see a new feature feel free to create a [new issue](https://github.com/City-of-Helsinki/respa/issues/new) on GitHub or discuss it with us on [Gitter](https://gitter.im/City-of-Helsinki/heldev). Alternatively, you can create a pull request (develop branch). Your PR will be reviewed by the project tech lead.
 
@@ -125,7 +125,7 @@ Settings are done either by setting environment variables named after the settin
 - `STATIC_URL`: Static URL is address (URL) where users can access files in STATIC_ROOT through http. Same factors apply as to MEDIA_URL. [Django setting](https://docs.djangoproject.com/en/2.2/ref/settings/#static-url).
 - `SENTRY_DSN`: Sentry is an error tracking sentry (sentry.io) that can be self hosted or purchased as PaaS. SENTRY_DSN setting specifies the URL where reports for this Respa instance should be sent. You can find this in your Sentry interface (or through its API). Example value `'http://your.sentry.here/fsdafads/13'`.
 - `SENTRY_ENVIRONMENT`: Sentry environment is an optional tag that can be included in sentry reports. It is used to separate deployments within Sentry UI.
-- `COOKIE_PREFIX`: Cookie prefix is added to the every cookie set by Respa. These are mostly used when accessing the internal Django admin site. This applies to django session cookie and csrf cookie. Django setting: prepended to `CSRF_COOKIE_NAME` and `SESSION_COOKIE_NAME`. 
+- `COOKIE_PREFIX`: Cookie prefix is added to the every cookie set by Respa. These are mostly used when accessing the internal Django admin site. This applies to django session cookie and csrf cookie. Django setting: prepended to `CSRF_COOKIE_NAME` and `SESSION_COOKIE_NAME`.
 - `INTERNAL_IPS`: Django INTERNAL_IPS setting allows some debugging aids for the addresses specified here. [Django setting](https://docs.djangoproject.com/en/2.2/ref/settings/#internal-ips). Example value `'127.0.0.1'`.
 - `MAIL_ENABLED`: Whether sending emails to users is enabled or not.
 - `MAIL_DEFAULT_FROM`: Specifies the from-address for emails sent to users.
@@ -141,7 +141,8 @@ Settings are done either by setting environment variables named after the settin
 - `RESPA_ADMIN_VIEW_RESOURCE_URL`: URL for a "view changes" link in Respa Admin through which the user can view changes made to a given resource. Example value: `'https://varaamo.hel.fi/resource/'`.
 - `RESPA_ADMIN_LOGO`: Name of the logo file to be displayed in Respa Admin UI. Logo file is assumed to be located in `respa_admin/static_src/img/`. Example value: `ra-logo.svg`.
 - `RESPA_ADMIN_KORO_STYLE`: Defines the style of koro-shape used in login page and resources page. Accepts values: `koro-basic`, `koro-pulse`, `koro-beat`, `koro-storm`, `koro-wave`.
-
+- `ENABLE_RESOURCE_TOKEN_AUTH`: Enable Django Rest Frameworks token authentication method for Resource endpoint.
+- `DISABLE_SERVER_SIDE_CURSORS`: Disable server side cursors. Useful when using pgBouncer for example. See Django docs for more information: [Django setting](https://docs.djangoproject.com/en/3.0/ref/databases/#transaction-pooling-server-side-cursors).
 
 ### Setting up PostGIS/GEOS/GDAL on Windows (x64) / Python 3
 

docs/permissions.rst

@@ -137,6 +137,9 @@ can_create_staff_event                   X       X      X      X
 can_create_special_type_reservation      X       X      X      X
 can_bypass_manual_confirmation           X       X      X      X
 can_create_reservations_for_other_users  X       X      X
+can_create_overlapping_reservations      X       X      X      X
+can_ignore_max_reservations_per_user     X       X      X      X
+can_ignore_max_period                    X       X      X      X
 ====================================== ====== ======= ====== ====== ======
 
 
@@ -196,6 +199,16 @@ can_bypass_manual_confirmation
 can_create_reservations_for_other_users
   Can create reservations for other registered users
 
+can_create_overlapping_reservations
+  Can create overlapping reservations for different resources in single unit even if restricted
+
+can_ignore_max_reservations_per_user
+  Can ignore resources max reservations per user rule
+
+can_ignore_max_period
+  Can ignore resources max period rule
+
+
 Respa Admin Permissions
 ~~~~~~~~~~~~~~~~~~~~~~~
 

locale/fi/LC_MESSAGES/django.po

@@ -744,6 +744,9 @@ msgstr "Voi ohittaa manuaalisen vahvistuksen"
 msgid "Can create reservations for other registered users"
 msgstr "Voi tehdä varauksia muille käyttäjille"
 
+msgid "Can create overlapping reservations"
+msgstr "Voi luoda päällekkäisiä varauksia"
+
 msgid "created"
 msgstr "luoja"
 
@@ -855,6 +858,9 @@ msgstr "Varauksen loppuaika ei voi olla ennen alkuaikaa"
 msgid "Begin and end time must match time slots"
 msgstr "Alku- ja loppuajan täytyy osua aikaikkunoihin"
 
+msgid "This unit does not allow overlapping reservations for its resources"
+msgstr "Tämä toimipiste ei salli päällekkäisiä varauksia resurssien välillä"
+
 msgid "The resource is already reserved for some of the period"
 msgstr "Tila on jo varattu ainakin osan ajanjaksosta"
 
@@ -952,6 +958,18 @@ msgstr "4-numeroinen pin-koodi"
 msgid "6-digit PIN code"
 msgstr "6-numeroinen pin-koodi"
 
+msgid "Hourly"
+msgstr "Per tunti"
+
+msgid "Daily"
+msgstr "Per päivä"
+
+msgid "Weekly"
+msgstr "Per viikko"
+
+msgid "Fixed"
+msgstr "Kiinteä"
+
 msgid "Resource type"
 msgstr "Resurssityyppi"
 
@@ -1006,11 +1024,11 @@ msgstr "Lisäsisältö \"alustava varaus\"-ilmoitukseen"
 msgid "Extra content to \"reservation confirmed\" notification"
 msgstr "Lisäsisältö \"varaus vahvistettu\"-ilmoitukseen"
 
-msgid "Min price per hour"
-msgstr "Minimituntihinta"
+msgid "Min price"
+msgstr "Minimihinta"
 
-msgid "Max price per hour"
-msgstr "Maksimituntihinta"
+msgid "Max price"
+msgstr "Maksimihinta"
 
 msgid "Access code type"
 msgstr "Pääsykoodityyppi"
@@ -1049,8 +1067,8 @@ msgstr "Varauksen maksimikesto on %(max_period)s"
 msgid "Maximum number of active reservations for this resource exceeded."
 msgstr "Liikaa voimassa olevia varauksia tähän tilaan."
 
-msgid "This value cannot be greater than max price per hour"
-msgstr "Tämä arvo ei voi olla suurempi kuin maksimituntihinta"
+msgid "This value cannot be greater than max price"
+msgstr "Tämä arvo ei voi olla suurempi kuin maksimihinta"
 
 msgid "This value must be a multiple of slot_size"
 msgstr "Tämän arvon täytyy olla slot_size arvon moninkerta"
@@ -1144,6 +1162,9 @@ msgstr "Ulkoinen tietolähde"
 msgid "External data source for opening hours"
 msgstr "Ulkoinen tietolähde aukioloajoille"
 
+msgid "Disallow overlapping reservations in this unit"
+msgstr "Estä toimipisteen sisäiset päällekkäiset varaukset"
+
 msgid "unit"
 msgstr "toimipiste"
 
@@ -1508,6 +1529,9 @@ msgstr "Yhteystiedot"
 msgid "View unit"
 msgstr "Tarkastele toimipistettä"
 
+msgid "Settings"
+msgstr "Asetukset"
+
 msgid "Search for users"
 msgstr "Hae käyttäjiä"
 

locale/sv/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-11-09 16:45+0200\n"
+"POT-Creation-Date: 2020-03-12 09:22+0200\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"
@@ -740,6 +740,9 @@ msgstr "Kan kringgå manuellt bekräftelsekrav för resurser"
 msgid "Can create reservations for other registered users"
 msgstr "Kan skapa reservationer för andra registrerade användare"
 
+msgid "Can create overlapping reservations"
+msgstr "Kan skapa överlappande reservationer"
+
 msgid "created"
 msgstr "skapad"
 
@@ -851,6 +854,10 @@ msgstr "Du måste avsluta bokningen när den har börjat"
 msgid "Begin and end time must match time slots"
 msgstr "Början och sluttiden måste matcha tidsluckor"
 
+msgid "This unit does not allow overlapping reservations for its resources"
+msgstr ""
+"Den här enheten tillåter inte överlappande reservationer för sina resurser"
+
 msgid "The resource is already reserved for some of the period"
 msgstr "Resursen är redan reserverad under en del av perioden"
 
@@ -948,6 +955,18 @@ msgstr "4-siffrig PIN-kod"
 msgid "6-digit PIN code"
 msgstr "6-siffrig PIN-kod"
 
+msgid "Hourly"
+msgstr "Per timme"
+
+msgid "Daily"
+msgstr "Per dag"
+
+msgid "Weekly"
+msgstr "Per vecka"
+
+msgid "Fixed"
+msgstr "Fixerad"
+
 msgid "Resource type"
 msgstr "Resurs typ"
 
@@ -1002,11 +1021,11 @@ msgstr "Extra innehåll till \"reservation begärd\" anmälan"
 msgid "Extra content to \"reservation confirmed\" notification"
 msgstr "Extra innehåll till \"reservation godkänd\" anmälan"
 
-msgid "Min price per hour"
-msgstr "Lägsta pris per timme"
+msgid "Min price"
+msgstr "Lägsta pris"
 
-msgid "Max price per hour"
-msgstr "Högsta pris per timme"
+msgid "Max price"
+msgstr "Maxpris"
 
 msgid "Access code type"
 msgstr "Typ av behörighetskod"
@@ -1046,8 +1065,8 @@ msgstr "Den maximala bokningslängden är %(max_period)s"
 msgid "Maximum number of active reservations for this resource exceeded."
 msgstr "Maximalt antal aktiva reservationer för denna resurs överskred"
 
-msgid "This value cannot be greater than max price per hour"
-msgstr "Detta värde kan inte vara högre än maxpriset per timme"
+msgid "This value cannot be greater than max price"
+msgstr "Detta värde kan inte vara högre än maxpriset"
 
 msgid "This value must be a multiple of slot_size"
 msgstr "Detta värde måste vara ett flertal av slot_size"
@@ -1141,6 +1160,9 @@ msgstr "Extern datakälla"
 msgid "External data source for opening hours"
 msgstr "Extern datakälla för öppettider"
 
+msgid "Disallow overlapping reservations in this unit"
+msgstr "Blockera överlappande reservationer i den här enheten"
+
 msgid "unit"
 msgstr "enhet"
 
@@ -1500,6 +1522,9 @@ msgstr "Kontaktuppgifter"
 msgid "View unit"
 msgstr "Visa enhet"
 
+msgid "Settings"
+msgstr "Inställningar"
+
 msgid "Search for users"
 msgstr "Sök efter användare"
 
@@ -1628,6 +1653,3 @@ msgid ""
 msgstr ""
 "anger om användaren är en General Administrator med särskilda behörigheter "
 "för många objekt inom Respa"
-
-#~ msgid "Extra questions"
-#~ msgstr "Extra frågor"

openapi.yaml

@@ -511,8 +511,8 @@ paths:
       - name: free_of_charge
         in: query
         description: If given boolean is `true`, returns only resources that have
-          their `min_price_per_hour` value of `0` or `None`. If given boolean is `false`,
-          returns resources that have their `min_price_per_hour` greater than 0.
+          their `min_price` value of `0` or `None`. If given boolean is `false`,
+          returns resources that have their `min_price` greater than 0.
         schema:
           type: boolean
       - name: municipality