better logic in appadmin csv, thanks Paolo Betti

VERSION

@@ -1 +1 @@
-Version 2.00.0 (2012-08-19 10:03:24) dev
+Version 2.00.0 (2012-08-19 10:12:29) dev

applications/admin/controllers/appadmin.py

@@ -222,14 +222,15 @@ def select():
             (rows, nrows) = ([], 0)
             response.flash = DIV(T('Invalid Query'),PRE(str(e)))
     # begin handle upload csv
-    if table:
+    csv_table = table or request.vars.table
+    if csv_table:
         formcsv = FORM(str(T('or import from csv file'))+" ",
                        INPUT(_type='file',_name='csvfile'),
-                       INPUT(_type='hidden',_value=table,_name='table'),
+                       INPUT(_type='hidden',_value=csv_table,_name='table'),
                        INPUT(_type='submit',_value=T('import')))
     else:
         formcsv = None
-    if formcsv and formcsv.process().accepted and request.vars.csvfile:
+    if formcsv and formcsv.process().accepted:
         try:
             import_csv(db[request.vars.table],
                        request.vars.csvfile.file)

applications/examples/controllers/appadmin.py

@@ -222,14 +222,15 @@ def select():
             (rows, nrows) = ([], 0)
             response.flash = DIV(T('Invalid Query'),PRE(str(e)))
     # begin handle upload csv
-    if table:
+    csv_table = table or request.vars.table
+    if csv_table:
         formcsv = FORM(str(T('or import from csv file'))+" ",
                        INPUT(_type='file',_name='csvfile'),
-                       INPUT(_type='hidden',_value=table,_name='table'),
+                       INPUT(_type='hidden',_value=csv_table,_name='table'),
                        INPUT(_type='submit',_value=T('import')))
     else:
         formcsv = None
-    if formcsv and formcsv.process().accepted and request.vars.csvfile:
+    if formcsv and formcsv.process().accepted:
         try:
             import_csv(db[request.vars.table],
                        request.vars.csvfile.file)

applications/welcome/controllers/appadmin.py

@@ -222,14 +222,15 @@ def select():
             (rows, nrows) = ([], 0)
             response.flash = DIV(T('Invalid Query'),PRE(str(e)))
     # begin handle upload csv
-    if table:
+    csv_table = table or request.vars.table
+    if csv_table:
         formcsv = FORM(str(T('or import from csv file'))+" ",
                        INPUT(_type='file',_name='csvfile'),
-                       INPUT(_type='hidden',_value=table,_name='table'),
+                       INPUT(_type='hidden',_value=csv_table,_name='table'),
                        INPUT(_type='submit',_value=T('import')))
     else:
         formcsv = None
-    if formcsv and formcsv.process().accepted and request.vars.csvfile:
+    if formcsv and formcsv.process().accepted:
         try:
             import_csv(db[request.vars.table],
                        request.vars.csvfile.file)