[#843] Resolve merge conflicts with 'feature/rsr_v3' branch

akvo · Oct 27, 2014 · ab14077 · ab14077
2 parents d73a0d5 + 5d7ef30
commit ab14077
Show file tree

Hide file tree

Showing 7 changed files with 3,246 additions and 5 deletions.
diff --git a/akvo/rsr/models/focus_area.py b/akvo/rsr/models/focus_area.py
@@ -56,7 +56,7 @@ def image_path(instance, file_name):
 
     @models.permalink
     def get_absolute_url(self):
-        return ('project_list', (), {'slug': self.slug})
+        return ('project-directory', ())
 
     def projects(self):
         'return all projects that "belong" to the FA through the Categories it links to'

diff --git a/akvo/rsr/models/project.py b/akvo/rsr/models/project.py
@@ -222,7 +222,7 @@ def image_path(instance, file_name):
 
     @models.permalink
     def get_absolute_url(self):
-        return ('project_main', (), {'project_id': self.pk})
+        return ('project-main', (), {'project_id': self.pk})
 
     def all_donations(self):
         return Invoice.objects.filter(