From: dsc <dsc@wikimedia.org>
Date: Wed, 11 Apr 2012 09:09:39 +0000 (-0700)
Subject: Merge branch 'master' of less.ly:kraken-ui into dataset-ui
X-Git-Url: http://git.less.ly:3516/?a=commitdiff_plain;h=bfaf147b6449edd371bc6dc1458716dac71a04e3;p=limn.git

Merge branch 'master' of less.ly:kraken-ui into dataset-ui

Conflicts:
	lib/graph/graph-model.co
---

bfaf147b6449edd371bc6dc1458716dac71a04e3
diff --cc lib/graph/graph-model.co
index e53f376,11e106d..ee33f02
--- a/lib/graph/graph-model.co
+++ b/lib/graph/graph-model.co
@@@ -276,11 -270,12 +276,11 @@@ Graph = exports.Graph = BaseModel.exten
      /**
       * @returns {String} URL identifying this model.
       */
-     toURL: ->
-         slug = @get('slug') or ''
-         slug = "/#slug" if slug
-         "#{@urlRoot}#slug?#{@toKV { keepSlug: !!slug }}"
+     toURL: (action) ->
+         slug = @get 'slug'
+         path = _.compact [ @urlRoot, slug, action ] .join '/'
+         "#path?#{@toKV { keepSlug: !!slug }}"
      
 -    toString: -> "#{@ctorName}(id=#{@id}, cid=#{@cid})"
  # }}}