- don't set password via remoting if field is empty

Marius Cramer

2015-08-06 37b29231e47a0c4458dc1c15d98588f16f07e1e2

 interface/web/vm/templates/openvz_vm_edit.htm

@@ -11,66 +11,64 @@
                        <label for="server_id_disabled" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
                        <div class="col-sm-9"><select name="server_id_disabled" id="server_id_disabled" class="form-control" disabled="disabled">
                            {tmpl_var name='server_id'}
                        </select>
                        </div><input type="hidden" name="server_id" value="{tmpl_var name='server_id_value'}" />
                        </select></div>
                        <input type="hidden" name="server_id" value="{tmpl_var name='server_id_value'}" />
                    <tmpl_else>
                            <label for="server_id" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
                            <div class="col-sm-9"><select name="server_id" id="server_id" class="form-control" onChange="loadOptionInto('ip_address','vm/ajax_get_ip.php?server_id='+document.getElementById('server_id').value)">
                            <div class="col-sm-9"><select name="server_id" id="server_id" class="form-control" onChange="ISPConfig.loadOptionInto('ip_address','vm/ajax_get_ip.php?server_id='+document.getElementById('server_id').value)">
                                {tmpl_var name='server_id'}
                            </select>
                    </div></tmpl_if>
                            </select></div>
                    </tmpl_if>
                </div>
                <div class="form-group">
                    <label for="client_group_id" class="col-sm-3 control-label">{tmpl_var name='client_group_id_txt'}</label>
                    <div class="col-sm-9"><select name="client_group_id" id="client_group_id" class="form-control">
                        {tmpl_var name='client_group_id'}
                    </select>
                </div></div>
                    </select></div>
                </div>
            </tmpl_if>
            <tmpl_if name="is_reseller">
                <div class="form-group">
                    <label for="client_group_id" class="col-sm-3 control-label">{tmpl_var name='client_group_id_txt'}</label>
                    <div class="col-sm-9"><select name="client_group_id" id="client_group_id" class="form-control">
                        {tmpl_var name='client_group_id'}
                    </select>
                </div></div>
                    </select></div>
                </div>
            </tmpl_if>
            <tmpl_if name="edit_disabled">
                <div class="form-group">
                    <label for="ostemplate_id_disabled" class="col-sm-3 control-label">{tmpl_var name='ostemplate_id_txt'}</label>
                    <div class="col-sm-9"><select name="ostemplate_id_disabled" id="ostemplate_id_disabled" class="form-control" disabled="disabled">
                        {tmpl_var name='ostemplate_id'}
                    </select>
                </div></div>
                    </select></div>
                </div>
                <input type="hidden" name="ostemplate_id" value="{tmpl_var name='ostemplate_id_value'}">
            <tmpl_else>
                <div class="form-group">
                    <label for="ostemplate_id" class="col-sm-3 control-label">{tmpl_var name='ostemplate_id_txt'}</label>
                    <div class="col-sm-9"><select name="ostemplate_id" id="ostemplate_id" class="form-control">
                        {tmpl_var name='ostemplate_id'}
                    </select>
                </div></div>
                    </select></div>
                </div>
            </tmpl_if>
            <div class="form-group">
                <label for="template_id" class="col-sm-3 control-label">{tmpl_var name='template_id_txt'}</label>
                <div class="col-sm-9"><select name="template_id" id="template_id" class="form-control">
                    {tmpl_var name='template_id_select'}
                </select>
            </div></div>
                </select></div>
            </div>
            <div class="form-group">
                <label for="ip_address" class="col-sm-3 control-label">{tmpl_var name='ip_address_txt'}</label>
                <div class="col-sm-9"><select name="ip_address" id="ip_address" class="form-control">
                    {tmpl_var name='ip_address'}
                </select>
            </div></div>
                </select></div>
            </div>
            <div class="form-group">
                <label for="hostname" class="col-sm-3 control-label">{tmpl_var name='hostname_txt'}</label>
                <div class="col-sm-9"><input type="text" name="hostname" id="hostname" value="{tmpl_var name='hostname'}" class="form-control" />
            </div></div>
                <div class="col-sm-9"><input type="text" name="hostname" id="hostname" value="{tmpl_var name='hostname'}" class="form-control" /></div></div>
            <div class="form-group">
                <label for="vm_password" class="col-sm-3 control-label">{tmpl_var name='vm_password_txt'}</label>
                <div class="col-sm-9"><input type="text" name="vm_password" id="vm_password" value="{tmpl_var name='vm_password'}" class="form-control" />
            </div></div>
                <div class="col-sm-9"><input type="text" name="vm_password" id="vm_password" value="{tmpl_var name='vm_password'}" class="form-control" /></div></div>
            <div class="form-group">
                <label class="col-sm-3 control-label">{tmpl_var name='start_boot_txt'}</label>
                <div class="col-sm-9">
@@ -85,20 +83,16 @@
            </div>
            <div class="form-group">
                <label for="active_until_date" class="col-sm-3 control-label">{tmpl_var name='active_until_date_txt'}</label>
                <div class="col-sm-9"><input type="text" name="active_until_date" id="active_until_date" value="{tmpl_var name='active_until_date'}" class="form-control" />
            </div></div>
                <div class="col-sm-9"><input type="text" name="active_until_date" id="active_until_date" value="{tmpl_var name='active_until_date'}" class="form-control" data-input-element="date" data-date-format="{tmpl_var name='conf_format_datetime_js'}" /></div></div>
            <div class="form-group">
                <label for="description" class="col-sm-3 control-label">{tmpl_var name='description_txt'}</label>
                <textarea name="description" id="description" rows='5' cols='30' style='height:60px;'>{tmpl_var name='description'}</textarea>
                <div class="col-sm-9"><textarea class="form-control" name="description" id="description" rows='5' cols='30' style='height:60px;'>{tmpl_var name='description'}</textarea></div>
            </div>
        

        <input type="hidden" name="id" value="{tmpl_var name='id'}">

        <div class="clear"><div class="right">
            <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','vm/openvz_vm_edit.php');">{tmpl_var name='btn_save_txt'}</button>
            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="vm/openvz_vm_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
        </div></div>
<script language="JavaScript" type="text/javascript">
    jQuery( "#active_until_date" ).datepicker({ dateFormat: '<tmpl_var name="date_format">', changeMonth: true, changeYear: true, yearRange: '-100:+100', dayNamesMin: ['<tmpl_var name="daynamesmin_su">','<tmpl_var name="daynamesmin_mo">','<tmpl_var name="daynamesmin_tu">','<tmpl_var name="daynamesmin_we">','<tmpl_var name="daynamesmin_th">','<tmpl_var name="daynamesmin_fr">','<tmpl_var name="daynamesmin_sa">'], dayNames: ['<tmpl_var name="daynames_sunday">','<tmpl_var name="daynames_monday">','<tmpl_var name="daynames_tuesday">','<tmpl_var name="daynames_wednesday">','<tmpl_var name="daynames_thursday">','<tmpl_var name="daynames_friday">','<tmpl_var name="daynames_saturday">'], monthNamesShort: ['<tmpl_var name="monthnamesshort_jan">','<tmpl_var name="monthnamesshort_feb">','<tmpl_var name="monthnamesshort_mar">','<tmpl_var name="monthnamesshort_apr">','<tmpl_var name="monthnamesshort_may">','<tmpl_var name="monthnamesshort_jun">','<tmpl_var name="monthnamesshort_jul">','<tmpl_var name="monthnamesshort_aug">','<tmpl_var name="monthnamesshort_sep">','<tmpl_var name="monthnamesshort_oct">','<tmpl_var name="monthnamesshort_nov">','<tmpl_var name="monthnamesshort_dec">'], nextText: '<tmpl_var name="datepicker_nextText">', prevText: '<tmpl_var name="datepicker_prevText">', firstDay: 1 });	
</script>
            <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="vm/openvz_vm_edit.php">{tmpl_var name='btn_save_txt'}</button>
            <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="vm/openvz_vm_list.php">{tmpl_var name='btn_cancel_txt'}</button>
        </div></div>