svk/rac-gui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Добавлено экранирование (замена) пробелов в имени профиля безопасности при добавлении.

Browse Source
This commit is contained in:
Sergey Kalinin 2018-08-06 07:30:02 +03:00
parent dd62d90683
commit f5642c2686
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/function.tcl
View File

@ -530,6 +530,7 @@ proc Run::profiles {tree host values} {
#InsertItemsWorkList $server_list #InsertItemsWorkList $server_list
if {[string trim [lindex $profile_list 0]] eq "name"} { if {[string trim [lindex $profile_list 0]] eq "name"} {
set profile_name [string trim [lindex $profile_list 1]] set profile_name [string trim [lindex $profile_list 1]]
#set profile_name [regsub -all -- " " $profile_name "_"]
lappend profiles($profile_name) $profile_name lappend profiles($profile_name) $profile_name
} }
} }
@ -538,6 +539,7 @@ proc Run::profiles {tree host values} {
} }
foreach x [array names profiles] { foreach x [array names profiles] {
set id [lindex $profiles($x) 0] set id [lindex $profiles($x) 0]
#set id_for_tree [regsub -all -- " " $id "_"]
if { [$tree exists "profile::$id"] == 0 } { if { [$tree exists "profile::$id"] == 0 } {
$tree insert "profiles::$values" end -id "profile::$id" \ $tree insert "profiles::$values" end -id "profile::$id" \
-text $id -values "$id" -text $id -values "$id"
@ -839,7 +841,7 @@ proc Add::admin {tree host value} {
RunCommand "cluster admin register \ RunCommand "cluster admin register \
--name=[.add.frm.ent_name get] \ --name=[.add.frm.ent_name get] \
--pwd=[.add.frm.ent_pwd get] \ --pwd=[.add.frm.ent_pwd get] \
--descr=[.add.frm.ent_descr get] \ \"--descr=[regsub -all -- " " [.add.frm.ent_descr get] "\\ "]\" \
--auth=$auth \ --auth=$auth \
--os-user=[.add.frm.ent_os_user get] \ --os-user=[.add.frm.ent_os_user get] \
--agent-user=$agent_user \ --agent-user=$agent_user \
@ -954,7 +956,7 @@ proc Add::servers {tree host values} {
--agent-host=[.add.frm.ent_agent_host get] \ --agent-host=[.add.frm.ent_agent_host get] \
--agent-port=[.add.frm.ent_agent_port get] \ --agent-port=[.add.frm.ent_agent_port get] \
--port-range=[.add.frm.ent_port_range get] \ --port-range=[.add.frm.ent_port_range get] \
\"--name=[.add.frm.ent_name get]\" \ \"--name=[regsub -all -- " " [.add.frm.ent_name get] "\\ "]\" \
--using=$using \ --using=$using \
--infobases-limit=[.add.frm.ent_infobases_limit get] \ --infobases-limit=[.add.frm.ent_infobases_limit get] \
--memory-limit=[.add.frm.ent_memory_limit get] \ --memory-limit=[.add.frm.ent_memory_limit get] \
@ -1328,7 +1330,7 @@ proc Add::profile {tree host values} {
.add.frm_btn.btn_ok configure -command { .add.frm_btn.btn_ok configure -command {
RunCommand "profile update \ RunCommand "profile update \
--cluster=$active_cluster $auth \ --cluster=$active_cluster $auth \
--name=[.add.frm.ent_name get] \ --name=[regsub -all -- " " [.add.frm.ent_name get] "_"] \
--descr=[regsub -all -- " " [.add.frm.ent_descr get] "\\ "] \ --descr=[regsub -all -- " " [.add.frm.ent_descr get] "\\ "] \
--config=$config \ --config=$config \
--priv=$priv \ --priv=$priv \
@ -1988,7 +1990,7 @@ proc Edit::profile {tree host values} {
.add.frm_btn.btn_ok configure -command { .add.frm_btn.btn_ok configure -command {
RunCommand "profile update \ RunCommand "profile update \
--cluster=$active_cluster $auth \ --cluster=$active_cluster $auth \
--name=[.add.frm.ent_name get] \ \"--name=[regsub -all -- " " [.add.frm.ent_name get] "\\ "]\" \
\"--descr=[regsub -all -- " " [.add.frm.ent_descr get] "\\ "]\" \ \"--descr=[regsub -all -- " " [.add.frm.ent_descr get] "\\ "]\" \
--config=$config \ --config=$config \
--priv=$priv \ --priv=$priv \