diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js index 33f4dc731..a10fa8e77 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js @@ -126,7 +126,7 @@ define('pgadmin.node.rule', [ if (m && m.get('name') == '_RETURN') { return true; } - if (m.isNew() || m.node_info.server.version >= 90400) { + if (m.isNew && m.isNew() || m.node_info && m.node_info.server.version >= 90400) { return false; } return true; @@ -236,7 +236,6 @@ define('pgadmin.node.rule', [ //Check if we are not child of rule var prev_i = t.hasParent(i) ? t.parent(i) : null, prev_j = t.hasParent(prev_i) ? t.parent(prev_i) : null, - prev_e = prev_j ? t.itemData(prev_j) : null, prev_k = t.hasParent(prev_j) ? t.parent(prev_j) : null, prev_f = prev_k ? t.itemData(prev_k) : null; return (_.isNull(prev_f) || prev_f._type != 'catalog'); @@ -249,7 +248,7 @@ define('pgadmin.node.rule', [ else if('view' == d._type || 'table' == d._type){ prev_i = t.hasParent(i) ? t.parent(i) : null; prev_j = t.hasParent(prev_i) ? t.parent(prev_i) : null; - prev_e = prev_j ? t.itemData(prev_j) : null; + var prev_e = prev_j ? t.itemData(prev_j) : null; return (!_.isNull(prev_e) && prev_e._type == 'schema'); } i = t.hasParent(i) ? t.parent(i) : null; diff --git a/web/pgadmin/dashboard/__init__.py b/web/pgadmin/dashboard/__init__.py index a08944d8f..08c193694 100644 --- a/web/pgadmin/dashboard/__init__.py +++ b/web/pgadmin/dashboard/__init__.py @@ -282,7 +282,6 @@ def index(sid=None, did=None): """ rates = {} - settings = {} # Get the server version if sid is not None: diff --git a/web/pgadmin/feature_tests/pg_datatype_validation_test.py b/web/pgadmin/feature_tests/pg_datatype_validation_test.py index 9d6e1efa0..dc12b51c0 100644 --- a/web/pgadmin/feature_tests/pg_datatype_validation_test.py +++ b/web/pgadmin/feature_tests/pg_datatype_validation_test.py @@ -86,10 +86,6 @@ class PGDataypeFeatureTest(BaseFeatureTest): NavMenuLocators.file_menu_css) file_menu.click() - # pref_menu_item = self.page.find_by_css_selector( - # NavMenuLocators.preference_menu_item_css) - # pref_menu_item.click() - self.page.retry_click( (By.CSS_SELECTOR, NavMenuLocators.preference_menu_item_css), (By.XPATH, NavMenuLocators.specified_preference_tree_node diff --git a/web/pgadmin/feature_tests/query_tool_tests.py b/web/pgadmin/feature_tests/query_tool_tests.py index dc9faa592..fe4255b32 100644 --- a/web/pgadmin/feature_tests/query_tool_tests.py +++ b/web/pgadmin/feature_tests/query_tool_tests.py @@ -165,7 +165,7 @@ SELECT generate_series(1, {}) as id1, 'dummy' as id2""".format( (By.CSS_SELECTOR, QueryToolLocators.query_output_cells))) - canvas = self.page.find_by_css_selector( + self.page.find_by_css_selector( QueryToolLocators.query_output_canvas_css) self._check_ondemand_result(row_id_to_find) @@ -176,7 +176,7 @@ SELECT generate_series(1, {}) as id1, 'dummy' as id2""".format( self.page.click_execute_query_button() # wait for header of the table to be visible - canvas = self.page.find_by_css_selector( + self.page.find_by_css_selector( QueryToolLocators.query_output_canvas_css) # wait for the rows in the table to be displayed @@ -187,7 +187,6 @@ SELECT generate_series(1, {}) as id1, 'dummy' as id2""".format( # Select all rows in a table multiple_check = True - count = 0 while multiple_check: try: select_all = self.wait.until(EC.element_to_be_clickable( @@ -196,7 +195,6 @@ SELECT generate_series(1, {}) as id1, 'dummy' as id2""".format( multiple_check = False except (StaleElementReferenceException, ElementClickInterceptedException): - count += 1 pass self._check_ondemand_result(row_id_to_find) @@ -218,7 +216,7 @@ SELECT generate_series(1, {}) as id1, 'dummy' as id2""".format( QueryToolLocators.query_output_cells)) ) - canvas = self.wait.until(EC.presence_of_element_located( + self.wait.until(EC.presence_of_element_located( (By.CSS_SELECTOR, QueryToolLocators.query_output_canvas_css))) self._check_ondemand_result(row_id_to_find) @@ -681,10 +679,6 @@ SELECT 1, pg_sleep(300)""" except Exception as e: pass - is_edb = False - if len(version_string) > 0: - is_edb = 'EnterpriseDB' in version_string[0] - connection.close() return connection.server_version >= 110000 and jit_enabled diff --git a/web/pgadmin/feature_tests/xss_checks_panels_and_query_tool_test.py b/web/pgadmin/feature_tests/xss_checks_panels_and_query_tool_test.py index 74c0e2108..fab907ed7 100644 --- a/web/pgadmin/feature_tests/xss_checks_panels_and_query_tool_test.py +++ b/web/pgadmin/feature_tests/xss_checks_panels_and_query_tool_test.py @@ -38,7 +38,6 @@ class CheckForXssFeatureTest(BaseFeatureTest): scenarios = [ ("Test XSS check for panels and query tool", dict()) ] - # test_table_name = "

X" test_type_name = '""' def before(self): diff --git a/web/pgadmin/misc/file_manager/__init__.py b/web/pgadmin/misc/file_manager/__init__.py index 293085d10..ad33358a5 100644 --- a/web/pgadmin/misc/file_manager/__init__.py +++ b/web/pgadmin/misc/file_manager/__init__.py @@ -242,7 +242,6 @@ def file_manager_config_js(): @login_required def file_manager_config(trans_id): """render the required json""" - # trans_id = Filemanager.create_new_transaction() data = Filemanager.get_trasaction_selection(trans_id) pref = Preferences.module('file_manager') file_dialog_view = pref.preference('file_dialog_view').get() diff --git a/web/pgadmin/setup/user_info.py b/web/pgadmin/setup/user_info.py index a118518f3..a40ba4457 100644 --- a/web/pgadmin/setup/user_info.py +++ b/web/pgadmin/setup/user_info.py @@ -21,7 +21,7 @@ def user_info(): email = config.DESKTOP_USER p1 = ''.join([ random.choice(string.ascii_letters + string.digits) - for n in range(32) + for _ in range(32) ]) else: diff --git a/web/pgadmin/static/js/backgrid.pgadmin.js b/web/pgadmin/static/js/backgrid.pgadmin.js index 78e44ce70..4613d97a1 100644 --- a/web/pgadmin/static/js/backgrid.pgadmin.js +++ b/web/pgadmin/static/js/backgrid.pgadmin.js @@ -1577,10 +1577,6 @@ define([ formatter: JSONBCellFormatter, }); - Backgrid.Extension.DatepickerCell = Backgrid.Cell.extend({ - editor: DatepickerCellEditor, - }); - var DatepickerCellEditor = Backgrid.InputCellEditor.extend({ events: {}, initialize: function() { @@ -1594,12 +1590,16 @@ define([ input.model.trigger( 'backgrid:edited', input.model, input.column, command ); - command = input = null; + input = null; }, }); }, }); + Backgrid.Extension.DatepickerCell = Backgrid.Cell.extend({ + editor: DatepickerCellEditor, + }); + // Reference: // https://github.com/wyuenho/backgrid-moment-cell/blob/master/backgrid-moment-cell.js /** diff --git a/web/pgadmin/static/js/keyboard_shortcuts.js b/web/pgadmin/static/js/keyboard_shortcuts.js index c02923e24..0a17ec133 100644 --- a/web/pgadmin/static/js/keyboard_shortcuts.js +++ b/web/pgadmin/static/js/keyboard_shortcuts.js @@ -301,7 +301,7 @@ function keyboardShortcutsQueryTool( /*open submenu if any*/ if(currLi.hasClass('dropdown-submenu')){ currLi.find('.dropdown-menu').addClass('show'); - currLi = currLi.find('.dropdown-menu .dropdown-item').first().trigger('focus'); + currLi.find('.dropdown-menu .dropdown-item').first().trigger('focus'); } } else if(keyCode === LEFT_KEY) { /*close submenu*/ diff --git a/web/pgadmin/static/vendor/backform/backform.js b/web/pgadmin/static/vendor/backform/backform.js index b598fd60e..82f7f67a3 100644 --- a/web/pgadmin/static/vendor/backform/backform.js +++ b/web/pgadmin/static/vendor/backform/backform.js @@ -71,7 +71,7 @@ // Backform Form view // A collection of field models. - var Form = Backform.Form = Backbone.View.extend({ + Backform.Form = Backbone.View.extend({ fields: undefined, errorModel: undefined, tagName: "form", @@ -100,8 +100,7 @@ this.cleanup(); this.$el.empty(); - var form = this, - $form = this.$el, + var $form = this.$el, model = this.model, controls = this.controls; @@ -265,7 +264,6 @@ }, onChange: function(e) { var model = this.model, - $el = $(e.target), attrArr = this.field.get("name").split('.'), name = attrArr.shift(), path = attrArr.join('.'), @@ -349,8 +347,6 @@ this.$el.find(':input').not('button').each(function(ix, el) { var attrArr = $(el).attr('name').split('.'), - name = attrArr.shift(), - path = attrArr.join('.'), error = self.keyPathAccessor(errorModel.toJSON(), $(el).attr('name')); if (_.isEmpty(error)) return; @@ -406,9 +402,9 @@ // Built-in controls - var UneditableInputControl = Backform.UneditableInputControl = Control; + Backform.UneditableInputControl = Control; - var HelpControl = Backform.HelpControl = Control.extend({ + Backform.HelpControl = Control.extend({ template: _.template([ '', '
', @@ -417,13 +413,13 @@ ].join("\n")) }); - var SpacerControl = Backform.SpacerControl = Control.extend({ + Backform.SpacerControl = Control.extend({ template: _.template([ '
' ].join("\n")) }); - var TextareaControl = Backform.TextareaControl = Control.extend({ + Backform.TextareaControl = Control.extend({ defaults: { label: "", maxlength: 4000, @@ -476,7 +472,7 @@ }); // Note: Value here is null or an array. Since jQuery val() returns either. - var MultiSelectControl = Backform.MultiSelectControl = SelectControl.extend({ + Backform.MultiSelectControl = SelectControl.extend({ defaults: { label: "", options: [], // List of options as [{label: