Skip to content

Commit

Permalink
* Comment out the archive feature. This will be implemented eventuall…
Browse files Browse the repository at this point in the history
…y, but need to get the 0.4Beta out the door soon.
  • Loading branch information
bgroff committed Nov 14, 2018
1 parent 7468d4c commit 5441805
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 15 deletions.
4 changes: 2 additions & 2 deletions django_kala/organizations/templates/includes/sidebar.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<div class="menu">
<a class="item {% if request.resolver_match.url_name == 'details' %}active{% endif %}"
href="{% url 'organizations:details' organization.pk %}">{% trans 'Details' %}</a>
<a class="item {% if request.resolver_match.url_name == 'archive' %}active{% endif %}"
href="{# {% url 'organizations:archive' organization.pk %}#}">{% trans 'Archive' %}</a>
{# <a class="item {% if request.resolver_match.url_name == 'archive' %}active{% endif %}"#}
{# href="{% url 'organizations:archive' organization.pk %}">{% trans 'Archive' %}</a>#}
<a class="item {% if request.resolver_match.url_name == 'delete' %}active{% endif %}"
href="{% url 'organizations:delete' organization.pk %}">{% trans 'Delete' %}</a>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
<div class="menu">
<a class="item {% if request.resolver_match.url_name == 'document_details' %}active{% endif %}"
href="{% url 'projects:document_details' document.project.pk document.pk %}">{% trans 'Details' %}</a>
<a class="item {% if request.resolver_match.url_name == 'document_archive' %}active{% endif %}"
href="{% url 'projects:document_archive' document.project.pk document.pk %}">{% trans 'Archive' %}</a>
{# <a class="item {% if request.resolver_match.url_name == 'document_archive' %}active{% endif %}"#}
{# href="{% url 'projects:document_archive' document.project.pk document.pk %}">{% trans 'Archive' %}</a>#}
<a class="item {% if request.resolver_match.url_name == 'document_delete' %}active{% endif %}"
href="{% url 'projects:document_delete' document.project.pk document.pk %}">{% trans 'Delete' %}</a>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<div class="header">{% trans 'Project' %}</div>
<div class="menu">
<a class="item {% if request.resolver_match.url_name == 'details' %}active{% endif %}" href="{% url 'projects:details' project.pk %}">{% trans 'Details' %}</a>
<a class="item {% if request.resolver_match.url_name == 'archive' %}active{% endif %}" href="{% url 'projects:archive' project.pk %}">{% trans 'Archive' %}</a>
{# <a class="item {% if request.resolver_match.url_name == 'archive' %}active{% endif %}" href="{% url 'projects:archive' project.pk %}">{% trans 'Archive' %}</a>#}
<a class="item {% if request.resolver_match.url_name == 'delete' %}active{% endif %}" href="{% url 'projects:delete' project.pk %}">{% trans 'Delete' %}</a>
</div>
</div>
Expand Down
20 changes: 10 additions & 10 deletions django_kala/projects/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,11 @@
name='document_details'
),

url(
regex=r'^(?P<project_pk>\d+)/(?P<document_pk>\d+)/settings/archive',
view=DocumentArchiveView.as_view(),
name='document_archive'
),
# url(
# regex=r'^(?P<project_pk>\d+)/(?P<document_pk>\d+)/settings/archive',
# view=DocumentArchiveView.as_view(),
# name='document_archive'
# ),

url(
regex=r'^(?P<project_pk>\d+)/(?P<document_pk>\d+)/settings/delete',
Expand All @@ -100,11 +100,11 @@
name='details'
),

url(
regex=r'^(?P<pk>\d+)/settings/archive$',
view=ArchiveView.as_view(),
name='archive'
),
# url(
# regex=r'^(?P<pk>\d+)/settings/archive$',
# view=ArchiveView.as_view(),
# name='archive'
# ),

url(
regex=r'^(?P<pk>\d+)/settings/delete',
Expand Down

0 comments on commit 5441805

Please sign in to comment.