Исправил изменение статуса квот и запись статуса в конфиг

pull/24/head
Igor Belitskiy 2 years ago
parent 9aa612ba32
commit c28ebb7d28

@ -77,13 +77,8 @@ char* set_status_and_del(config_all* _all_config) {
cmd = yon_char_unite(cmd, " DISK_QUOTA[prjquota:" , config_disk_status->device, "]=disable ", NULL); cmd = yon_char_unite(cmd, " DISK_QUOTA[prjquota:" , config_disk_status->device, "]=disable ", NULL);
} }
} }
if (strlen(cmd) > 5) {
return cmd; return cmd;
} }
else {
return NULL;
}
}
char* wrapper_save_format_status_cmd_all(config_all* _all_config) { char* wrapper_save_format_status_cmd_all(config_all* _all_config) {
char* cmd = save_format_status_cmd_all(&_all_config->v_user, &_all_config->v_disk_status); char* cmd = save_format_status_cmd_all(&_all_config->v_user, &_all_config->v_disk_status);
@ -142,10 +137,13 @@ char* template_format_remove_save_device(config_all* _all_config, char* source_r
if (_all_config->v_disk_remove.vectorList.total > 0) { if (_all_config->v_disk_remove.vectorList.total > 0) {
for (int i=0; i < _all_config->v_disk_remove.vectorList.total; i++) { for (int i=0; i < _all_config->v_disk_remove.vectorList.total; i++) {
char* str_del = (char*)_all_config->v_disk_remove.pfVectorGet(&_all_config->v_disk_remove, i); char* str_del = (char*)_all_config->v_disk_remove.pfVectorGet(&_all_config->v_disk_remove, i);
if (str_del) {
cmd = yon_char_unite(cmd, " DISK_QUOTA[usrquota:" , str_del, "] ", NULL); cmd = yon_char_unite(cmd, " DISK_QUOTA[usrquota:" , str_del, "] ", NULL);
cmd = yon_char_unite(cmd, " DISK_QUOTA[grpquota:" , str_del, "] ", NULL); cmd = yon_char_unite(cmd, " DISK_QUOTA[grpquota:" , str_del, "] ", NULL);
cmd = yon_char_unite(cmd, " DISK_QUOTA[prjquota:" , str_del, "] ", NULL); cmd = yon_char_unite(cmd, " DISK_QUOTA[prjquota:" , str_del, "] ", NULL);
} }
}
} }
if (strlen(cmd)>5) { if (strlen(cmd)>5) {
for (int i=0; i < _all_config->v_disk_remove.vectorList.total; i++) { for (int i=0; i < _all_config->v_disk_remove.vectorList.total; i++) {

@ -26,6 +26,7 @@ void view_device_set_index(int _index) {
} }
void view_device_check_activ_disk() { void view_device_check_activ_disk() {
if (strcmp(view_device_set_add_edit, "add") == 0) {
int menu_id = gtk_combo_box_get_active(GTK_COMBO_BOX(obj_view_device_widgets->DeviceCombo)); int menu_id = gtk_combo_box_get_active(GTK_COMBO_BOX(obj_view_device_widgets->DeviceCombo));
if (menu_id == -1) { if (menu_id == -1) {
gtk_widget_set_sensitive(obj_view_device_widgets->btnSaveTempSave, 0); gtk_widget_set_sensitive(obj_view_device_widgets->btnSaveTempSave, 0);
@ -34,6 +35,10 @@ void view_device_check_activ_disk() {
gtk_widget_set_sensitive(obj_view_device_widgets->btnSaveTempSave, 1); gtk_widget_set_sensitive(obj_view_device_widgets->btnSaveTempSave, 1);
} }
} }
else {
gtk_widget_set_sensitive(obj_view_device_widgets->btnSaveTempSave, 1);
}
}
view_device_set_window *view_device_setup_window_base(char* __glade_path) { view_device_set_window *view_device_setup_window_base(char* __glade_path) {
view_device_glade_path = __glade_path; view_device_glade_path = __glade_path;
@ -188,7 +193,12 @@ void view_device_get_gui_data() {
} }
} }
else { else {
if (strcmp(view_device_set_add_edit, "add") == 0) {
disk = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(obj_view_device_widgets->DeviceCombo)); disk = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(obj_view_device_widgets->DeviceCombo));
}
else {
disk = (char*)gtk_label_get_label(GTK_LABEL(obj_view_device_widgets->lblNameDevice));
}
view_device_all_config_temp->v_disk_remove.pfVectorAdd(&view_device_all_config_temp->v_disk_remove, yon_char_new(disk)); view_device_all_config_temp->v_disk_remove.pfVectorAdd(&view_device_all_config_temp->v_disk_remove, yon_char_new(disk));
if (view_device_index != -1) { if (view_device_index != -1) {
_config = (disk_status*)vec_device->pfVectorGet(vec_device, view_device_index); _config = (disk_status*)vec_device->pfVectorGet(vec_device, view_device_index);

Loading…
Cancel
Save