FSN#35498 UDR: kolom-expressies mogelijk maken

svn path=/Website/trunk/; revision=29386

APPL/API2/model_reportsx.inc

@@ -173,6 +173,13 @@ function model_reportsx(usrrap_key, rapparams)
         {
             this._check_authorization(params, "PUT");
 
+            var sql = "SELECT fac_usrrap_view_name"
+                    + "  FROM fac_usrrap"
+                    + " WHERE fac_usrrap_key = " + the_key;
+            var oRs = Oracle.Execute(sql);
+            var old_view = oRs("fac_usrrap_view_name").Value;
+            oRs.Close();
+
             var dbfields = api2.update_fields(params, this, jsondata); // Build updater
             this._analyze_fields(dbfields, params, jsondata);
 
@@ -185,6 +192,18 @@ function model_reportsx(usrrap_key, rapparams)
 
             var beztrack = api2.process_includes(params, this, jsondata, the_key);
 
+            if (old_view != jsondata.viewname)
+            {   // Verwijder alle kolommen als er een nieuwe view is ingevuld, maar laat de expressies staan.
+                var sql = "DELETE fac_usrrap_cols"
+                        + " WHERE fac_usrrap_cols_expression IS NULL"
+                        + "   AND fac_usrrap_key = " + the_key;
+                var err = Oracle.Execute(sql, true);
+                if (err.friendlyMsg)
+                    abort_with_warning(err.friendlyMsg);
+                // Voeg de kolommen van de nieuwe view weer toe.
+                this.includes["columns"].model._view2columns(the_key, null, []);
+            }
+
             return { key: the_key, warning: "" };
         };