[Rt-commit] rt branch, 5.0/delete-db-configs-web-ui, repushed
? sunnavy
sunnavy at bestpractical.com
Wed Jun 23 15:26:25 EDT 2021
The branch 5.0/delete-db-configs-web-ui was deleted and repushed:
was 355fa55afbc3bbf15e31b8edb8a5d9f803d1d1be
now 831baab3c55f9cca502fe9da49bf666c3b123770
1: 355fa55afb ! 1: 831baab3c5 Support to delete configs in database from web UI
@@ -60,14 +60,16 @@
LabelCols => 4,
- ValueCols => 8,
+ ValueCols => 6,
++ CloseRowDiv => 0, # this doesn't have affect CustomDateRange
%$args,
%{ $m->comp('/Widgets/FinalizeWidgetArguments', WidgetArguments =>
$meta->{'WidgetArguments'} ) },
&>
+% if ( $name ne 'CustomDateRanges' ) {
-+ <div class="col-2 file-config mt-1">
-+ <& /Widgets/Form/Boolean:InputOnly, Name => "$name-file", CurrentValue => 0, DefaultLabel => loc('Reset') &>
-+ <input type="hidden" name="<% $name %>-file-Current" value="<% $current_file_value %>" />
++ <div class="col-2 file-config mt-1">
++ <& /Widgets/Form/Boolean:InputOnly, Name => "$name-file", CurrentValue => 0, DefaultLabel => loc('Reset') &>
++ <input type="hidden" name="<% $name %>-file-Current" value="<% $current_file_value %>" />
++ </div>
+ </div>
+% }
+
@@ -112,6 +114,117 @@
my ($ok, $msg) = $setting->SetContent($val);
push @results, $msg;
+diff --git a/share/html/Widgets/Form/Boolean b/share/html/Widgets/Form/Boolean
+--- a/share/html/Widgets/Form/Boolean
++++ b/share/html/Widgets/Form/Boolean
+@@
+ <& SELF:InputOnly, %ARGS &>
+ <span class="hints"><% $Hints %></span>
+ </div>
++
++% if ( $CloseRowDiv ) {
+ </div>
++% }
+ <%ARGS>
+ $Name => undef,
+ $Description => undef,
+@@
+ $LabelLink => ''
+ $LabelCols => 3
+ $ValueCols => 9
++$CloseRowDiv => 1
+ </%ARGS>
+
+ <%METHOD InputOnly>
+
+diff --git a/share/html/Widgets/Form/Integer b/share/html/Widgets/Form/Integer
+--- a/share/html/Widgets/Form/Integer
++++ b/share/html/Widgets/Form/Integer
+@@
+ % }
+ <span class="hints"><% $Hints %></span>
+ </div>
++% if ( $CloseRowDiv ) {
+ </div>
++% }
+ <%INIT>
+ $_ = '' foreach grep !defined, $CurrentValue, $DefaultValue;
+ $DefaultLabel ||= loc( 'Default: [_1]', $DefaultValue );
+@@
+ $LabelLink => ''
+ $LabelCols => 3
+ $ValueCols => 9
++$CloseRowDiv => 1
+ </%ARGS>
+
+ <%METHOD InputOnly>
+
+diff --git a/share/html/Widgets/Form/MultilineString b/share/html/Widgets/Form/MultilineString
+--- a/share/html/Widgets/Form/MultilineString
++++ b/share/html/Widgets/Form/MultilineString
+@@
+ % }
+ <span class="hints"><% $Hints %></span>
+ </div>
++% if ( $CloseRowDiv ) {
+ </div>
++% }
+ <%ARGS>
+ $Name
+
+@@
+ $LabelLink => ''
+ $LabelCols => 3
+ $ValueCols => 9
++$CloseRowDiv => 1
+ </%ARGS>
+
+ <%METHOD InputOnly>
+
+diff --git a/share/html/Widgets/Form/Select b/share/html/Widgets/Form/Select
+--- a/share/html/Widgets/Form/Select
++++ b/share/html/Widgets/Form/Select
+@@
+ <& SELF:InputOnly, %ARGS &>
+ <span class="hints"><% $Hints %></span>
+ </div>
++% if ( $CloseRowDiv ) {
+ </div>
++% }
+ <%ARGS>
+ $Name
+ $Description => undef,
+@@
+ $LabelLink => ''
+ $LabelCols => 3
+ $ValueCols => 9
++$CloseRowDiv => 1
+ </%ARGS>
+
+ <%METHOD InputOnly>
+
+diff --git a/share/html/Widgets/Form/String b/share/html/Widgets/Form/String
+--- a/share/html/Widgets/Form/String
++++ b/share/html/Widgets/Form/String
+@@
+ % }
+ <span class="hints"><% $Hints %></span>
+ </div>
++% if ( $CloseRowDiv ) {
+ </div>
++% }
+ <%ARGS>
+ $Name
+
+@@
+ $LabelLink => '',
+ $LabelCols => 3
+ $ValueCols => 9
++$CloseRowDiv => 1
+ </%ARGS>
+
+ <%METHOD InputOnly>
+
diff --git a/share/static/js/util.js b/share/static/js/util.js
--- a/share/static/js/util.js
+++ b/share/static/js/util.js
@@ -119,12 +232,6 @@
});
});
}
-+
-+ // Move reset col to the corresponding edit row
-+ jQuery('form[name=EditConfig] div.file-config').each(function () {
-+ var prev_row = jQuery(this).prev('div.form-row');
-+ jQuery(this).detach().appendTo(prev_row);
-+ });
+
+ // Automatically sync to set input values to ones in config files.
+ jQuery('form[name=EditConfig] input[name$="-file"]').change(function (e) {
More information about the rt-commit
mailing list