summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2017-01-09 23:31:07 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2017-01-09 23:31:07 +0100
commit12a1f034093f5a35946453fa3645bd9c5d2d6b6b (patch)
treedeed6858b41640723945c2751f3f98e04a8a8ec7
parentc5a3a847fee2b13e8556f4253803f6e3eb86480b (diff)
downloadIshtar-12a1f034093f5a35946453fa3645bd9c5d2d6b6b.tar.bz2
Ishtar-12a1f034093f5a35946453fa3645bd9c5d2d6b6b.zip
Fix typo
-rw-r--r--archaeological_finds/models_treatments.py27
-rw-r--r--archaeological_finds/views.py26
2 files changed, 27 insertions, 26 deletions
diff --git a/archaeological_finds/models_treatments.py b/archaeological_finds/models_treatments.py
index 0f4a53afc..b8ed79a62 100644
--- a/archaeological_finds/models_treatments.py
+++ b/archaeological_finds/models_treatments.py
@@ -104,7 +104,7 @@ class Treatment(BaseHistorizedItem, ImageModel, OwnPerms, ShortMenuItem):
treatment_types = models.ManyToManyField(
TreatmentType, verbose_name=_(u"Treatment type"))
treatment_state = models.ForeignKey(
- TreatmentState, verbose_name=_(u"State"), blank=True, null=True,
+ TreatmentState, verbose_name=_(u"State"), blank=True, null=True,
)
location = models.ForeignKey(
Warehouse, verbose_name=_(u"Location"), blank=True, null=True,
@@ -126,7 +126,8 @@ class Treatment(BaseHistorizedItem, ImageModel, OwnPerms, ShortMenuItem):
end_date = models.DateField(_(u"Closing date"), blank=True, null=True)
container = models.ForeignKey(Container, verbose_name=_(u"Container"),
blank=True, null=True)
- target_is_basket = models.BooleanField(_(u"Target a basket"), default=False)
+ target_is_basket = models.BooleanField(_(u"Target a basket"),
+ default=False)
cached_label = models.TextField(_(u"Cached name"), null=True, blank=True)
history = HistoricalRecords()
@@ -157,7 +158,7 @@ class Treatment(BaseHistorizedItem, ImageModel, OwnPerms, ShortMenuItem):
def get_query_owns(cls, user):
return (Q(history_creator=user) |
Q(person__ishtaruser=user.ishtaruser)) \
- & Q(end_date__isnull=True)
+ & Q(end_date__isnull=True)
@classmethod
def get_owns(cls, user, menu_filtr=None, limit=None):
@@ -239,7 +240,7 @@ class Treatment(BaseHistorizedItem, ImageModel, OwnPerms, ShortMenuItem):
@property
def associated_filename(self):
return "-".join([str(slugify(getattr(self, attr)))
- for attr in ('year', 'index', 'label')])
+ for attr in ('year', 'index', 'label')])
post_save.connect(cached_label_changed, sender=Treatment)
@@ -429,7 +430,7 @@ post_delete.connect(post_save_cache, sender=TreatmentFileType)
class TreatmentFile(ClosedItem, BaseHistorizedItem, OwnPerms, ValueGetter,
- ShortMenuItem):
+ ShortMenuItem):
SLUG = 'treatmentfile'
SHOW_URL = 'show-treatmentfile'
TABLE_COLS = ['type', 'year', 'index', 'internal_reference', 'name']
@@ -444,8 +445,8 @@ class TreatmentFile(ClosedItem, BaseHistorizedItem, OwnPerms, ValueGetter,
external_id = models.CharField(_(u"External ID"), blank=True, null=True,
max_length=200)
name = models.TextField(_(u"Name"), blank=True, null=True)
- type = models.ForeignKey(TreatmentFileType, verbose_name=_(u"Treatment "
- u"request type"))
+ type = models.ForeignKey(TreatmentFileType,
+ verbose_name=_(u"Treatment request type"))
in_charge = models.ForeignKey(
Person, related_name='treatmentfile_responsability',
verbose_name=_(u"Person in charge"), on_delete=models.SET_NULL,
@@ -473,15 +474,15 @@ class TreatmentFile(ClosedItem, BaseHistorizedItem, OwnPerms, ValueGetter,
verbose_name_plural = _(u"Treatment requests")
unique_together = ('year', 'index')
permissions = (
- ("view_filetreatement",
+ ("view_filetreatment",
ugettext(u"Can view all Treatment requests")),
- ("view_own_filetreatement",
+ ("view_own_filetreatment",
ugettext(u"Can view own Treatment request")),
- ("add_own_filetreatement",
+ ("add_own_filetreatment",
ugettext(u"Can add own Treatment request")),
- ("change_own_filetreatement",
+ ("change_own_filetreatment",
ugettext(u"Can change own Treatment request")),
- ("delete_own_filetreatement",
+ ("delete_own_filetreatment",
ugettext(u"Can delete own Treatment request")),
)
ordering = ('cached_label',)
@@ -497,7 +498,7 @@ class TreatmentFile(ClosedItem, BaseHistorizedItem, OwnPerms, ValueGetter,
def get_query_owns(cls, user):
return (Q(history_creator=user) |
Q(in_charge__ishtaruser=user.ishtaruser)) \
- & Q(end_date__isnull=True)
+ & Q(end_date__isnull=True)
@property
def associated_filename(self):
diff --git a/archaeological_finds/views.py b/archaeological_finds/views.py
index e36d65068..01e88c1b7 100644
--- a/archaeological_finds/views.py
+++ b/archaeological_finds/views.py
@@ -58,7 +58,7 @@ get_find_for_treatment = get_item(
own_table_cols=models.Find.TABLE_COLS_FOR_OPE, base_request={})
show_treatment = show_item(models.Treatment, 'treatment')
-get_treatment = get_item(models.Treatment, 'get_treatement', 'treatment')
+get_treatment = get_item(models.Treatment, 'get_treatment', 'treatment')
get_administrativeacttreatment = get_item(
AdministrativeAct, 'get_administrativeacttreatment',
@@ -66,7 +66,7 @@ get_administrativeacttreatment = get_item(
base_request={"treatment__pk__isnull": False})
show_treatmentfile = show_item(models.TreatmentFile, 'treatmentfile')
-get_treatmentfile = get_item(models.TreatmentFile, 'get_treatementfile',
+get_treatmentfile = get_item(models.TreatmentFile, 'get_treatmentfile',
'treatmentfile')
get_administrativeacttreatmentfile = get_item(
@@ -90,8 +90,8 @@ def autocomplete_treatmentfile(request):
for q1 in q.split(' '):
for q in q1.split(' '):
extra = Q(internal_reference__icontains=q) | \
- Q(external_id__icontains=q) | \
- Q(name__icontains=q)
+ Q(external_id__icontains=q) | \
+ Q(name__icontains=q)
try:
int(q)
extra = extra | Q(year=q) | Q(index=q)
@@ -368,14 +368,14 @@ treatment_creation_wizard = TreatmentWizard.as_view(
'selecbasket-treatment_creation':
check_value('basetreatment-treatment_creation',
'target_is_basket', True),
- # 'resultfinds-treatment_creation':
- # check_type_field('basetreatment-treatment_creation',
- # 'treatment_type', models.TreatmentType,
- # 'downstream_is_many'),
- # 'resultfind-treatment_creation':
- # check_type_field('basetreatment-treatment_creation',
- # 'treatment_type', models.TreatmentType,
- # 'upstream_is_many')
+ # 'resultfinds-treatment_creation':
+ # check_type_field('basetreatment-treatment_creation',
+ # 'treatment_type', models.TreatmentType,
+ # 'downstream_is_many'),
+ # 'resultfind-treatment_creation':
+ # check_type_field('basetreatment-treatment_creation',
+ # 'treatment_type', models.TreatmentType,
+ # 'upstream_is_many')
},
label=_(u"New treatment"),
url_name='treatment_creation',)
@@ -499,7 +499,7 @@ treatmentfile_deletion_wizard = TreatmentFileDeletionWizard.as_view([
treatmentfile_admacttreatmentfile_search_wizard = \
SearchWizard.as_view([
('selec-treatmentfle_admacttreatmentfle_search',
- AdministrativeActTreatmentFileFormSelection)],
+ AdministrativeActTreatmentFileFormSelection)],
label=_(u"Treatment request: search administrative act"),
url_name='treatmentfle_admacttreatmentfle_search',)