Fix pr/hrm_AssignMethods to close popup after assigning inside popup

VERSION

@@ -1 +1 @@
-7089b6f (2017-12-01 15:32:10)
+0d3d6b9 (2017-12-01 15:45:40)

modules/s3db/hrm.py

@@ -5068,12 +5068,19 @@ def apply_method(self, r, **attr):
                             form = Storage(vars=link)
                             onaccept(form)
                         added += 1
-            current.session.confirmation = T("%(number)s assigned") % \
-                                           dict(number=added)
-            if added > 0:
-                redirect(URL(args=[r.id, self.next_tab], vars={}))
+
+            if r.representation == "popup":
+                # Don't redirect, so we retain popup extension & so close popup
+                response.confirmation = T("%(number)s assigned") % \
+                                            dict(number=added)
+                return {}
             else:
-                redirect(URL(args=r.args, vars={}))
+                current.session.confirmation = T("%(number)s assigned") % \
+                                                    dict(number=added)
+                if added > 0:
+                    redirect(URL(args=[r.id, self.next_tab], vars={}))
+                else:
+                    redirect(URL(args=r.args, vars={}))
 
         elif r.http == "GET":
 
@@ -5141,7 +5148,7 @@ def apply_method(self, r, **attr):
             # Bulk actions
             dt_bulk_actions = [(T("Assign"), "assign")]
 
-            if r.representation == "html":
+            if r.representation in ("html", "popup"):
                 # Page load
                 resource.configure(deletable = False)
 
@@ -5215,9 +5222,9 @@ def apply_method(self, r, **attr):
                                 )
 
                 STAFF = settings.get_hrm_staff_label()
-                output = dict()
 
                 response.view = "list_filter.html"
+
                 return {"items": items,
                         "title": T("Assign %(staff)s") % dict(staff=STAFF),
                         "list_filter_form": ff,

modules/s3db/pr.py

@@ -6926,12 +6926,19 @@ def apply_method(self, r, **attr):
                             form = Storage(vars=link)
                             onaccept(form)
                         added += 1
-            current.session.confirmation = T("%(number)s assigned") % \
-                                           dict(number=added)
-            if added > 0:
-                redirect(URL(args=[r.id, self.next_tab], vars={}))
+
+            if r.representation == "popup":
+                # Don't redirect, so we retain popup extension & so close popup
+                response.confirmation = T("%(number)s assigned") % \
+                                            dict(number=added)
+                return {}
             else:
-                redirect(URL(args=r.args, vars={}))
+                current.session.confirmation = T("%(number)s assigned") % \
+                                                    dict(number=added)
+                if added > 0:
+                    redirect(URL(args=[r.id, self.next_tab], vars={}))
+                else:
+                    redirect(URL(args=r.args, vars={}))
 
         elif r.http == "GET":
 
@@ -7018,8 +7025,7 @@ def apply_method(self, r, **attr):
             # Bulk actions
             dt_bulk_actions = [(T("Assign"), "assign")]
 
-            representation = r.representation
-            if representation in ("html", "popup"):
+            if r.representation in ("html", "popup"):
                 # Page load
                 resource.configure(deletable = False)
 
@@ -7094,16 +7100,12 @@ def apply_method(self, r, **attr):
 
                 response.view = "list_filter.html"
 
-                if r.representation == "popup":
-                    # Don't redirect, so we retain popup extension & so close popup
-                    self.next = None
-
                 return {"items": items,
                         "title": T("Assign People"),
                         "list_filter_form": ff,
                         }
 
-            elif representation == "aadata":
+            elif r.representation == "aadata":
                 # Ajax refresh
                 if "draw" in get_vars:
                     echo = int(get_vars.draw)