IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-09 23:15:58 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed code smell 'Remove duplicates string literals'.

Browse Source
This commit is contained in:
Pradip Parkale 2020-09-07 17:56:02 +05:30 committed by Akshay Joshi
parent 9ae9ccff16
commit 4da4a05611
4 changed files with 17 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
web/pgadmin/browser/server_groups/servers/roles/__init__.py
View File

@ -20,6 +20,7 @@ from pgadmin.utils.ajax import make_json_response, \
make_response as ajax_response, precondition_required, \
internal_server_error, forbidden, success_return, gone
from pgadmin.utils.driver import get_driver
from pgadmin.utils.constants import ERROR_FETCHING_ROLE_INFORMATION
from config import PG_DEFAULT_DRIVER
@ -619,10 +620,7 @@ rolmembership:{
if not status:
return internal_server_error(
_(
"Error retrieving roles from the database server.\n{0}"
).format(res)
)
_(ERROR_FETCHING_ROLE_INFORMATION + "\n{0}").format(res))
self.transform(res)
@ -640,11 +638,7 @@ rolmembership:{
if not status:
return internal_server_error(
_(
"Error fetching role information from the database "
"server.\n{0}"
).format(rset)
)
_(ERROR_FETCHING_ROLE_INFORMATION + "\n{0}").format(rset))
res = []
for row in rset['rows']:
@ -676,10 +670,7 @@ rolmembership:{
if not status:
return internal_server_error(
_(
"Error fetching role information from the database "
"server.\n{0}"
).format(rset)
)
ERROR_FETCHING_ROLE_INFORMATION + "\n{0}").format(rset))
for row in rset['rows']:
return make_json_response(
@ -693,7 +684,7 @@ rolmembership:{
status=200
)
return gone(_("Could not find the role information."))
return gone()
def transform(self, rset):
for row in rset['rows']:
@ -729,14 +720,11 @@ rolmembership:{
if not status:
return internal_server_error(
_(
"Error retrieving roles from the database server.\n{0}"
).format(res)
)
_(ERROR_FETCHING_ROLE_INFORMATION + "\n{0}").format(res))
self.transform(res)
if len(res['rows']) == 0:
return gone(_("Could not find the role information."))
return gone(self.not_found_error_msg())
res['rows'][0]['is_sys_obj'] = (
res['rows'][0]['oid'] <= self.datlastsysoid)
@ -841,8 +829,7 @@ rolmembership:{
if not status:
return internal_server_error(
_("Could not retrieve the role information.\n{0}").format(msg)
)
_(ERROR_FETCHING_ROLE_INFORMATION + "\n{0}").format(msg))
status, rset = self.conn.execute_dict(
render_template(self.sql_path + self._NODES_SQL,
@ -853,10 +840,7 @@ rolmembership:{
if not status:
return internal_server_error(
_(
"Error fetching role information from the database "
"server.\n{0}"
).format(rset)
)
ERROR_FETCHING_ROLE_INFORMATION + "\n{0}").format(rset))
for row in rset['rows']:
return jsonify(
node=self.blueprint.generate_browser_node(
@ -867,7 +851,7 @@ rolmembership:{
)
)
return gone(_("Could not find the role information."))
return gone(self.not_found_error_msg())
@check_precondition(action='update')
@validate_request
@ -900,11 +884,7 @@ rolmembership:{
if not status:
return internal_server_error(
_(
"Error fetching role information from the database "
"server.\n{0}"
).format(rset)
)
_(ERROR_FETCHING_ROLE_INFORMATION + "\n{0}").format(rset))
for row in rset['rows']:
return jsonify(
@ -917,7 +897,7 @@ rolmembership:{
)
)
return gone(_("Could not find the role information."))
return gone(self.not_found_error_msg())
@check_precondition(action='msql')
@validate_request

1
web/pgadmin/browser/server_groups/servers/static/js/server.js
View File

@ -744,7 +744,6 @@ define('pgadmin.node.server', [
// Default values!
initialize: function(attrs, args) {
var isNew = (_.size(attrs) === 0);
console.warn('warn');
if (isNew) {
this.set({'gid': args.node_info['server_group']._id});

4
web/pgadmin/utils/constants.py
View File

@ -40,3 +40,7 @@ DATATYPE_TIMESTAMP_WITHOUT_TIMEZONE = 'timestamp without time zone'
# Error Messages
ERROR_MSG_TRANS_ID_NOT_FOUND = gettext(
'Transaction ID not found in the session.')
# Role module constant
ERROR_FETCHING_ROLE_INFORMATION = gettext(
'Error fetching role information from the database server.')

3
web/regression/python_test_utils/test_utils.py
View File

@ -1681,8 +1681,7 @@ def get_test_user(self, user_details,
def create_user_wise_test_client(user):
"""
This function creates new test client and pem database connection as per
provided user and execute the test cases.
This function creates new test client and execute the test cases.
:return: None
"""