Skip to content
Snippets Groups Projects
Commit cacf3d1e authored by Alexander Kaschta's avatar Alexander Kaschta :owl: Committed by Janis Streib
Browse files

UPD: Make FQDN description nullable as non expert

parent 3bdf11d0
Branches
No related tags found
No related merge requests found
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
:attribute_reference_name="object_definition_reference_names_by_attribute[attr]" :attribute_reference_name="object_definition_reference_names_by_attribute[attr]"
:attribute_referencing="object_definition_referencing_by_attribute[attr]" :attribute_referencing="object_definition_referencing_by_attribute[attr]"
:attribute_name="attr" :attribute_name="attr"
:attribute_non_expert_nullable="nullable_non_expert.includes(attr)"
:input_reducer="input_reducer[attr]" :input_reducer="input_reducer[attr]"
v-bind:key="attr" v-bind:key="attr"
v-if="'new' in data && (data.new.isRequired || non_optionals.includes(attr))"></DataEditField> v-if="'new' in data && (data.new.isRequired || non_optionals.includes(attr))"></DataEditField>
...@@ -39,6 +40,7 @@ ...@@ -39,6 +40,7 @@
:attribute_reference_name="object_definition_reference_names_by_attribute[attr]" :attribute_reference_name="object_definition_reference_names_by_attribute[attr]"
:attribute_referencing="object_definition_referencing_by_attribute[attr]" :attribute_referencing="object_definition_referencing_by_attribute[attr]"
:attribute_name="attr" :attribute_name="attr"
:attribute_non_expert_nullable="nullable_non_expert.includes(attr)"
:input_reducer="input_reducer[attr]" :input_reducer="input_reducer[attr]"
v-bind:key="attr" v-bind:key="attr"
v-if="'new' in data && (!data.new.isRequired && !non_optionals.includes(attr))"></DataEditField> v-if="'new' in data && (!data.new.isRequired && !non_optionals.includes(attr))"></DataEditField>
...@@ -54,6 +56,7 @@ ...@@ -54,6 +56,7 @@
:attribute_reference_name="object_definition_reference_names_by_attribute[attr]" :attribute_reference_name="object_definition_reference_names_by_attribute[attr]"
:attribute_referencing="object_definition_referencing_by_attribute[attr]" :attribute_referencing="object_definition_referencing_by_attribute[attr]"
:attribute_name="attr" :attribute_name="attr"
:attribute_non_expert_nullable="nullable_non_expert.includes(attr)"
:input_reducer="input_reducer[attr]" :input_reducer="input_reducer[attr]"
v-for="attr in non_optionals_order" v-for="attr in non_optionals_order"
v-bind:key="attr" v-bind:key="attr"
...@@ -67,6 +70,7 @@ ...@@ -67,6 +70,7 @@
:attribute_reference_name="object_definition_reference_names_by_attribute[attr]" :attribute_reference_name="object_definition_reference_names_by_attribute[attr]"
:attribute_referencing="object_definition_referencing_by_attribute[attr]" :attribute_referencing="object_definition_referencing_by_attribute[attr]"
:attribute_name="attr" :attribute_name="attr"
:attribute_non_expert_nullable="nullable_non_expert.includes(attr)"
:input_reducer="input_reducer[attr]" :input_reducer="input_reducer[attr]"
v-bind:key="attr" v-bind:key="attr"
v-if="'new' in data && !non_optionals_order.includes(attr)" v-if="'new' in data && !non_optionals_order.includes(attr)"
...@@ -219,6 +223,13 @@ export default { ...@@ -219,6 +223,13 @@ export default {
required: false, required: false,
type: Array type: Array
}, },
nullable_non_expert: {
required: false,
default() {
return []
},
type: Array
},
old_uuid: { old_uuid: {
required: false, required: false,
type: String, type: String,
......
...@@ -47,8 +47,8 @@ ...@@ -47,8 +47,8 @@
></b-form-input> ></b-form-input>
<input type="hidden" v-if="input_reducer === false" :value="attribute_preset || ''" :name="attribute_name"/> <input type="hidden" v-if="input_reducer === false" :value="attribute_preset || ''" :name="attribute_name"/>
<b-checkbox :name="attribute_name+'_null'" v-model="make_null" <b-checkbox :name="attribute_name+'_null'" v-model="make_null"
v-if="$store.state.expert && object_attribute.new.is_nullable">NULL v-if="($store.state.expert || attribute_non_expert_nullable) && object_attribute.new.is_nullable">NULL
<NetvsExpertMarker/> <NetvsExpertMarker v-if="!attribute_non_expert_nullable"/>
</b-checkbox> </b-checkbox>
</b-form-group> </b-form-group>
</div> </div>
...@@ -106,6 +106,12 @@ export default { ...@@ -106,6 +106,12 @@ export default {
object_attribute: { object_attribute: {
required: true required: true
}, },
attribute_non_expert_nullable: {
required: false,
default() {
return false
}
},
attribute_referencing: null, attribute_referencing: null,
attribute_reference_name: null, attribute_reference_name: null,
attribute_preset: null, attribute_preset: null,
......
...@@ -99,7 +99,8 @@ ...@@ -99,7 +99,8 @@
<DBEditor :presets="db_editor_presets" modal_id="edit_fqdn" <DBEditor :presets="db_editor_presets" modal_id="edit_fqdn"
:object_title="object_title" :input_reducer="full_edit_fqdn_reducer" :object_title="object_title" :input_reducer="full_edit_fqdn_reducer"
object_function="update" object_fq_name="dns.fqdn" :old_data="db_editor_old_data" object_function="update" object_fq_name="dns.fqdn" :old_data="db_editor_old_data"
:non_optionals_order="['value', 'description']"> :non_optionals_order="['value', 'description']"
:nullable_non_expert="['description']">
</DBEditor> </DBEditor>
</Loading> </Loading>
</div> </div>
......
...@@ -91,7 +91,9 @@ ...@@ -91,7 +91,9 @@
:old_data="db_editor_old_data" :old_data="db_editor_old_data"
:presets="db_editor_presets" :presets="db_editor_presets"
:non_optionals_order="['value', 'description', 'type']" :non_optionals_order="['value', 'description', 'type']"
:object_function="db_editor_function" object_fq_name="dns.fqdn"></DBEditor> :object_function="db_editor_function" object_fq_name="dns.fqdn"
:nullable_non_expert="['description']">
</DBEditor>
</div> </div>
</Loading> </Loading>
......
...@@ -284,7 +284,8 @@ ...@@ -284,7 +284,8 @@
<DBEditor :presets="db_editor_presets" modal_id="edit_fqdn" <DBEditor :presets="db_editor_presets" modal_id="edit_fqdn"
:object_title="object_title" :input_reducer="full_edit_fqdn_reducer" :object_title="object_title" :input_reducer="full_edit_fqdn_reducer"
object_function="update" object_fq_name="dns.fqdn" :old_data="db_editor_old_data" object_function="update" object_fq_name="dns.fqdn" :old_data="db_editor_old_data"
:non_optionals_order="['value', 'description']"> :non_optionals_order="['value', 'description']"
:nullable_non_expert="['description']">
</DBEditor> </DBEditor>
<EVLogViewer v-if="bcd" modal_id="evlog_bcd" :title="'BCD \''+ bcd.name + '\''" <EVLogViewer v-if="bcd" modal_id="evlog_bcd" :title="'BCD \''+ bcd.name + '\''"
ref_obj_fq="nd.bcd" :refobj_id_value="bcd.gpk"></EVLogViewer> ref_obj_fq="nd.bcd" :refobj_id_value="bcd.gpk"></EVLogViewer>
......
...@@ -44,7 +44,8 @@ ...@@ -44,7 +44,8 @@
</DBEditor> </DBEditor>
<DBEditor :input_reducer="create_fqdn_reducer" modal_id="create_fqdn_entry" <DBEditor :input_reducer="create_fqdn_reducer" modal_id="create_fqdn_entry"
object_function="create" object_fq_name="dns.fqdn" object_function="create" object_fq_name="dns.fqdn"
:non_optionals_order="['value', 'type', 'description']"> :non_optionals_order="['value', 'type', 'description']"
:nullable_non_expert="['description']">
</DBEditor> </DBEditor>
</div> </div>
</template> </template>
......
...@@ -19,7 +19,8 @@ ...@@ -19,7 +19,8 @@
:object_title="object_title" :object_title="object_title"
:non_optionals_order="['value', 'description', 'type']" :non_optionals_order="['value', 'description', 'type']"
:input_reducer="edit_fqdn_reducer" :input_reducer="edit_fqdn_reducer"
object_function="update" object_fq_name="dns.fqdn" :old_data="db_editor_old_data"> object_function="update" object_fq_name="dns.fqdn" :old_data="db_editor_old_data"
:nullable_non_expert="['description']">
</DBEditor> </DBEditor>
<EVLogViewer v-if="fqdn" modal_id="evlog_fqdn" :title="'FQDN \''+ fqdn.value + '\''" <EVLogViewer v-if="fqdn" modal_id="evlog_fqdn" :title="'FQDN \''+ fqdn.value + '\''"
ref_obj_fq="dns.fqdn" refobj_id_field="value_list" :refobj_id_value="[fqdn.value]"></EVLogViewer> ref_obj_fq="dns.fqdn" refobj_id_field="value_list" :refobj_id_value="[fqdn.value]"></EVLogViewer>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment