IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-25 18:55:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Renamed 'Auto rollback?' to 'Auto rollback on error?'. Fixes #6682

Browse Source
This commit is contained in:
Akshay Joshi 2021-08-19 15:30:58 +05:30
parent 3f3416c13e
commit 3e4b5fd0d7
6 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
docs/en_US/images/preferences_sql_options.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 183 KiB

After

Width:  |  Height:  |  Size: 230 KiB

4
docs/en_US/preferences.rst
View File

@ -347,10 +347,10 @@ a graphical EXPLAIN.
Use the fields on the *Options* panel to manage editor preferences. Use the fields on the *Options* panel to manage editor preferences.
* When the *Auto-Commit?* switch is set to *True*, each successful query is * When the *Auto commit?* switch is set to *True*, each successful query is
committed after execution. committed after execution.
* When the *Auto-Rollback?* switch is set to *True*, failed queries are rolled * When the *Auto rollback on error?* switch is set to *True*, failed queries are rolled
back. back.
* When the *Copy SQL from main window to query tool?* switch is set to *True*, * When the *Copy SQL from main window to query tool?* switch is set to *True*,

6
docs/en_US/query_tool_toolbar.rst
View File

@ -141,10 +141,10 @@ Query Execution
| *Execute/Refresh* | Click the *Execute/Refresh* icon to either execute or refresh the query highlighted in the SQL | F5 | | *Execute/Refresh* | Click the *Execute/Refresh* icon to either execute or refresh the query highlighted in the SQL | F5 |
| | editor panel. Click the down arrow to access other execution options: | | | | editor panel. Click the down arrow to access other execution options: | |
| | | | | | | |
| | * Add a check next to *Auto-Rollback* to instruct the server to automatically roll back a | | | | * Add a check next to *Auto rollback on error?* to instruct the server to automatically roll back| |
| | transaction if an error occurs during the transaction. | | | | a transaction if an error occurs during the transaction. | |
| | | | | | | |
| | * Add a check next to *Auto-Commit* to instruct the server to automatically commit each | | | | * Add a check next to *Auto commit?* to instruct the server to automatically commit each | |
| | transaction. Any changes made by the transaction will be visible to others, and | | | | transaction. Any changes made by the transaction will be visible to others, and | |
| | durable in the event of a crash. | | | | durable in the event of a crash. | |
+----------------------+---------------------------------------------------------------------------------------------------+----------------+ +----------------------+---------------------------------------------------------------------------------------------------+----------------+

1
docs/en_US/release_notes_5_7.rst
View File

@ -21,3 +21,4 @@ Bug fixes
| `Issue #6564 <https://redmine.postgresql.org/issues/6564>`_ - Fixed an issue where columns with sequences get altered unnecessarily with a schema diff tool. | `Issue #6564 <https://redmine.postgresql.org/issues/6564>`_ - Fixed an issue where columns with sequences get altered unnecessarily with a schema diff tool.
| `Issue #6572 <https://redmine.postgresql.org/issues/6572>`_ - Partially fixes the data output panel display issue. | `Issue #6572 <https://redmine.postgresql.org/issues/6572>`_ - Partially fixes the data output panel display issue.
| `Issue #6671 <https://redmine.postgresql.org/issues/6671>`_ - Fixed UnboundLocalError where local variable 'user_id' referenced before assignment. | `Issue #6671 <https://redmine.postgresql.org/issues/6671>`_ - Fixed UnboundLocalError where local variable 'user_id' referenced before assignment.
| `Issue #6682 <https://redmine.postgresql.org/issues/6682>`_ - Renamed 'Auto rollback?' to 'Auto rollback on error?'.

2
web/pgadmin/tools/datagrid/templates/datagrid/index.html
View File

@ -279,7 +279,7 @@
<li> <li>
<a class="dropdown-item" id="btn-auto-rollback" href="#" tabindex="0"> <a class="dropdown-item" id="btn-auto-rollback" href="#" tabindex="0">
<i class="auto-rollback fa fa-check visibility-hidden" aria-hidden="true" role="img"></i> <i class="auto-rollback fa fa-check visibility-hidden" aria-hidden="true" role="img"></i>
<span> {{ _('Auto rollback?') }} </span> <span> {{ _('Auto rollback on error?') }} </span>
</a> </a>
</li> </li>
</ul> </ul>

2
web/pgadmin/tools/sqleditor/utils/query_tool_preferences.py
View File

@ -80,7 +80,7 @@ def register_query_tool_preferences(self):
self.auto_rollback = self.preference.register( self.auto_rollback = self.preference.register(
'Options', 'auto_rollback', 'Options', 'auto_rollback',
gettext("Auto rollback?"), 'boolean', False, gettext("Auto rollback on error?"), 'boolean', False,
category_label=PREF_LABEL_OPTIONS, category_label=PREF_LABEL_OPTIONS,
help_str=gettext('Set auto rollback on or off by default in new Query ' help_str=gettext('Set auto rollback on or off by default in new Query '
'Tool tabs.') 'Tool tabs.')