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

1) Added special handling for the extension to resolve the dependency.

Browse Source 
2) Added 'is_sys_obj' to the ignore list of Schema Diff.
3) Font awesome v5 fixes.
This commit is contained in:
Akshay Joshi 2020-08-13 17:48:04 +05:30
parent 63df19ee1c
commit 8f61944386
11 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/pgadmin/browser/static/js/collection.js
View File

@ -247,7 +247,7 @@ define([
type: 'delete',
tooltip: gettext('Delete/Drop'),
extraClasses: ['btn-primary-icon m-1', 'delete_multiple'],
icon: 'fa fa-lg fa-trash-alt',
icon: 'fa fa-trash-alt',
disabled: (_.isFunction(that.canDrop)) ? !(that.canDrop.apply(self, [data, item])) : (!that.canDrop),
register: function(btn) {
btn.on('click',() => {

6
web/pgadmin/browser/static/js/node.js
View File

@ -1246,7 +1246,7 @@ define('pgadmin.browser.node', [
type: 'help',
tooltip: gettext('SQL help for this object type.'),
extraClasses: ['btn-primary-icon', 'btn-primary-icon', 'm-1'],
icon: 'fa fa-lg fa-info',
icon: 'fa fa-info',
disabled: (that.sqlAlterHelp == '' && that.sqlCreateHelp == '') ? true : false,
register: function(btn) {
btn.on('click',() => {
@ -1499,7 +1499,7 @@ define('pgadmin.browser.node', [
type: 'help',
tooltip: gettext('SQL help for this object type.'),
extraClasses: ['btn-primary-icon', 'pull-left', 'mx-1'],
icon: 'fa fa-lg fa-info',
icon: 'fa fa-info',
disabled: (that.sqlAlterHelp == '' && that.sqlCreateHelp == '') ? true : false,
register: function(btn) {
btn.on('click',() => {
@ -1511,7 +1511,7 @@ define('pgadmin.browser.node', [
type: 'help',
tooltip: gettext('Help for this dialog.'),
extraClasses: ['btn-primary-icon', 'pull-left', 'mx-1'],
icon: 'fa fa-lg fa-question',
icon: 'fa fa-question',
disabled: (that.dialogHelp == '') ? true : false,
register: function(btn) {
btn.on('click',() => {

2
web/pgadmin/browser/static/js/toolbar.js
View File

@ -30,7 +30,7 @@ let _defaultToolBarButtons = [
{
label: gettext('View Data'),
ariaLabel: gettext('View Data'),
btnClass: 'fa fa-table',
btnClass: 'pg-font-icon sql-icon-lg icon-view-data',
text: '',
toggled: false,
toggleClass: '',

6
web/pgadmin/misc/bgprocess/static/js/bgprocess.js
View File

@ -36,7 +36,7 @@ define('misc.bgprocess', [
success_status_tpl: _.template(`
<div class="d-flex px-2 py-1 bg-success-light border border-success rounded">
<div class="pr-2">
<i class="fa fa-check fa-lg text-success pg-bg-status-icon" aria-hidden="true" role="img"></i>
<i class="fa fa-check text-success pg-bg-status-icon" aria-hidden="true" role="img"></i>
</div>
<div class="mx-auto pg-bg-status-text alert-text-body"><%-status_text%></div>
</div>`),
@ -309,7 +309,7 @@ define('misc.bgprocess', [
<div class="py-1">${self.stime.toString()}</div>
<div class="d-flex py-1">
<div class="my-auto mr-2">
<span class="fa fa-clock-o fa-2x" role="img"></span>
<span class="fa fa-clock fa-lg" role="img"></span>
</div>
<div class="pg-bg-etime my-auto mr-2"></div>
<div class="ml-auto">
@ -616,7 +616,7 @@ define('misc.bgprocess', [
'<div class="bg-detailed-desc"></div>' +
'<div class="bg-process-stats d-flex py-1">' +
'<div class="my-auto mr-2">' +
'<span class="fa fa-clock-o fa-2x" role="img"></span>' +
'<span class="fa fa-clock fa-lg" role="img"></span>' +
'</div>' +
'<div class="pg-bg-etime my-auto mr-2">'+
'<span>' + gettext('Start time') + ': <span class="bgprocess-start-time"></span>' +

3
web/pgadmin/static/js/backform.pgadmin.js
View File

@ -2806,6 +2806,9 @@ define([
options: {
format: 'YYYY-MM-DD HH:mm:ss Z',
icons: {
time: 'fa fa-clock',
data: 'fa fa-calendar-alt',
today: 'fa fa-calendar-check',
clear: 'fa fa-trash',
},
buttons: {

3
web/pgadmin/static/js/backgrid.pgadmin.js
View File

@ -1780,6 +1780,9 @@ define([
options = _.extend({
format: 'YYYY-MM-DD HH:mm:ss Z',
icons: {
time: 'fa fa-clock',
data: 'fa fa-calendar-alt',
today: 'fa fa-calendar-check',
clear: 'fa fa-trash',
},
buttons: {

1
web/pgadmin/static/scss/_alertify.overrides.scss
View File

@ -200,7 +200,6 @@
.pg-alertify-icon-button {
&:before {
font-size: 1.1em !important;
line-height: 1.2;
font-family: $font-family-icon;
font-weight: 900;

6
web/pgadmin/static/scss/_webcabin.pgadmin.scss
View File

@ -34,6 +34,10 @@
display: flex;
border-radius: $btn-border-radius;
margin: auto;
& .pg-font-icon {
line-height: unset;
}
}
/* darken % taken from bootstrap - button_variant */
@ -167,7 +171,7 @@
padding: 0rem 0.75rem;
&.fa, &.pg-font-icon{
padding: 0rem 0.25rem 0rem 0rem
padding: 0rem 0.25rem 0rem 0rem;
}
}

2
web/pgadmin/tools/datagrid/static/js/datagrid_panel_title.js
View File

@ -45,7 +45,7 @@ export function setQueryToolDockerTitle(panel, is_query_tool, panel_title, is_fi
else if (is_query_tool == 'false' || is_query_tool == false) {
// Edit grid titles
panel_tooltip = gettext('View/Edit Data - ') + panel_title;
panel_icon = 'fa fa-table';
panel_icon = 'pg-font-icon icon-view-data';
} else {
// Query tool titles
panel_tooltip = gettext('Query Tool - ') + panel_title;

2
web/pgadmin/tools/schema_diff/compare.py
View File

@ -19,7 +19,7 @@ from pgadmin.tools.schema_diff.directory_compare import compare_dictionaries
class SchemaDiffObjectCompare:
keys_to_ignore = ['oid', 'oid-2']
keys_to_ignore = ['oid', 'oid-2', 'is_sys_obj']
@staticmethod
def get_schema(sid, did, scid):

5
web/pgadmin/tools/schema_diff/static/js/schema_diff_dependency.js
View File

@ -135,6 +135,11 @@ function selectDependencies(data, isChecked) {
}
setDependencies = function(rowData, dependencies, isChecked) {
// Special handling for extension, if extension is present in the
// dependency list then iterate and select only extension node.
let extensions = dependencies.filter(item => item.type == 'extension');
if (extensions.length > 0) dependencies = extensions;
_.each(dependencies, function(dependency) {
if (dependency.length == 0) return;
let dependencyData = [];