Merge branch 'master' into okapi-filters

Conflicts: zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml kept updated files outbound rule and new source_files outbound rule
zanata · Sep 4, 2012 · 74d21f6 · 74d21f6
2 parents 8035432 + 94e2795
commit 74d21f6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/zanata-war/src/main/webapp/WEB-INF/pages.xml b/zanata-war/src/main/webapp/WEB-INF/pages.xml
@@ -570,7 +570,7 @@
     <param name="project" value="#{projectIterationZipFileAction.projectSlug}" />
     <param name="iteration" value="#{projectIterationZipFileAction.iterationSlug}" />
     <param name="localeId" value="#{projectIterationZipFileAction.localeId}" />
-    
+
     <action execute="#{projectIterationFilesAction.initialize()}" />
     <action execute="#{breadcrumbs.clear}"/>
     <action execute="#{breadcrumbs.addLocation('/project/list', messages['jsf.Projects'])}"/>

diff --git a/zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml b/zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
@@ -326,8 +326,13 @@
     <to>$1/iteration/source_files/$2/$3?$5</to>
   </outbound-rule>
   <outbound-rule>
-    <from>^(/.+)?/iteration/files.seam\?project=([^&amp;]+)&amp;iteration=([^&amp;]+)&amp;localeId=([^&amp;]+)$</from>
-    <to>$1/iteration/files/$2/$3/$4</to>
+    <from>^(/.+)?/iteration/files.seam\?project=([^&amp;]+)&amp;iteration=([^&amp;]+)&amp;localeId=([^&amp;]+)(&amp;(.+))?$</from>
+    <to>$1/iteration/files/$2/$3/$4?$6</to>
+  </outbound-rule>
+  <!-- Duplicate rule to handle different parameter order. -->
+  <outbound-rule>
+    <from>^(/.+)?/iteration/files.seam\?localeId=([^&amp;]+)&amp;project=([^&amp;]+)&amp;iteration=([^&amp;]+)(&amp;(.+))?$</from>
+    <to>$1/iteration/files/$3/$4/$2?$6</to>
   </outbound-rule>
   <outbound-rule>
     <from>^(/.+)?/iteration/edit.seam\?projectSlug=([^&amp;]+)&amp;slug=([^&amp;]+)$</from>