Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
AlekSIS-App-Resint
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
AlekSIS®
Official
AlekSIS-App-Resint
Commits
256e4508
Commit
256e4508
authored
1 year ago
by
Jonathan Weth
Browse files
Options
Downloads
Plain Diff
Merge branch 'release-3.1' into 'master'
Do release 3.1 See merge request
!66
parents
94959bd1
276ce1cc
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!66
Do release 3.1
Pipeline
#137840
failed
1 year ago
Stage: prepare
Stage: test
Stage: build
Stage: publish
Stage: deploy
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
CHANGELOG.rst
+9
-0
9 additions, 0 deletions
CHANGELOG.rst
aleksis/apps/resint/models.py
+11
-11
11 additions, 11 deletions
aleksis/apps/resint/models.py
docs/conf.py
+2
-2
2 additions, 2 deletions
docs/conf.py
pyproject.toml
+1
-1
1 addition, 1 deletion
pyproject.toml
with
23 additions
and
14 deletions
CHANGELOG.rst
+
9
−
0
View file @
256e4508
...
...
@@ -9,11 +9,19 @@ and this project adheres to `Semantic Versioning`_.
Unreleased
----------
`3.1`_ – 2023-07-17
-------------------
Added
~~~~~
* Support public live documents
Fixed
~~~~~
* API urls were in the wrong namespace.
`3.0`_ - 2023-05-12
-------------------
...
...
@@ -119,3 +127,4 @@ Added
.. _3.0b1: https://edugit.org/AlekSIS/official/AlekSIS-App-Resint/-/tags/3.0b1
.. _3.0b2: https://edugit.org/AlekSIS/official/AlekSIS-App-Resint/-/tags/3.0b2
.. _3.0: https://edugit.org/AlekSIS/official/AlekSIS-App-Resint/-/tags/3.0
.. _3.1: https://edugit.org/AlekSIS/official/AlekSIS-App-Resint/-/tags/3.1
This diff is collapsed.
Click to expand it.
aleksis/apps/resint/models.py
+
11
−
11
View file @
256e4508
...
...
@@ -208,6 +208,17 @@ class LiveDocument(ExtensiblePolymorphicModel):
default
=
False
,
verbose_name
=
_
(
"
Was the last update triggered manually?
"
),
editable
=
False
)
class
Meta
:
verbose_name
=
_
(
"
Live document
"
)
verbose_name_plural
=
_
(
"
Live documents
"
)
def
__str__
(
self
)
->
str
:
return
self
.
name
def
save
(
self
,
*
args
,
**
kwargs
):
with
reversion
.
create_revision
():
super
().
save
(
*
args
,
**
kwargs
)
@property
def
last_version
(
self
)
->
Optional
[
Revision
]:
"""
Get django-reversion version of last file update.
"""
...
...
@@ -240,10 +251,6 @@ class LiveDocument(ExtensiblePolymorphicModel):
"""
Return OAuth2 scope name to access PDF file via API.
"""
return
f
"
{
self
.
SCOPE_PREFIX
}
_
{
self
.
slug
}
"
def
save
(
self
,
*
args
,
**
kwargs
):
with
reversion
.
create_revision
():
super
().
save
(
*
args
,
**
kwargs
)
def
get_context_data
(
self
)
->
dict
[
str
,
Any
]:
"""
Get context to pass to the PDF template.
"""
return
{}
...
...
@@ -264,10 +271,3 @@ class LiveDocument(ExtensiblePolymorphicModel):
self
.
last_update_triggered_manually
=
triggered_manually
self
.
current_file
.
save
(
self
.
filename
,
file_object
.
file
.
file
)
self
.
save
()
def
__str__
(
self
)
->
str
:
return
self
.
name
class
Meta
:
verbose_name
=
_
(
"
Live document
"
)
verbose_name_plural
=
_
(
"
Live documents
"
)
This diff is collapsed.
Click to expand it.
docs/conf.py
+
2
−
2
View file @
256e4508
...
...
@@ -29,9 +29,9 @@ copyright = "2018-2022 The AlekSIS team"
author
=
"
The AlekSIS Team
"
# The short X.Y version
version
=
"
3.
0
"
version
=
"
3.
1
"
# The full version, including alpha/beta/rc tags
release
=
"
3.
0
.1.dev0
"
release
=
"
3.
1
.1.dev0
"
# -- General configuration ---------------------------------------------------
...
...
This diff is collapsed.
Click to expand it.
pyproject.toml
+
1
−
1
View file @
256e4508
[tool.poetry]
name
=
"AlekSIS-App-Resint"
version
=
"3.
0
.1.dev0"
version
=
"3.
1
.1.dev0"
packages
=
[
{
include
=
"aleksis"
}
]
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment