From 3f47d65f8a1c2f7d2150117c52f11596577d702b Mon Sep 17 00:00:00 2001 From: "Christopher C. Wells" Date: Wed, 19 Feb 2020 14:10:36 -0800 Subject: [PATCH] Update Baby Buddy to v1.4.0 --- .sandstorm/sandstorm-pkgdef.capnp | 7 ++++--- README.md | 17 ++++++++++++----- sandstorm.patch | 26 +++++++++++++------------- 3 files changed, 29 insertions(+), 21 deletions(-) diff --git a/.sandstorm/sandstorm-pkgdef.capnp b/.sandstorm/sandstorm-pkgdef.capnp index 37e01e6..ee4d804 100644 --- a/.sandstorm/sandstorm-pkgdef.capnp +++ b/.sandstorm/sandstorm-pkgdef.capnp @@ -7,8 +7,8 @@ const pkgdef :Spk.PackageDefinition = ( manifest = ( appTitle = (defaultText = "Baby Buddy"), - appVersion = 1, # Increment this for every release. - appMarketingVersion = (defaultText = "1.3.4"), + appVersion = 2, # Increment this for every release. + appMarketingVersion = (defaultText = "1.4.0"), actions = [ ( nounPhrase = (defaultText = "instance"), command = .firstRunCommand @@ -52,7 +52,8 @@ const pkgdef :Spk.PackageDefinition = ( ), fileList = "sandstorm-files.list", alwaysInclude = [ "opt/app/babybuddy", "usr/lib/python3", - "usr/lib/python3.7" ], + "usr/lib/python3.7", "usr/share/zoneinfo", + "usr/share/locale" ], bridgeConfig = ( viewInfo = ( permissions = [ diff --git a/README.md b/README.md index 3b138b6..7cec80b 100644 --- a/README.md +++ b/README.md @@ -3,14 +3,21 @@ This is the source for the [Baby Buddy](https://github.com/babybuddy/babybuddy) app for [Sandstorm](https://sandstorm.io/). +## App Version History + +- v2: [Baby Buddy 1.4.0](https://github.com/babybuddy/babybuddy/releases/tag/v1.4.0) +- v1: [Baby Buddy 1.3.4](https://github.com/babybuddy/babybuddy/releases/tag/v1.3.4) +- v0: [Baby Buddy 1.3.0](https://github.com/babybuddy/babybuddy/releases/tag/v1.3.0) + ## Caveats -- Baby Buddy currently only supports setting the application time zone from an -environment variable. This cannot be achieved with the regular Sandstorm grain -workflow, so the timezone is locked to Etc/UTC. +- ~~Baby Buddy currently only supports setting the application time zone from +an environment variable. This cannot be achieved with the regular Sandstorm +grain workflow, so the timezone is locked to Etc/UTC.~~ (Resolved as of v2) -- Sandstorm user ID's are used for the username in Baby Buddy. This name is -used for display throughout the app and is not terribly useful. +- ~~Sandstorm user ID's are used for the username in Baby Buddy. This name is +used for display throughout the app and is not terribly useful.~~ (Resolved as +of v2) - Baby Buddy's API has not been fully implemented with Sandbox's API integration. diff --git a/sandstorm.patch b/sandstorm.patch index 3c994e7..4deb1cd 100644 --- a/sandstorm.patch +++ b/sandstorm.patch @@ -1,17 +1,17 @@ diff --git a/Pipfile b/Pipfile -index 0bf2d3f..d7381f8 100644 +index 62a51bb..4a20390 100644 --- a/Pipfile +++ b/Pipfile -@@ -21,6 +21,7 @@ easy-thumbnails = "*" - python-dotenv = "*" +@@ -19,6 +19,7 @@ python-dotenv = "*" django-storages = "*" boto3 = "*" + django-import-export = "*" +django-sandstorm = {editable = true,git = "https://github.com/cdubz/django-sandstorm.git"} - [dev-packages] + coveralls = "*" diff --git a/babybuddy/forms.py b/babybuddy/forms.py -index 004d738..e75f635 100644 +index 4f0a7fb..c386b61 100644 --- a/babybuddy/forms.py +++ b/babybuddy/forms.py @@ -6,20 +6,6 @@ from django.contrib.auth.models import User @@ -107,10 +107,10 @@ index 0000000..7aa8682 + +MEDIA_ROOT = '/var/media' diff --git a/babybuddy/templates/babybuddy/nav-dropdown.html b/babybuddy/templates/babybuddy/nav-dropdown.html -index 6d75c7c..812c429 100644 +index 14f02aa..034fd30 100644 --- a/babybuddy/templates/babybuddy/nav-dropdown.html +++ b/babybuddy/templates/babybuddy/nav-dropdown.html -@@ -237,14 +237,11 @@ +@@ -239,14 +239,11 @@
{% trans "User" %}
{% trans "Settings" %} @@ -122,9 +122,9 @@ index 6d75c7c..812c429 100644 target="_blank">{% trans "API Browser" %} {% if request.user.is_staff %} - {% trans "Users" %} - {% trans "Backend Admin" %} + {% trans "Database Admin" %} + {% endif %} +
{% trans "Support" %}
diff --git a/babybuddy/urls.py b/babybuddy/urls.py index a18f2a1..8fad3ae 100644 --- a/babybuddy/urls.py @@ -165,10 +165,10 @@ index a18f2a1..8fad3ae 100644 'user/reset-api-key/', views.UserResetAPIKey.as_view(), diff --git a/babybuddy/views.py b/babybuddy/views.py -index 66209cc..6b0dfe4 100644 +index 75f36b9..31eaab9 100644 --- a/babybuddy/views.py +++ b/babybuddy/views.py -@@ -46,16 +46,6 @@ class UserList(StaffOnlyMixin, BabyBuddyFilterView): +@@ -47,16 +47,6 @@ class UserList(StaffOnlyMixin, BabyBuddyFilterView): filterset_fields = ('username', 'first_name', 'last_name', 'email') @@ -185,7 +185,7 @@ index 66209cc..6b0dfe4 100644 class UserUpdate(StaffOnlyMixin, PermissionRequired403Mixin, SuccessMessageMixin, UpdateView): model = User -@@ -66,42 +56,6 @@ class UserUpdate(StaffOnlyMixin, PermissionRequired403Mixin, +@@ -67,42 +57,6 @@ class UserUpdate(StaffOnlyMixin, PermissionRequired403Mixin, success_message = gettext_lazy('User %(username)s updated.')