Fix config rename

kalix-systems · Sep 16, 2019 · 7c57ebd · 7c57ebd
1 parent ec7ea96
commit 7c57ebd
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 6 deletions.
diff --git a/heraldqt/SideBar/popups/ConfigPopup.qml b/heraldqt/SideBar/popups/ConfigPopup.qml
@@ -89,7 +89,7 @@ Window {
             Button {
                 text: "Submit"
                 onClicked: {
-                    JS.submit(config, cfgUid, cfgUname)
+                    JS.submit(config, heraldState.configInit, cfgUid, cfgUname)
                     close()
                 }
             }

diff --git a/heraldqt/SideBar/popups/ConfigPopupSubmission.mjs b/heraldqt/SideBar/popups/ConfigPopupSubmission.mjs
@@ -1,5 +1,5 @@
 export function submit(config, configInit, useridField, usernameField) {
-    if (configInit) {
+    if (!configInit) {
         config.configId = useridField.text.trim();
     }
     config.name = usernameField.text.trim();

diff --git a/heraldqt/SideBar/popups/ConfigPopupSubmission.ts b/heraldqt/SideBar/popups/ConfigPopupSubmission.ts
@@ -4,7 +4,7 @@ export function submit(
   useridField: TextField,
   usernameField: TextField
 ): void {
-  if (configInit) {
+  if (!configInit) {
     config.configId = useridField.text.trim();
   }
   config.name = usernameField.text.trim();

diff --git a/libherald/heraldcore/src/config.rs b/libherald/heraldcore/src/config.rs
@@ -219,8 +219,7 @@ impl Config {
 
     /// Updates user's display name
     pub fn set_name(&mut self, name: Option<String>) -> Result<(), HErr> {
-        self.db
-            .execute(include_str!("sql/config/update_name.sql"), params![name])?;
+        crate::contact::set_name(&self.db, &self.id, name.as_ref().map(|s| s.as_str()))?;
 
         self.name = name;
         Ok(())

diff --git a/libherald/heraldcore/src/contact.rs b/libherald/heraldcore/src/contact.rs
@@ -53,7 +53,7 @@ fn name(db: &Database, id: UserIdRef) -> Result<Option<String>, HErr> {
 }
 
 /// Change name of contact by their `id`
-fn set_name(db: &Database, id: UserIdRef, name: Option<&str>) -> Result<(), HErr> {
+pub(crate) fn set_name(db: &Database, id: UserIdRef, name: Option<&str>) -> Result<(), HErr> {
     let mut stmt = db.prepare(include_str!("sql/contact/update_name.sql"))?;
 
     stmt.execute(params![name, id])?;