Merge remote-tracking branch 'origin' into org-access-list

2026-08-01 10:29:56 -02:30 · 2019-03-01 10:37:44 -05:00
parent bf7e6201a2 6f26383e06
commit 86a92fefe7
10 changed files with 610 additions and 78 deletions
--- a/src/pages/Organizations/screens/Organization/Organization.jsx
+++ b/src/pages/Organizations/screens/Organization/Organization.jsx
@@ -120,14 +120,18 @@ class Organization extends Component {
              to="/organizations/:id/details"
              exact
            />
-            <Route
-              path="/organizations/:id/edit"
-              render={() => (
-                <OrganizationEdit
-                  match={match}
-                />
-              )}
-            />
+            {organization && (
+              <Route
+                path="/organizations/:id/edit"
+                render={() => (
+                  <OrganizationEdit
+                    api={api}
+                    match={match}
+                    organization={organization}
+                  />
+                )}
+              />
+            )}
            {organization && (
              <Route
                path="/organizations/:id/details"