summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2016-06-22 12:02:48 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2016-06-22 12:02:48 +0200
commit9277ed4dbc77b6c70bb1f1420f9b5c3b33174ceb (patch)
tree7110f2f745ecb8e54f5b38577704a52d99ebce73
parent8b3df5517e610cf7f1bf4f6ffe537d887997aa1b (diff)
downloadIshtar-9277ed4dbc77b6c70bb1f1420f9b5c3b33174ceb.tar.bz2
Ishtar-9277ed4dbc77b6c70bb1f1420f9b5c3b33174ceb.zip
Add link to modify sources in the sheet
-rw-r--r--archaeological_context_records/models.py1
-rw-r--r--archaeological_context_records/urls.py4
-rw-r--r--archaeological_context_records/views.py9
-rw-r--r--archaeological_finds/models.py1
-rw-r--r--archaeological_finds/urls.py2
-rw-r--r--archaeological_finds/views.py9
-rw-r--r--archaeological_operations/models.py1
-rw-r--r--archaeological_operations/urls.py2
-rw-r--r--archaeological_operations/views.py9
-rw-r--r--ishtar_common/templates/ishtar/sheet_person.html2
-rw-r--r--ishtar_common/templates/ishtar/sheet_source.html2
-rw-r--r--ishtar_common/templates/ishtar/sheet_toolbar.html2
12 files changed, 40 insertions, 4 deletions
diff --git a/archaeological_context_records/models.py b/archaeological_context_records/models.py
index ddd9c8609..e449e893d 100644
--- a/archaeological_context_records/models.py
+++ b/archaeological_context_records/models.py
@@ -313,6 +313,7 @@ post_delete.connect(post_delete_record_relation, sender=RecordRelations)
class ContextRecordSource(Source):
SHOW_URL = 'show-contextrecordsource'
+ MODIFY_URL = 'record_source_modify'
class Meta:
verbose_name = _(u"Context record documentation")
diff --git a/archaeological_context_records/urls.py b/archaeological_context_records/urls.py
index 52af8bda9..84560da67 100644
--- a/archaeological_context_records/urls.py
+++ b/archaeological_context_records/urls.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-# Copyright (C) 2010-2013 Étienne Loks <etienne.loks_AT_peacefrogsDOTnet>
+# Copyright (C) 2010-2016 Étienne Loks <etienne.loks_AT_peacefrogsDOTnet>
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
@@ -51,6 +51,8 @@ urlpatterns = patterns(
check_rights(['change_contextrecord', 'change_own_contextrecord'])(
views.record_source_modification_wizard),
name='record_source_modification'),
+ url(r'record_source_modify/(?P<pk>.+)/$',
+ views.record_source_modify, name='record_source_modify'),
url(r'record_source_deletion/(?P<step>.+)?$',
check_rights(['change_contextrecord', 'change_own_contextrecord'])(
views.record_source_deletion_wizard),
diff --git a/archaeological_context_records/views.py b/archaeological_context_records/views.py
index 839dbed9e..c76413977 100644
--- a/archaeological_context_records/views.py
+++ b/archaeological_context_records/views.py
@@ -161,6 +161,15 @@ record_source_modification_wizard = RecordSourceWizard.as_view([
label=_(u"Context record: source modification"),
url_name='record_source_modification',)
+
+def record_source_modify(request, pk):
+ record_source_modification_wizard(request)
+ RecordSourceWizard.session_set_value(
+ request, 'selec-record_source_modification', 'pk', pk, reset=True)
+ return redirect(reverse(
+ 'record_source_modification',
+ kwargs={'step': 'source-record_source_modification'}))
+
record_source_deletion_wizard = RecordSourceDeletionWizard.as_view([
('selec-record_source_deletion', RecordSourceFormSelection),
('final-record_source_deletion', RecordDeletionForm)],
diff --git a/archaeological_finds/models.py b/archaeological_finds/models.py
index adfa67394..3861a7003 100644
--- a/archaeological_finds/models.py
+++ b/archaeological_finds/models.py
@@ -595,6 +595,7 @@ class Find(BaseHistorizedItem, ImageModel, OwnPerms, ShortMenuItem):
class FindSource(Source):
SHOW_URL = 'show-findsource'
+ MODIFY_URL = 'find_source_modify'
class Meta:
verbose_name = _(u"Find documentation")
diff --git a/archaeological_finds/urls.py b/archaeological_finds/urls.py
index e66743bf4..5c859a83f 100644
--- a/archaeological_finds/urls.py
+++ b/archaeological_finds/urls.py
@@ -51,6 +51,8 @@ urlpatterns = patterns(
check_rights(['change_find', 'change_own_find'])(
views.find_source_modification_wizard),
name='find_source_modification'),
+ url(r'find_source_modify/(?P<pk>.+)/$',
+ views.find_source_modify, name='find_source_modify'),
url(r'find_source_deletion/(?P<step>.+)?$',
check_rights(['change_find', 'change_own_find'])(
views.find_source_deletion_wizard),
diff --git a/archaeological_finds/views.py b/archaeological_finds/views.py
index 7bcca32c8..d980ebd69 100644
--- a/archaeological_finds/views.py
+++ b/archaeological_finds/views.py
@@ -153,6 +153,15 @@ find_source_modification_wizard = FindSourceWizard.as_view([
label=_(u"Find: source modification"),
url_name='find_source_modification',)
+
+def find_source_modify(request, pk):
+ find_source_modification_wizard(request)
+ FindSourceWizard.session_set_value(
+ request, 'selec-find_source_modification', 'pk', pk, reset=True)
+ return redirect(reverse(
+ 'find_source_modification',
+ kwargs={'step': 'source-find_source_modification'}))
+
find_source_deletion_wizard = FindSourceDeletionWizard.as_view([
('selec-find_source_deletion', FindSourceFormSelection),
('final-find_source_deletion', SourceDeletionForm)],
diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py
index 6ae05ca30..0ae042bf0 100644
--- a/archaeological_operations/models.py
+++ b/archaeological_operations/models.py
@@ -517,6 +517,7 @@ class OperationSource(Source):
TABLE_COLS = ['operation.year', 'operation.operation_code'] + \
Source.TABLE_COLS
SHOW_URL = 'show-operationsource'
+ MODIFY_URL = 'operation_source_modify'
@property
def owner(self):
diff --git a/archaeological_operations/urls.py b/archaeological_operations/urls.py
index ef7d14dd6..b25390bca 100644
--- a/archaeological_operations/urls.py
+++ b/archaeological_operations/urls.py
@@ -56,6 +56,8 @@ urlpatterns = patterns(
check_rights(['change_operation', 'change_own_operation'])(
views.operation_source_modification_wizard),
name='operation_source_modification'),
+ url(r'operation_source_modify/(?P<pk>.+)/$',
+ views.operation_source_modify, name='operation_source_modify'),
url(r'operation_source_deletion/(?P<step>.+)?$',
check_rights(['change_operation', 'change_own_operation'])(
views.operation_source_deletion_wizard),
diff --git a/archaeological_operations/views.py b/archaeological_operations/views.py
index 0b9b9c453..14160266b 100644
--- a/archaeological_operations/views.py
+++ b/archaeological_operations/views.py
@@ -361,6 +361,15 @@ operation_source_modification_wizard = OperationSourceWizard.as_view([
label=_(u"Operation: source modification"),
url_name='operation_source_modification',)
+
+def operation_source_modify(request, pk):
+ operation_source_modification_wizard(request)
+ OperationSourceWizard.session_set_value(
+ request, 'selec-operation_source_modification', 'pk', pk, reset=True)
+ return redirect(reverse(
+ 'operation_source_modification',
+ kwargs={'step': 'source-operation_source_modification'}))
+
operation_source_deletion_wizard = OperationSourceDeletionWizard.as_view([
('selec-operation_source_deletion', OperationSourceFormSelection),
('final-operation_source_deletion', SourceDeletionForm)],
diff --git a/ishtar_common/templates/ishtar/sheet_person.html b/ishtar_common/templates/ishtar/sheet_person.html
index f63bbc588..90b65b72c 100644
--- a/ishtar_common/templates/ishtar/sheet_person.html
+++ b/ishtar_common/templates/ishtar/sheet_person.html
@@ -2,7 +2,7 @@
{% load i18n window_field window_tables %}
{% block header_title %}<h1>{% trans "Person"%}</h1>{% endblock %}
-{% block toolbar %}{% include "ishtar/sheet_toolbar.html" %}{% endblock %}
+{% block toolbar %}{% with current_action='person_modification' %}{% include "ishtar/sheet_toolbar.html" %}{% endwith %}{% endblock %}
{% block content %}
<h3>{% trans "Identity" %}</h3>
diff --git a/ishtar_common/templates/ishtar/sheet_source.html b/ishtar_common/templates/ishtar/sheet_source.html
index 06001f783..ae3a67b5f 100644
--- a/ishtar_common/templates/ishtar/sheet_source.html
+++ b/ishtar_common/templates/ishtar/sheet_source.html
@@ -1,6 +1,6 @@
{% extends "ishtar/sheet.html" %}
{% load i18n window_field link_to_window %}
-{% block toolbar %}{% include "ishtar/sheet_toolbar.html" %}{% endblock %}
+{% block toolbar %}{% with current_action='operation_source_modification' %}{% include "ishtar/sheet_toolbar.html" %}{% endwith %}{% endblock %}
{% block content %}
{% block general %}
{% field "Title" item.title %}
diff --git a/ishtar_common/templates/ishtar/sheet_toolbar.html b/ishtar_common/templates/ishtar/sheet_toolbar.html
index a6736b6cc..d9d4cc1a5 100644
--- a/ishtar_common/templates/ishtar/sheet_toolbar.html
+++ b/ishtar_common/templates/ishtar/sheet_toolbar.html
@@ -1,2 +1,2 @@
{% load i18n link_to_window %}<div class='tool'>{% trans "Export as:" %} <a href='{{item|link_to_odt}}'>{%trans "OpenOffice.org file"%}</a>, <a href='{{item|link_to_pdf}}'>{%trans "PDF file"%}</a></div>
-{% modify_toolbar item "person_modification" %}
+{% modify_toolbar item current_action %}