fix(ZNTA-2391) attempt to change admin/home to admin

zanata · Feb 19, 2018 · 40f1e4a · 40f1e4a
1 parent 9f219fe
commit 40f1e4a
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/server/services/src/main/java/org/zanata/servlet/UrlRewriteConfig.java b/server/services/src/main/java/org/zanata/servlet/UrlRewriteConfig.java
@@ -99,7 +99,7 @@ public Configuration getConfiguration(final ServletContext context) {
                 .addRule(Join.path("/{path}").to("/a/index.xhtml"))
                 .where("path").matches(anyOf(
                         "admin/review",
-                        "admin/home",
+                        "admin/",
                         "explore",
                         "glossary",
                         "glossary/project/[^/]*",

diff --git a/server/zanata-frontend/src/app/components/Nav/index.jsx b/server/zanata-frontend/src/app/components/Nav/index.jsx
@@ -89,7 +89,7 @@ const items = [
   },
   {
     icon: 'admin',
-    link: '/admin/home' + dswid,
+    link: '/admin' + dswid,
     title: 'Admin',
     auth: 'admin',
     id: 'nav_admin'

diff --git a/server/zanata-frontend/src/app/containers/Root.js b/server/zanata-frontend/src/app/containers/Root.js
@@ -36,7 +36,7 @@ export default class Root extends Component {
             <Route path='languages' component={Languages} />
             <Route path='project/:project/version/:version'
               component={ProjectVersion} />
-            <Route path='admin/home' component={Admin} />
+            <Route path='admin' component={Admin} />
             <Route path='admin/review' component={AdminReview} />
             <Route path='profile/view/:username' component={UserProfile} />
             <Redirect from='profile' to={`profile/view/${username}`} />

diff --git a/server/zanata-frontend/src/app/jsf/JsfRoot.js b/server/zanata-frontend/src/app/jsf/JsfRoot.js
@@ -24,7 +24,7 @@ const JsfRoot = ({store, history}) => {
           <Route path='iteration/view/:project/:version*'
             component={ProjectVersion} />
           <Route path='project/view/:project' component={Project} />
-          <Route path='admin/home' component={Admin} />
+          <Route path='admin/' component={Admin} />
           <Route path='admin/review' component={Admin} />
         </Route>
       </Router>