vw_small

commit 484e82fb9f03edadbd7576b1e9b05edd7f24d931
parent 8bbbff7567e611e1366e981de988f5249c6a8a0d
Author: Daniel García <dani-garcia@users.noreply.github.com>
Date:   Wed, 13 May 2020 22:34:06 +0200

Merge pull request #988 from theycallmesteve/rename_functions

Rename functions
Diffstat:
M
src/api/core/organizations.rs
 | 
2
+-
M
src/api/core/two_factor/mod.rs
 | 
2
+-
M
src/db/models/organization.rs
 | 
2
+-
M
src/db/models/two_factor.rs
 | 
2
+-

4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/api/core/organizations.rs b/src/api/core/organizations.rs
@@ -374,7 +374,7 @@ fn get_collection_users(org_id: String, coll_id: String, _headers: AdminHeaders,
         .map(|col_user| {
             UserOrganization::find_by_user_and_org(&col_user.user_uuid, &org_id, &conn)
                 .unwrap()
-                .to_json_collection_user_details(col_user.read_only)
+                .to_json_read_only(col_user.read_only)
         })
         .collect();
 
diff --git a/src/api/core/two_factor/mod.rs b/src/api/core/two_factor/mod.rs
@@ -38,7 +38,7 @@ pub fn routes() -> Vec<Route> {
 #[get("/two-factor")]
 fn get_twofactor(headers: Headers, conn: DbConn) -> JsonResult {
     let twofactors = TwoFactor::find_by_user(&headers.user.uuid, &conn);
-    let twofactors_json: Vec<Value> = twofactors.iter().map(TwoFactor::to_json_list).collect();
+    let twofactors_json: Vec<Value> = twofactors.iter().map(TwoFactor::to_json_provider).collect();
 
     Ok(Json(json!({
         "Data": twofactors_json,
diff --git a/src/db/models/organization.rs b/src/db/models/organization.rs
@@ -304,7 +304,7 @@ impl UserOrganization {
         })
     }
 
-    pub fn to_json_collection_user_details(&self, read_only: bool) -> Value {
+    pub fn to_json_read_only(&self, read_only: bool) -> Value {
         json!({
             "Id": self.uuid,
             "ReadOnly": read_only
diff --git a/src/db/models/two_factor.rs b/src/db/models/two_factor.rs
@@ -59,7 +59,7 @@ impl TwoFactor {
         })
     }
 
-    pub fn to_json_list(&self) -> Value {
+    pub fn to_json_provider(&self) -> Value {
         json!({
             "Enabled": self.enabled,
             "Type": self.atype,