CVars: RDBO-basiertes Render-Template nach webpages/common verschoben

diff --git a/templates/webpages/common/render_cvar_input.html b/templates/webpages/common/render_cvar_input.html
new file mode 100644 (file)
index 0000000..c1b7720
--- /dev/null
+++ b/templates/webpages/common/render_cvar_input.html
@@ -0,0 +1,34 @@
+[%- USE T8 %]
+[%- USE HTML %]
+[%- USE L %]
+[%- USE LxERP %]
+
+[%- SET var_name = HTML.escape(cvar_name_prefix) _ HTML.escape(var.config.name) _ HTML.escape(cvar_name_postfix) %]
+
+[%- IF ( hide_non_editable && !var.config.is_flag('editable') ) %]
+  [% L.hidden_tag(var_name, var.value) %]
+[%- ELSIF ( !var.is_valid ) %]
+  [%- IF ( show_disabled_message ) %]
+    [% 'Element disabled' | $T8 %]
+  [%- END %]
+[%- ELSIF ( var.config .type == 'bool' ) %]
+  [% L.checkbox_tag(var_name, checked = var.value) %]
+[%- ELSIF ( var.config .type == 'textfield' ) %]
+  [% L.textarea_tag(var_name, var.value, cols = var.config.processed_options.WIDTH, rows = var.config.processed_options.HEIGHT) %]
+[%- ELSIF ( var.config.type == 'date' ) %]
+  [% L.date_tag(var_name, var.value) %]
+[%- ELSIF ( var.config.type == 'timestamp' ) %]
+  [% L.input_tag(var_name, var.value) %]
+[%- ELSIF ( var.config.type == 'customer' ) %]
+  [% L.customer_picker(var_name, var.value) %]
+[%- ELSIF ( var.config.type == 'vendor' ) %]
+  [% L.vendor_selector(var_name, var.value) %]
+[%- ELSIF ( var.config.type == 'part' ) %]
+  [% L.part_selector(var_name, var.value) %]
+[%- ELSIF ( var.config.type == 'select' ) %]
+  [% L.select_tag(var_name, var.config.processed_options, default = var.value) %]
+[%- ELSIF ( var.config.type == 'number' ) %]
+  [%- L.input_tag(var_name, LxERP.format_amount(var.value, -2)) %]
+[%- ELSE %]
+  [% L.input_tag(var_name, var.value, maxlength = var.config.processed_options.MAXLENGTH) %]
+[%- END %]

diff --git a/templates/webpages/customer_vendor/render_cvar_input.html b/templates/webpages/customer_vendor/render_cvar_input.html
deleted file mode 100644 (file)
index c1b7720..0000000
--- a/templates/webpages/customer_vendor/render_cvar_input.html
+++ /dev/null
@@ -1,34 +0,0 @@
-[%- USE T8 %]
-[%- USE HTML %]
-[%- USE L %]
-[%- USE LxERP %]
-
-[%- SET var_name = HTML.escape(cvar_name_prefix) _ HTML.escape(var.config.name) _ HTML.escape(cvar_name_postfix) %]
-
-[%- IF ( hide_non_editable && !var.config.is_flag('editable') ) %]
-  [% L.hidden_tag(var_name, var.value) %]
-[%- ELSIF ( !var.is_valid ) %]
-  [%- IF ( show_disabled_message ) %]
-    [% 'Element disabled' | $T8 %]
-  [%- END %]
-[%- ELSIF ( var.config .type == 'bool' ) %]
-  [% L.checkbox_tag(var_name, checked = var.value) %]
-[%- ELSIF ( var.config .type == 'textfield' ) %]
-  [% L.textarea_tag(var_name, var.value, cols = var.config.processed_options.WIDTH, rows = var.config.processed_options.HEIGHT) %]
-[%- ELSIF ( var.config.type == 'date' ) %]
-  [% L.date_tag(var_name, var.value) %]
-[%- ELSIF ( var.config.type == 'timestamp' ) %]
-  [% L.input_tag(var_name, var.value) %]
-[%- ELSIF ( var.config.type == 'customer' ) %]
-  [% L.customer_picker(var_name, var.value) %]
-[%- ELSIF ( var.config.type == 'vendor' ) %]
-  [% L.vendor_selector(var_name, var.value) %]
-[%- ELSIF ( var.config.type == 'part' ) %]
-  [% L.part_selector(var_name, var.value) %]
-[%- ELSIF ( var.config.type == 'select' ) %]
-  [% L.select_tag(var_name, var.config.processed_options, default = var.value) %]
-[%- ELSIF ( var.config.type == 'number' ) %]
-  [%- L.input_tag(var_name, LxERP.format_amount(var.value, -2)) %]
-[%- ELSE %]
-  [% L.input_tag(var_name, var.value, maxlength = var.config.processed_options.MAXLENGTH) %]
-[%- END %]

diff --git a/templates/webpages/customer_vendor/tabs/contacts.html b/templates/webpages/customer_vendor/tabs/contacts.html
index 6420cbe..aca56cd 100644 (file)
--- a/templates/webpages/customer_vendor/tabs/contacts.html
+++ b/templates/webpages/customer_vendor/tabs/contacts.html
@@ -214,7 +214,7 @@
           <th align="left" valign="top" nowrap>[% var.config.description | html %]</th>
 
           <td valign="top">
-            [% PROCESS 'customer_vendor/render_cvar_input.html'
+            [% PROCESS 'common/render_cvar_input.html'
                        cvar_name_prefix = 'contact_cvars.'
             %]
           </td>

diff --git a/templates/webpages/customer_vendor/tabs/custom_variables.html b/templates/webpages/customer_vendor/tabs/custom_variables.html
index a0a90f9..00a2ca4 100644 (file)
--- a/templates/webpages/customer_vendor/tabs/custom_variables.html
+++ b/templates/webpages/customer_vendor/tabs/custom_variables.html
@@ -8,7 +8,7 @@
           <th align="left" valign="top" nowrap>[% var.config.description | html %]</th>
 
           <td valign="top">
-            [% PROCESS 'customer_vendor/render_cvar_input.html'
+            [% PROCESS 'common/render_cvar_input.html'
                         cvar_name_prefix = 'cv_cvars.'
             %]
           </td>