matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove success messages from the assign_remove view, allow passing null lists titles

Browse Source
This commit is contained in:
Roberto Rosario
2014-10-30 02:24:56 -04:00
parent 95a27df1e3
commit 1abb4e6ece
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mayan/apps/common/views.py
View File

@@ -66,7 +66,7 @@ def get_obj_from_content_type_string(string):
return ct.get_object_for_this_type(pk=pk) return ct.get_object_for_this_type(pk=pk)
def assign_remove(request, left_list, right_list, add_method, remove_method, left_list_title, right_list_title, decode_content_type=False, extra_context=None, grouped=False): def assign_remove(request, left_list, right_list, add_method, remove_method, left_list_title=None, right_list_title=None, decode_content_type=False, extra_context=None, grouped=False):
left_list_name = u'left_list' left_list_name = u'left_list'
right_list_name = u'right_list' right_list_name = u'right_list'
@@ -91,13 +91,11 @@ def assign_remove(request, left_list, right_list, add_method, remove_method, lef
selection_obj = selection selection_obj = selection
try: try:
add_method(selection_obj) add_method(selection_obj)
messages.success(request, _(u'%(selection)s added successfully added to %(right_list_title)s.') % {
'selection': label, 'right_list_title': right_list_title})
except: except:
if settings.DEBUG: if settings.DEBUG:
raise raise
else: else:
messages.error(request, _(u'Unable to add %(selection)s to %(right_list_title)s.') % { messages.error(request, _(u'Unable to remove %(selection)s.') % {
'selection': label, 'right_list_title': right_list_title}) 'selection': label, 'right_list_title': right_list_title})
elif u'%s-submit' % right_list_name in request.POST.keys(): elif u'%s-submit' % right_list_name in request.POST.keys():
@@ -118,13 +116,11 @@ def assign_remove(request, left_list, right_list, add_method, remove_method, lef
selection = get_obj_from_content_type_string(selection) selection = get_obj_from_content_type_string(selection)
try: try:
remove_method(selection) remove_method(selection)
messages.success(request, _(u'%(selection)s added successfully removed from %(right_list_title)s.') % {
'selection': label, 'right_list_title': right_list_title})
except: except:
if settings.DEBUG: if settings.DEBUG:
raise raise
else: else:
messages.error(request, _(u'Unable to add %(selection)s to %(right_list_title)s.') % { messages.error(request, _(u'Unable to add %(selection)s.') % {
'selection': label, 'right_list_title': right_list_title}) 'selection': label, 'right_list_title': right_list_title})
unselected_list = ChoiceForm(prefix=left_list_name, choices=left_list()) unselected_list = ChoiceForm(prefix=left_list_name, choices=left_list())
selected_list = ChoiceForm(prefix=right_list_name, choices=right_list()) selected_list = ChoiceForm(prefix=right_list_name, choices=right_list())
@@ -136,7 +132,7 @@ def assign_remove(request, left_list, right_list, add_method, remove_method, lef
'grid': 6, 'grid': 6,
'context': { 'context': {
'form': unselected_list, 'form': unselected_list,
'title': left_list_title, 'title': left_list_title or ' ',
'submit_label': _(u'Add'), 'submit_label': _(u'Add'),
'submit_icon_famfam': 'add' 'submit_icon_famfam': 'add'
} }
@@ -147,7 +143,7 @@ def assign_remove(request, left_list, right_list, add_method, remove_method, lef
'grid_clear': True, 'grid_clear': True,
'context': { 'context': {
'form': selected_list, 'form': selected_list,
'title': right_list_title, 'title': right_list_title or ' ',
'submit_label': _(u'Remove'), 'submit_label': _(u'Remove'),
'submit_icon_famfam': 'delete' 'submit_icon_famfam': 'delete'
} }