Unverified Commit 6abd0509 authored by cmrd Senya's avatar cmrd Senya Committed by Benjamin Neff
Browse files

Use guid instead of id at permalink and in SPV 

This changes links from /posts/:id to /posts/:guid where the links are
not clicked very often. ID search is faster than guid search so we can't
change it everywhere, but these links are not very useful for clicking,
but can be used for easier guid look up.

closes #7453
parent 942e090b

Changelog.md

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 


## Refactor

* Remove rails\_admin [#7440](https://github.com/diaspora/diaspora/pull/7440)

* Use guid instead of id at permalink and in SPV [#7453](https://github.com/diaspora/diaspora/pull/7453)



## Bug fixes

* Make photo upload button hover text translatable [#7429](https://github.com/diaspora/diaspora/pull/7429)

app/assets/templates/single-post-viewer/single-post-content_tpl.jst.hbs

+3 −3
Original line number Diff line number Diff line
@@ -39,11 +39,11 @@ 
            {{/if}}

            <span class="post-time">

              {{#if root}}

                <a href="/posts/{{root.id}}">

                <a href="/posts/{{root.guid}}">

                  <time datetime="{{root.created_at}}" title="{{localTime root.created_at}}" />

                </a>

              {{else}}

                <a href="/posts/{{id}}">

                <a href="/posts/{{guid}}">

                  <time datetime="{{created_at}}" title="{{localTime created_at}}" />

                </a>

              {{/if}}
@@ -91,7 +91,7 @@ 
          </span>

          <div class="post-context">

            <span class="post-time">

              <a href="/posts/{{id}}">

              <a href="/posts/{{guid}}">

                <time datetime="{{created_at}}" title="{{localTime created_at}}" />

              </a>

            </span>

app/assets/templates/stream-element_tpl.jst.hbs

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
            <time class="timeago" data-original-title="{{{localTime created_at}}}" datetime="{{created_at}}" />

          </a>



          <a href="/posts/{{id}}" class="permalink" title="{{t "stream.permalink"}}">

          <a href="/posts/{{guid}}" class="permalink" title="{{t "stream.permalink"}}">

            <i class="entypo-link"></i>

          </a>

        {{/if}}