diff options
| author | Bryan Newbold <bnewbold@robocracy.org> | 2018-09-07 21:51:31 -0700 |
|---|---|---|
| committer | Bryan Newbold <bnewbold@robocracy.org> | 2018-09-07 21:51:31 -0700 |
| commit | d2070ba3718978a9615ae2aa3d81825803522a91 (patch) | |
| tree | f62fe241fdbbd32180e582bd5533582558c6b979 /rust/src/api_wrappers.rs | |
| parent | 20c5cf5a8b9acf98db7487ab49de8dcbc1ddb2f9 (diff) | |
| parent | 8cccbcdef11e7ddc761ec494cb894a8d49a0d510 (diff) | |
| download | fatcat-d2070ba3718978a9615ae2aa3d81825803522a91.tar.gz fatcat-d2070ba3718978a9615ae2aa3d81825803522a91.zip | |
Merge branch 'autoaccept' into http-verbs
Started resolving conflicts in:
TODO
notes/cloud_instances.txt
rust/fatcat-api/README.md
rust/src/api_server.rs
Diffstat (limited to 'rust/src/api_wrappers.rs')
| -rw-r--r-- | rust/src/api_wrappers.rs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/rust/src/api_wrappers.rs b/rust/src/api_wrappers.rs index de1fc9da..6272814e 100644 --- a/rust/src/api_wrappers.rs +++ b/rust/src/api_wrappers.rs @@ -61,7 +61,7 @@ macro_rules! wrap_entity_handlers { _context: &Context, ) -> Box<Future<Item = $post_resp, Error = ApiError> + Send> { let conn = self.db_pool.get().expect("db_pool error"); - let ret = match conn.transaction(|| self.$post_handler(entity, &conn)) { + let ret = match conn.transaction(|| self.$post_handler(entity, false, &conn)) { Ok(edit) => $post_resp::CreatedEntity(edit), Err(Error(ErrorKind::Diesel(e), _)) => @@ -84,10 +84,12 @@ macro_rules! wrap_entity_handlers { fn $post_batch_fn( &self, entity_list: &Vec<models::$model>, + autoaccept: Option<bool>, + editgroup: Option<String>, _context: &Context, ) -> Box<Future<Item = $post_batch_resp, Error = ApiError> + Send> { let conn = self.db_pool.get().expect("db_pool error"); - let ret = match conn.transaction(|| self.$post_batch_handler(entity_list, &conn)) { + let ret = match conn.transaction(|| self.$post_batch_handler(entity_list, autoaccept.unwrap_or(false), editgroup, &conn)) { Ok(edit) => $post_batch_resp::CreatedEntities(edit), Err(Error(ErrorKind::Diesel(e), _)) => |