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

Improve wording.

Browse Source
This commit is contained in:
Dave Page 2019-01-03 15:24:47 +00:00
parent 7d765fea04
commit 598f69b63d
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
web/pgadmin/static/js/sqleditor/execute_query.js
View File

@ -72,7 +72,7 @@ class ExecuteQuery {
self.removeGridViewMarker(); self.removeGridViewMarker();
if (ExecuteQuery.isSqlCorrect(httpMessageData)) { if (ExecuteQuery.isSqlCorrect(httpMessageData)) {
self.loadingScreen.setMessage('Waiting for the query execution to complete...'); self.loadingScreen.setMessage('Waiting for the query to complete...');
self.updateSqlEditorStateWithInformationFromServer(httpMessageData.data); self.updateSqlEditorStateWithInformationFromServer(httpMessageData.data);
@ -169,7 +169,7 @@ class ExecuteQuery {
} }
initializeExecutionOnSqlEditor(sqlStatement) { initializeExecutionOnSqlEditor(sqlStatement) {
this.loadingScreen.show('Initializing query execution...'); this.loadingScreen.show('Running query...');
$('#btn-flash').prop('disabled', true); $('#btn-flash').prop('disabled', true);

4
web/pgadmin/tools/sqleditor/static/js/sqleditor.js
View File

@ -2150,14 +2150,14 @@ define('tools.querytool', [
self.trigger( self.trigger(
'pgadmin-sqleditor:loading-icon:show', 'pgadmin-sqleditor:loading-icon:show',
gettext('Initializing query execution.') gettext('Running query...')
); );
$('#btn-flash').prop('disabled', true); $('#btn-flash').prop('disabled', true);
self.trigger( self.trigger(
'pgadmin-sqleditor:loading-icon:message', 'pgadmin-sqleditor:loading-icon:message',
gettext('Waiting for the query execution to complete...') gettext('Waiting for the query to complete...')
); );
if (arguments.length > 0 && if (arguments.length > 0 &&

8
web/regression/javascript/sqleditor/execute_query_spec.js
View File

@ -1055,11 +1055,11 @@ describe('ExecuteQuery', () => {
jasmine.clock().uninstall(); jasmine.clock().uninstall();
}); });
it('should update loading text to "Initializing query execution"', () => { it('should update loading text to "Running query"', () => {
expect(sqlEditorMock.trigger) expect(sqlEditorMock.trigger)
.toHaveBeenCalledWith( .toHaveBeenCalledWith(
'pgadmin-sqleditor:loading-icon:show', 'pgadmin-sqleditor:loading-icon:show',
'Initializing query execution...' 'Running query...'
); );
}); });
@ -1104,11 +1104,11 @@ describe('ExecuteQuery', () => {
executeQuery.execute('some sql query', '', true); executeQuery.execute('some sql query', '', true);
}); });
it('should changes the loading message to "Waiting for the query execution to complete"', (done) => { it('should changes the loading message to "Waiting for the query to complete"', (done) => {
setTimeout(() => { setTimeout(() => {
expect(sqlEditorMock.trigger).toHaveBeenCalledWith( expect(sqlEditorMock.trigger).toHaveBeenCalledWith(
'pgadmin-sqleditor:loading-icon:message', 'pgadmin-sqleditor:loading-icon:message',
'Waiting for the query execution to complete...' 'Waiting for the query to complete...'
); );
done(); done();
}, 0); }, 0);