Skip to content

Commit

Permalink
[solve #27] create success message
Browse files Browse the repository at this point in the history
  • Loading branch information
valdergallo committed Oct 21, 2015
1 parent 6b0782a commit 5d993c9
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 4 deletions.
2 changes: 1 addition & 1 deletion data_importer/importers/generic.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def get_source_file_extension(self):
Gets the source file extension. Used to choose the right reader
"""
if hasattr(self.source, 'file') and hasattr(self.source.file, 'name'):
filename = self.source.file.name # File instances
filename = self.source.file.name # File instances
elif hasattr(self.source, 'file_upload'):
if hasattr(self.source.file_upload, 'name'):
filename = self.source.file_upload.name # Default DataImporter.models.FileUploadHistory
Expand Down
8 changes: 8 additions & 0 deletions data_importer/models_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,11 @@ class Invoice(models.Model):

def __unicode__(self):
return self.name


class ItemInvoice(models.Model):
invoice = models.ForeignKey(Invoice)
name = models.CharField(max_length=50)

def __unicode__(self):
return self.name
9 changes: 7 additions & 2 deletions data_importer/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,11 @@ class DataImporterCreateView(DataImporterForm):
importer = None
is_task = True
success_url = '.'
extra_context = {'title': 'Form Data Importer', 'template_file': 'myfile.csv'}
extra_context = {
'title': 'Form Data Importer',
'template_file': 'myfile.csv',
'success_message': "File uploaded successfully"
}

def get_context_data(self, **kwargs):
context = super(DataImporterForm, self).get_context_data(**kwargs)
Expand All @@ -61,7 +65,8 @@ def form_valid(self, form, owner=None):
if self.task.parser.errors:
messages.error(self.request, self.task.parser.errors)
else:
messages.success(self.request, "File uploaded successfully")
messages.success(self.request,
self.extra_context.get('success_message', "File uploaded successfully"))
else:
self.task.delay(importer=self.importer, source=file_history, owner=owner)
if owner:
Expand Down
3 changes: 2 additions & 1 deletion example/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,6 @@ class Meta:

class DataImporterCreateView(DataImporterForm):
extra_context = {'title': 'Create Form Data Importer',
'template_file': 'myfile.csv'}
'template_file': 'myfile.csv',
'success_message': "File uploaded successfully"}
importer = ExampleCSVImporter

0 comments on commit 5d993c9

Please sign in to comment.