harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

still a bit of wiki permission weirdness, this should catch the major ones

Browse Source
This commit is contained in:
zotlabs
2016-11-15 02:12:30 -08:00
parent d59f450819
commit 0f5a166cce
3 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/wiki.php
View File

@@ -192,8 +192,9 @@ function wiki_exists_by_name($uid, $urlName) {
function wiki_get_permissions($resource_id, $owner_id, $observer_hash) {
// TODO: For now, only the owner can edit
$sql_extra = item_permissions_sql($owner_id, $observer_hash);
$r = q("SELECT * FROM item WHERE resource_type = '%s' AND resource_id = '%s' $sql_extra LIMIT 1",
dbesc(WIKI_ITEM_RESOURCE_TYPE),
$r = q("SELECT * FROM item WHERE uid = %d and resource_type = '%s' AND resource_id = '%s' $sql_extra LIMIT 1",
intval($owner_id),
dbesc(WIKI_ITEM_RESOURCE_TYPE),
dbesc($resource_id)
);

5
view/tpl/wiki.tpl
View File

@@ -544,10 +544,5 @@
{{else}}
$('#new-wiki-button').hide();
{{/if}}
{{if $showPageControls}}
$('#edit-wiki-button').show();
{{else}}
$('#edit-wiki-button').hide();
{{/if}}
});
</script>

2
view/tpl/wikilist.tpl
View File

@@ -3,7 +3,7 @@
<ul class="nav nav-pills nav-stacked">
{{if $wikis}}
{{foreach $wikis as $wiki}}
<li>{{if $owner}}<a href="#" onclick="wiki_show_edit_wiki_form('{{$wiki.title}}', '{{$wiki.resource_id}}'); return false;" class="pull-right wikilist" title="{{$edit}}"><i id="edit-wiki-button" class="fa fa-pencil"></i></a>{{/if}}
<li>{{if $owner}}<a href="#" onclick="wiki_show_edit_wiki_form('{{$wiki.title}}', '{{$wiki.resource_id}}'); return false;" class="pull-right wikilist" title="{{$edit}}"><i class="fa fa-pencil"></i></a>{{/if}}
<a href="#" onclick="wiki_download_wiki('{{$wiki.resource_id}}'); return false;" title="{{$download}}" class="pull-right wikilist"><i class="fa fa-download"></i></a>
<a href="/wiki/{{$channel}}/{{$wiki.urlName}}/Home" title="{{$view}}">{{$wiki.title}}</a>
</li>