Use the full tab space for CodeMirror instances on dialogues where appropriate. Fixes #4540

This commit is contained in:
Akshay Joshi
2019-08-02 10:25:21 +01:00
committed by Dave Page
parent aab5fadc01
commit 537c27a58e
49 changed files with 121 additions and 67 deletions

View File

@@ -222,7 +222,7 @@ define('pgadmin.node.function', [
type: 'text', group: gettext('Definition'), mode: ['properties'],
},{
id: 'proargs', label: gettext('Arguments'), cell: 'string',
type: 'text', group: gettext('Definition'), mode: ['properties', 'edit'],
type: 'text', group: gettext('Definition'), mode: ['properties'],
disabled: 'isDisabled',
},{
id: 'proargtypenames', label: gettext('Signature arguments'), cell:
@@ -244,8 +244,9 @@ define('pgadmin.node.function', [
},{
id: 'prosrc', label: gettext('Code'), cell: 'string',
type: 'text', mode: ['properties', 'create', 'edit'],
group: gettext('Definition'), deps: ['lanname'],
control: Backform.SqlFieldControl,
group: gettext('Code'), deps: ['lanname'],
tabPanelCodeClass: 'sql-code-control',
control: Backform.SqlCodeControl,
extraClasses:['custom_height_css_class'],
visible: function(m) {
if (m.get('lanname') == 'c') {
@@ -324,7 +325,7 @@ define('pgadmin.node.function', [
mode: ['properties'], group: gettext('Security'),
},{
id: 'arguments', label: gettext('Arguments'), cell: 'string',
group: gettext('Arguments'), type: 'collection', canAdd: function(m){
group: gettext('Definition'), type: 'collection', canAdd: function(m){
return m.isNew();
},
canDelete: true, model: ArgumentModel, mode: ['create', 'edit'],

View File

@@ -179,9 +179,9 @@ define('pgadmin.node.trigger_function', [
},{
id: 'prosrc', label: gettext('Code'), cell: 'string',
type: 'text', mode: ['properties', 'create', 'edit'],
group: gettext('Definition'), deps: ['lanname'],
control: Backform.SqlFieldControl,
extraClasses:['custom_height_css_class'],
group: gettext('Code'), deps: ['lanname'],
tabPanelCodeClass: 'sql-code-control',
control: Backform.SqlCodeControl,
visible: function(m) {
if (m.get('lanname') == 'c') {
return false;

View File

@@ -97,9 +97,9 @@ define('pgadmin.node.edbfunc', [
},{
id: 'prosrc', label: gettext('Code'), cell: 'string',
type: 'text', mode: ['properties'],
group: gettext('Definition'),
control: Backform.SqlFieldControl,
extraClasses:['custom_height_css_class'],
group: gettext('Code'),
tabPanelCodeClass: 'sql-code-control',
control: Backform.SqlCodeControl,
visible: function(m) {
if (m.get('lanname') == 'c') {
return false;

View File

@@ -144,12 +144,14 @@ define('pgadmin.node.package', [
mode: ['properties', 'create', 'edit'],
},{
id: 'pkgheadsrc', label: gettext('Header'), cell: 'string',
type: 'text', mode: ['properties', 'create', 'edit'], group: gettext('Code'),
control: Backform.SqlFieldControl,
type: 'text', mode: ['properties', 'create', 'edit'], group: gettext('Header'),
tabPanelCodeClass: 'sql-code-control',
control: Backform.SqlCodeControl,
},{
id: 'pkgbodysrc', label: gettext('Body'), cell: 'string',
type: 'text', mode: ['properties', 'create', 'edit'], group: gettext('Code'),
control: Backform.SqlFieldControl,
type: 'text', mode: ['properties', 'create', 'edit'], group: gettext('Body'),
tabPanelCodeClass: 'sql-code-control',
control: Backform.SqlCodeControl,
},{
id: 'acl', label: gettext('Privileges'), type: 'text',
group: gettext('Security'), mode: ['properties'],

View File

@@ -480,7 +480,9 @@ define('pgadmin.node.trigger', [
},{
id: 'prosrc', label: gettext('Code'), group: gettext('Code'),
type: 'text', mode: ['create', 'edit'], deps: ['tfunction'],
control: 'sql-field', visible: true,
tabPanelCodeClass: 'sql-code-control',
control: Backform.SqlCodeControl,
visible: true,
disabled: function(m) {
// We will enable it only when EDB PPAS and trigger function is
// set to Inline EDB-SPL

View File

@@ -168,9 +168,10 @@ define('pgadmin.node.mview', [
id: 'comment', label: gettext('Comment'), cell: 'string',
type: 'multiline',
},{
id: 'definition', label:'Definition', cell: 'string',
id: 'definition', label: gettext('Definition'), cell: 'string',
type: 'text', mode: ['create', 'edit'], group: gettext('Definition'),
control: Backform.SqlFieldControl, extraClasses:['sql_field_width_full'],
tabPanelCodeClass: 'sql-code-control',
control: Backform.SqlCodeControl,
},{
id: 'with_data', label: gettext('With data?'),
group: gettext('Storage'), mode: ['edit', 'create'],

View File

@@ -151,9 +151,10 @@ define('pgadmin.node.view', [
label: gettext('Cascaded'), value: 'cascaded',
}],
},{
id: 'definition', label: gettext('Definition'), cell: 'string',
type: 'text', mode: ['create', 'edit'], group: gettext('Definition'),
control: Backform.SqlFieldControl,
id: 'definition', label: gettext('Code'), cell: 'string',
type: 'text', mode: ['create', 'edit'], group: gettext('Code'),
tabPanelCodeClass: 'sql-code-control',
control: Backform.SqlCodeControl,
disabled: 'notInSchema',
}, pgBrowser.SecurityGroupSchema, {
// Add Privilege Control
@@ -188,7 +189,7 @@ define('pgadmin.node.view', [
}
if (_.isUndefined(field_def) || _.isNull(field_def) ||
String(field_def).replace(/^\s+|\s+$/g, '') == '') {
err['definition'] = gettext('Please enter view definition.');
err['definition'] = gettext('Please enter view code.');
errmsg = errmsg || err['definition'];
this.errorModel.set('definition', errmsg);
return errmsg;