diff options
| author | doh5 <doo@mattermost.com> | 2017-04-03 21:16:57 +0900 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2017-04-03 08:16:57 -0400 |
| commit | 8e70e40c30d5de9c5a1f5d86fe83aa7fb775bd55 (patch) | |
| tree | 68e0671f38a93209a02e643043974afca8e050c0 /webapp | |
| parent | 88b8df314673ceae08a37a6472296448e83d7442 (diff) | |
| download | chat-8e70e40c30d5de9c5a1f5d86fe83aa7fb775bd55.tar.gz chat-8e70e40c30d5de9c5a1f5d86fe83aa7fb775bd55.tar.bz2 chat-8e70e40c30d5de9c5a1f5d86fe83aa7fb775bd55.zip | |
Different 'name' value for system console LHS "Email" section + route name update (#5917)
* Different 'name' value for system console LHS "Email" section
Under Testing
-This is to create a unique ID for the Selenium UI Automiation
* Update the system console route because of the name change
for unique selenium ID
* Update admin_sidebar.jsx
* Update route_admin_console.jsx
Diffstat (limited to 'webapp')
| -rw-r--r-- | webapp/components/admin_console/admin_sidebar.jsx | 4 | ||||
| -rw-r--r-- | webapp/routes/route_admin_console.jsx | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/webapp/components/admin_console/admin_sidebar.jsx b/webapp/components/admin_console/admin_sidebar.jsx index 73ec436f4..a27891eb3 100644 --- a/webapp/components/admin_console/admin_sidebar.jsx +++ b/webapp/components/admin_console/admin_sidebar.jsx @@ -389,7 +389,7 @@ export default class AdminSidebar extends React.Component { } > <AdminSidebarSection - name='email' + name='authentication_email' title={ <FormattedMessage id='admin.sidebar.email' @@ -469,7 +469,7 @@ export default class AdminSidebar extends React.Component { } > <AdminSidebarSection - name='email' + name='notifications_email' title={ <FormattedMessage id='admin.sidebar.email' diff --git a/webapp/routes/route_admin_console.jsx b/webapp/routes/route_admin_console.jsx index e892ca583..1f23f9139 100644 --- a/webapp/routes/route_admin_console.jsx +++ b/webapp/routes/route_admin_console.jsx @@ -85,9 +85,9 @@ export default ( /> </Route> <Route path='authentication'> - <IndexRedirect to='email'/> + <IndexRedirect to='authentication_email'/> <Route - path='email' + path='authentication_email' component={EmailAuthenticationSettings} /> <Route @@ -135,9 +135,9 @@ export default ( /> </Route> <Route path='notifications'> - <IndexRedirect to='email'/> + <IndexRedirect to='notifications_email'/> <Route - path='email' + path='notifications_email' component={EmailSettings} /> <Route |