diff options
| author | Mike Linksvayer <ml@gondwanaland.com> | 2012-12-20 12:50:43 -0800 |
|---|---|---|
| committer | Mike Linksvayer <ml@gondwanaland.com> | 2012-12-20 12:50:43 -0800 |
| commit | 1d0148aef1493467dacb6c39c4e080ee4a5246d2 (patch) | |
| tree | 5213418660d4e079eb8dac6bc8ea2e4fdc140088 /mediagoblin/submit/routing.py | |
| parent | 200433dc38a2139462e0331be36ee49a80a81a12 (diff) | |
| parent | 5c99cd01a70f2d597ac7669e8d944ddf79b05281 (diff) | |
| download | mediagoblin-1d0148aef1493467dacb6c39c4e080ee4a5246d2.tar.lz mediagoblin-1d0148aef1493467dacb6c39c4e080ee4a5246d2.tar.xz mediagoblin-1d0148aef1493467dacb6c39c4e080ee4a5246d2.zip | |
Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin
Conflicts:
docs/source/siteadmin/media-types.rst
Diffstat (limited to 'mediagoblin/submit/routing.py')
| -rw-r--r-- | mediagoblin/submit/routing.py | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/mediagoblin/submit/routing.py b/mediagoblin/submit/routing.py index 1e399d1e..fbe3c39c 100644 --- a/mediagoblin/submit/routing.py +++ b/mediagoblin/submit/routing.py @@ -14,11 +14,8 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -from routes.route import Route +from mediagoblin.routing import add_route -submit_routes = [ - Route('mediagoblin.submit.start', '/', - controller='mediagoblin.submit.views:submit_start'), - Route('mediagoblin.submit.collection', '/collection', - controller='mediagoblin.submit.views:add_collection'), - ] +add_route('mediagoblin.submit.start', + '/submit/', 'mediagoblin.submit.views:submit_start') +add_route('mediagoblin.submit.collection', '/submit/collection', 'mediagoblin.submit.views:add_collection') |