Changeset 14919

Timestamp:

05/29/12 03:31:41 (12 months ago)

Author:

KipLubliner

Message:

Item11891: add delete handler; add debugging parameter; improve reporting of errors

Location:

trunk/SqlGridPlugin

Files:

• data/System/SqlGridPluginErrorMessages.txt (modified) (1 diff)
• data/System/SqlGridPluginSimpleTable.txt (modified) (1 diff)
• lib/Foswiki/Plugins/SqlGridPlugin.pm (modified) (6 diffs)
• lib/Foswiki/Plugins/SqlGridPlugin/SimpleCRUD.pm (modified) (3 diffs)
• pub/System/SqlGridPlugin/gridfuncs.js (modified) (5 diffs)

trunk/SqlGridPlugin/data/System/SqlGridPluginErrorMessages.txt

@@ -1 @@
-<!--
-   * Set message_noform=%IF{" $'URLPARAM{errortype}' = 'noform'" then="No form specified"}%
-   * Set message_noformaction=%IF{" $'URLPARAM{errortype}' = 'noformaction'" then="No form action specified"}%
-   * Set message = %message_noform%%message_noformaction% for button '%URLPARAM{"button"}%'
--->
-
+%STARTSECTION{"nopopup"}%
 <div title="Error" class="jqUIDialog { modal:true, resizable:false, draggable:false, height:400, width:600}">
-
----+++ %message%
-
+---+++ No popup specified for button '%URLPARAM{"button"}%'
   <a class="jqUIDialogButton jqUIDialogClose {icon:'ui-icon-circle-check'}">%MAKETEXT{"Ok"}%</a>
 </div>
+%ENDSECTION{"nopopup"}%
+
+%STARTSECTION{"nopopupaction"}%{ "actionStatus": 500, "message": "no popup action specified for button '%URLPARAM{"button"}%'" }
+%ENDSECTION{"nopopupaction"}%

trunk/SqlGridPlugin/data/System/SqlGridPluginSimpleTable.txt

@@ -19 +19 @@
 edit_needrow_sqlgridbutton="true"
 
-}%
-
-Not implemented yet
-
 delete_caption_sqlgridbutton="%MAKETEXT{"Delete"}%"
 delete_hover_sqlgridbutton="%MAKETEXT{"Delete current record"}%"
 delete_icon_sqlgridbutton="ui-icon-scissors"
-delete_form_sqlgridbutton="GenericDelFormURL_TODO"
+delete_form_sqlgridbutton="%SCRIPTURL{"view"}%/%WEB%/%TOPIC%?skin=text;section=confirm;title=%ENCODE{"%MAKETEXT{"Delete Record"}%"}%;message=%ENCODE{"%MAKETEXT{"Delete record"}% %"}%%ENCODE{"URLPARAM{_selected_row}"}%%ENCODE{"%?"}%"
 delete_formaction_sqlgridbutton="%SCRIPTURL{"rest"}%/SqlGridPlugin/simpledelete"
 delete_needrow_sqlgridbutton="true"
+
+}%
+
 </verbatim>
+
+---+++ Confirm Dialog
+Special arguments:
+   * title
+   * message
+
+%STARTSECTION{"confirm"}%
+<div title="%ENCODE{"%URLPARAM{title}%" old="&#37;" new="%"}%" class="sqlGridDialog jqUIDialog { modal:true, resizable:true, draggable:true, height:400, width:600}">
+
+%ENCODE{"%URLPARAM{message}%" old="&#37;" new="%"}%
+
+<form class='foswikiForm' >
+<input type='hidden' name='col_%URLPARAM{idcol}%' value='%URLPARAM{_selected_row}%'/>
+</form>
+  <a class="jqUIDialogButton jqUIDialogSubmit {icon:'ui-icon-circle-check'}">%MAKETEXT{"Ok"}%</a>
+  <a class="jqUIDialogButton jqUIDialogClose {icon:'ui-icon-cancel'}">%MAKETEXT{"Cancel"}%</a>
+</div>
+%ENDSECTION{"confirm"}%

trunk/SqlGridPlugin/lib/Foswiki/Plugins/SqlGridPlugin.pm

@@ -65 +65 @@
     Foswiki::Func::registerRESTHandler( 'simpleupdate', \&restSimpleupdate );
     Foswiki::Func::registerRESTHandler( 'simpleinsert', \&restSimpleinsert );
+    Foswiki::Func::registerRESTHandler( 'simpledelete', \&restSimpledelete );
+
     return 1;
 }
@@ -128 +130 @@
         my $idcol = $params->{idcol_connectorparam} = $params->remove('idcol') || '';
         $params->{fromwhere_params_connectorparam} = $params->remove('sqlparams') || '';
+        my $debugging = $params->remove('debugging') || "off";
 
         my $theSqlQuery = $params->{sql} || '';
@@ -140 +143 @@
     if (exists $params->{sqlgridbuttons}) {
         my %formactionargs = ( dbconn => $dbconn, idcol => $idcol );
+        my %popupargs = ( dbconn => $dbconn, idcol => $idcol );
         my %sqlgridbuttons;
         while (my ($k,$v) = each %{$params}) {
@@ -150 +154 @@
         }
         my $formactionargs = join ';', map { "$_=$formactionargs{$_}" } keys %formactionargs;
+        my $popupargs = join ';', map { "$_=$popupargs{$_}" } keys %popupargs;
 
         my @buttons = split ',', $params->{sqlgridbuttons};
         for my $button (@buttons) {
             $button =~ s/\s+//g;
-            $buttonScripts .= _addGridButton($id, $button, $sqlgridbuttons{$button}, $formactionargs, $params);
+            $buttonScripts .= _addGridButton($id, $button, $sqlgridbuttons{$button}, $popupargs, $formactionargs, $params, $debugging);
         }
     }
@@ -180 +185 @@
 EOQ
 ;
-    return "$script\n\%GRID{" . $params->stringify() . "}\%";
-}
-
-sub _addGridButton ($$$$$) {
-    my ($id, $button, $buttonParams, $formactionargs, $params) = @_;
-
-        my %funcArgs = ( gridId => "'$id'" );
+
+    my $debugDiv="";
+    if ($debugging eq "on") {
+        $debugDiv = "\n<div id='Debug_$id'> *DEBUGGING ON* <br></div>";
+    }
+
+    return "$script\n\%GRID{" . $params->stringify() . "}\%$debugDiv";
+}
+
+sub _addGridButton ($$$$$$$) {
+    my ($id, $button, $buttonParams, $popupargs, $formactionargs, $params, $debugging) = @_;
+
+        my %funcArgs = ( gridId => "'$id'", debugging => "'$debugging'" );
         if (exists $buttonParams->{needrow}) {
             $funcArgs{requireSelection} = $buttonParams->{needrow};
         }
-        if ($buttonParams->{form}) {
-        $funcArgs{form} = "'" . $buttonParams->{form} . "'";
-        } else {
-        $funcArgs{form} = "'" . Foswiki::Func::getScriptUrl(
+
+    my $popup = $buttonParams->{form} ||
+        Foswiki::Func::getScriptUrl(
                  'System', 'SqlGridPluginErrorMessages', 'view',
                  skin => 'text',
-                 errortype => 'noform',
-                 button => $button
-                 ) . "'";
-        }
-
+                 section => 'nopopup',
+                 button => $button);
+    if ($popupargs) {
+        if ($popup =~ /\?/) {
+            $popup .= ";$popupargs";
+        } else {
+            $popup .= "?$popupargs";
+        }
+    }
+    $funcArgs{form} = "'$popup'";
+#/*
+#       if ($buttonParams->{form}) {
+#       $funcArgs{form} = "'" . $buttonParams->{form} . "'";
+#       } else {
+#       $funcArgs{form} = "'" . Foswiki::Func::getScriptUrl(
+#                 'System', 'SqlGridPluginErrorMessages', 'view',
+#                 skin => 'text',
+#                 section => 'nopopup',
+#                 button => $button
+#                 ) . "'";
+#       }
+#*/
     my $formAction = $buttonParams->{formaction} ||
             Foswiki::Func::getScriptUrl(
                  'System', 'SqlGridPluginErrorMessages', 'view',
                  skin => 'text',
-                 errortype => 'noformaction',
+                 contenttype => 'application/json',
+                 section => 'nopopupaction',
                  button => $button
                  );
@@ -285 +313 @@
 }
 
+sub restSimpledelete {
+    require Foswiki::Plugins::SqlGridPlugin::SimpleCRUD;
+    return Foswiki::Plugins::SqlGridPlugin::SimpleCRUD::restSimpledelete(@_);
+}
+
 1;

trunk/SqlGridPlugin/lib/Foswiki/Plugins/SqlGridPlugin/SimpleCRUD.pm

@@ -3 +3 @@
 use strict;
 use warnings;
+
+use constant SUCCESS_JSON => '{ "actionStatus": 200 }';
 
 use constant DEBUG => 1; # toggle me
@@ -62 +64 @@
         $sth->finish;
 
-        return "1";
+        return SUCCESS_JSON;
 }
-
 
 sub restSimpleinsert {
@@ -84 +85 @@
         $sth->finish;
 
-        return "1";
+        return SUCCESS_JSON;
 }
 
+sub restSimpledelete {
+        my ($session, $subject, $verb, $response) = @_;
+        my $request = Foswiki::Func::getCgiQuery();
+        writeDebug($request->query_string())
+                if DEBUG;
 
+        my ($dbconn, $table, $idcol, $idval, $keys, $args) = _getRestParams($request);
+
+        my $sql = "DELETE FROM $table WHERE $idcol = ?";
+        my @args = ($idval);
+
+writeDebug($sql . join ',', @args);
+        my $sth = Foswiki::Plugins::SqlPlugin::execute($dbconn, $sql, @args);
+        $sth->finish;
+
+        return SUCCESS_JSON;
+}
 
 1;

trunk/SqlGridPlugin/pub/System/SqlGridPlugin/gridfuncs.js

@@ -4 +4 @@
                 modal:true,
                 resizable: false,
+                width: 500,
                 buttons: { "Ok": function() { $(this).dialog("close"); } }
         });
+}
+
+function logDebugMessage(gridId, text) {
+    var debugDiv = $("#Debug_" + gridId);
+    if (debugDiv) {
+        debugDiv.append(text + "<br>");
+    }
 }
 
@@ -12 +20 @@
         var href = args.form;
         var formAction = args.formAction;
+        var debugging = args.debugging;
 
         var selrow = $('#' + gridId).jqGrid('getGridParam', 'selrow');
@@ -29 +38 @@
         }
 
+    if (debugging == "on") {
+        logDebugMessage(gridId, href);
+    }
+
         $.get(href, function(content) { 
                 var $content = $(content);
@@ -36 +49 @@
 
         var form = $content.find("form:first");
-        var onsubmit = 'return sqlgrid_runFormAction(this, "' + gridId + '", "' + formAction + '")';
+        var onsubmit = 'return sqlgrid_runFormAction(this, "' + gridId + '", "' + formAction + '", "' + debugging + '")';
         form.attr('onsubmit', onsubmit);
+        })
+        .error(function(errObj) {
+        myalert(errObj.responseText);
         });
 }
 
-function sqlgrid_runFormAction(form, gridId, formAction) {
+function sqlgrid_runFormAction(form, gridId, formAction, debugging) {
     var $popup = $(form).closest('.sqlGridDialog');
         var href = formAction;
@@ -50 +66 @@
                 }
         });
-        $.get(href, function(content) {
+    if (debugging == "on") {
+        logDebugMessage(gridId, href);
+    }
+        $.getJSON(href, function(data) {
+            var result = data.actionStatus;
                 $popup.dialog("close");
                 $('#'+gridId).trigger("reloadGrid");
+            if (result != 200) {
+                myalert(data.message);
+            }
+        })
+        .error(function(errObj) {
+                $popup.dialog("close");
+                $('#'+gridId).trigger("reloadGrid");
+        myalert(errObj.responseText);
         });
         return false;