Rename form action

qgis · Dec 7, 2021 · c2a91c9 · c2a91c9
1 parent 86d036e
commit c2a91c9
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/python/core/auto_generated/qgsaction.sip.in b/python/core/auto_generated/qgsaction.sip.in
@@ -27,7 +27,7 @@ Utility class that encapsulates an action based on vector attributes.
       Windows,
       Unix,
       OpenUrl,
-      SubmitUrl,
+      SubmitUrlEncoded,
       SubmitUrlMultipart,
     };
 

diff --git a/src/core/qgsaction.cpp b/src/core/qgsaction.cpp
@@ -45,7 +45,7 @@ bool QgsAction::runable() const
   return mType == Generic ||
          mType == GenericPython ||
          mType == OpenUrl ||
-         mType == SubmitUrl ||
+         mType == SubmitUrlEncoded ||
          mType == SubmitUrlMultipart ||
 #if defined(Q_OS_WIN)
          mType == Windows
@@ -89,7 +89,7 @@ void QgsAction::run( const QgsExpressionContext &expressionContext ) const
     else
       QDesktopServices::openUrl( QUrl( expandedAction, QUrl::TolerantMode ) );
   }
-  else if ( mType == QgsAction::SubmitUrl || mType == QgsAction::SubmitUrlMultipart )
+  else if ( mType == QgsAction::SubmitUrlEncoded || mType == QgsAction::SubmitUrlMultipart )
   {
 
     QUrl url{ command() };
@@ -361,7 +361,7 @@ QString QgsAction::html() const
       typeText = QObject::tr( "Open URL" );
       break;
     }
-    case SubmitUrl:
+    case SubmitUrlEncoded:
     {
       typeText = QObject::tr( "Submit URL (urlencoded or JSON)" );
       break;

diff --git a/src/core/qgsaction.h b/src/core/qgsaction.h
@@ -42,8 +42,8 @@ class CORE_EXPORT QgsAction
       Windows,
       Unix,
       OpenUrl,
-      SubmitUrl, //<! POST data to an URL, using "application/x-www-form-urlencoded" or "application/json" if the body is valid JSON
-      SubmitUrlMultipart, //<! POST data to an URL using "multipart/form-data"
+      SubmitUrlEncoded, //!< POST data to an URL, using "application/x-www-form-urlencoded" or "application/json" if the body is valid JSON \since QGIS 3.24
+      SubmitUrlMultipart, //!< POST data to an URL using "multipart/form-data"  \since QGIS 3.24
     };
 
     /**

diff --git a/src/core/qgsactionmanager.cpp b/src/core/qgsactionmanager.cpp
@@ -195,7 +195,7 @@ void QgsActionManager::runAction( const QgsAction &action )
     else
       QDesktopServices::openUrl( QUrl( action.command(), QUrl::TolerantMode ) );
   }
-  else if ( action.type() == QgsAction::SubmitUrl || action.type() == QgsAction::SubmitUrlMultipart )
+  else if ( action.type() == QgsAction::SubmitUrlEncoded || action.type() == QgsAction::SubmitUrlMultipart )
   {
     action.run( QgsExpressionContext() );
   }

diff --git a/src/gui/vector/qgsattributeactiondialog.cpp b/src/gui/vector/qgsattributeactiondialog.cpp
@@ -256,7 +256,7 @@ QString QgsAttributeActionDialog::textForType( QgsAction::ActionType type )
       return tr( "Unix" );
     case QgsAction::OpenUrl:
       return tr( "Open URL" );
-    case QgsAction::SubmitUrl:
+    case QgsAction::SubmitUrlEncoded:
       return tr( "Submit URL (urlencoded or JSON)" );
     case QgsAction::SubmitUrlMultipart:
       return tr( "Submit URL (multipart)" );