Merge branch 'master' into v0.9

Conflicts:
	ishtar_common/views.py

1 files changed, 5 insertions, 2 deletions

diff --git a/ishtar_common/forms.py b/ishtar_common/forms.py
index a5abdddcd..5e0d14eb8 100644
--- a/ishtar_common/forms.py
+++ b/ishtar_common/forms.py
@@ -128,7 +128,7 @@ class ClosingDateFormSelection(forms.Form):
 def get_form_selection(
         class_name, label, key, model, base_form, get_url,
         not_selected_error=_(u"You should select an item."), new=False,
-        new_message=_(u"Add a new item")):
+        new_message=_(u"Add a new item"), get_full_url=None):
     """
     Generate a class selection form
         class_name -- name of the class
@@ -145,11 +145,14 @@ def get_form_selection(
              'form_label': label,
              'associated_models': {key: model},
              'currents': {key: model}}
+    widget_kwargs = {"new": new, "new_message": new_message}
+    if get_full_url:
+        widget_kwargs['source_full'] = reverse_lazy(get_full_url)
     attrs[key] = forms.IntegerField(
         label="", required=False,
         validators=[models.valid_id(model)],
         widget=widgets.JQueryJqGrid(reverse_lazy(get_url), base_form, model,
-                                    new=new, new_message=new_message))
+                                    **widget_kwargs))
 
     def clean(self):
         cleaned_data = self.cleaned_data