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
c18e4779
Commit
c18e4779
authored
3 years ago
by
Nik | Klampfradler
Browse files
Options
Downloads
Plain Diff
Merge branch '10-button-create-live-document-does-nothing' into 'master'
Resolve "Button "Create live document" does nothing" Closes
#10
See merge request
!36
parents
7ed0d381
82582c6c
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!36
Resolve "Button "Create live document" does nothing"
Pipeline
#49592
canceled
3 years ago
Stage: prepare
Stage: test
Stage: build
Stage: publish
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CHANGELOG.rst
+1
-0
1 addition, 0 deletions
CHANGELOG.rst
aleksis/apps/resint/templates/resint/live_document/list.html
+21
-14
21 additions, 14 deletions
aleksis/apps/resint/templates/resint/live_document/list.html
aleksis/apps/resint/views.py
+1
-1
1 addition, 1 deletion
aleksis/apps/resint/views.py
with
23 additions
and
15 deletions
CHANGELOG.rst
+
1
−
0
View file @
c18e4779
...
@@ -18,6 +18,7 @@ Fixed
...
@@ -18,6 +18,7 @@ Fixed
~~~~~
~~~~~
* Live documents table showed two "Actions" columns.
* Live documents table showed two "Actions" columns.
* Button for creation of live documents was there even if there weren't any live document types registered.
`2.0`_ - 2021-12-27
`2.0`_ - 2021-12-27
-------------------
-------------------
...
...
This diff is collapsed.
Click to expand it.
aleksis/apps/resint/templates/resint/live_document/list.html
+
21
−
14
View file @
c18e4779
...
@@ -9,21 +9,28 @@
...
@@ -9,21 +9,28 @@
{% block page_title %}{% blocktrans %}Live documents{% endblocktrans %}{% endblock %}
{% block page_title %}{% blocktrans %}Live documents{% endblocktrans %}{% endblock %}
{% block content %}
{% block content %}
<a
class=
"btn green waves-effect waves-light dropdown-trigger"
href=
"#"
data-target=
"widget-dropdown"
>
{% if document_types %}
<i
class=
"material-icons left"
>
add
</i>
<a
class=
"btn green waves-effect waves-light dropdown-trigger"
href=
"#"
data-target=
"widget-dropdown"
>
{% trans "Create live document" %}
<i
class=
"material-icons left"
>
add
</i>
</a>
{% trans "Create live document" %}
</a>
<ul
id=
"widget-dropdown"
class=
"dropdown-content"
>
<ul
id=
"widget-dropdown"
class=
"dropdown-content"
>
{% for ct, model in widget_types %}
{% for ct, model in document_types %}
<li>
<li>
<a
href=
"{% url 'create_live_document' ct.app_label ct.model %}"
>
<a
href=
"{% url 'create_live_document' ct.app_label ct.model %}"
>
{% verbose_name_object model as widget_name %}
{% verbose_name_object model as document_name %}
{% blocktrans with name=widget_name %}Create {{ name }}{% endblocktrans %}
{% blocktrans with name=document_name %}Create {{ name }}{% endblocktrans %}
</a>
</a>
</li>
</li>
{% endfor %}
{% endfor %}
</ul>
</ul>
{% else %}
<figure
class=
"alert primary"
>
<i
class=
"material-icons left"
>
info
</i>
{% trans "There is no app installed which registers any live document types." %}
</figure>
{% endif %}
{% render_table table %}
{% render_table table %}
{% endblock %}
{% endblock %}
This diff is collapsed.
Click to expand it.
aleksis/apps/resint/views.py
+
1
−
1
View file @
c18e4779
...
@@ -160,7 +160,7 @@ class LiveDocumentListView(PermissionRequiredMixin, SingleTableView):
...
@@ -160,7 +160,7 @@ class LiveDocumentListView(PermissionRequiredMixin, SingleTableView):
def
get_context_data
(
self
,
**
kwargs
:
Any
)
->
dict
[
str
,
Any
]:
def
get_context_data
(
self
,
**
kwargs
:
Any
)
->
dict
[
str
,
Any
]:
context
=
super
().
get_context_data
(
**
kwargs
)
context
=
super
().
get_context_data
(
**
kwargs
)
context
[
"
widge
t_types
"
]
=
[
context
[
"
documen
t_types
"
]
=
[
(
ContentType
.
objects
.
get_for_model
(
m
,
False
),
m
)
for
m
in
LiveDocument
.
__subclasses__
()
(
ContentType
.
objects
.
get_for_model
(
m
,
False
),
m
)
for
m
in
LiveDocument
.
__subclasses__
()
]
]
return
context
return
context
...
...
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