Skip to content

Commit

Permalink
Merge branch 'sharing-link'
Browse files Browse the repository at this point in the history
Conflicts:
	src/ploneintranet/workspace/browser/templates/roster-edit.pt
  • Loading branch information
mattss committed Jun 27, 2014
2 parents b95c549 + 91ed652 commit 9b10ee8
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions src/ploneintranet/workspace/browser/templates/roster-edit.pt
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,12 @@
<input tal:replace="structure context/@@authenticator/authenticator" />

</form>

<a href="#"
tal:condition="can_manage_workspace"
tal:attributes="href string:${context/absolute_url}/@@sharing">
Advanced permissions
</a>
</div>
</metal:main>
</body>
Expand Down

0 comments on commit 9b10ee8

Please sign in to comment.