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

multi acl: port /wiki

Browse Source
This commit is contained in:
Mario Vavti 2016-08-04 12:09:06 +02:00
parent 120e9a1e4c
commit 036b72757c
2 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Zotlabs/Module/Wiki.php
View File

@ -74,11 +74,16 @@ class Wiki extends \Zotlabs\Web\Controller {
// Initialize the ACL to the channel default permissions // Initialize the ACL to the channel default permissions
$x = array( $x = array(
'lockstate' => (( $local_observer['channel_allow_cid'] || 'lockstate' => (( $local_observer['channel_allow_cid'] ||
$local_observer['channel_allow_gid'] || $local_observer['channel_allow_gid'] ||
$local_observer['channel_deny_cid'] || $local_observer['channel_deny_cid'] ||
$local_observer['channel_deny_gid']) $local_observer['channel_deny_gid'])
? 'lock' : 'unlock'), ? 'lock' : 'unlock'
),
'acl' => populate_acl($channel_acl), 'acl' => populate_acl($channel_acl),
'allow_cid' => acl2json($channel_acl['allow_cid']),
'allow_gid' => acl2json($channel_acl['allow_gid']),
'deny_cid' => acl2json($channel_acl['deny_cid']),
'deny_gid' => acl2json($channel_acl['deny_gid']),
'bang' => '' 'bang' => ''
); );
} else { } else {
@ -186,6 +191,10 @@ class Wiki extends \Zotlabs\Web\Controller {
'$page' => $pageUrlName, '$page' => $pageUrlName,
'$lockstate' => $x['lockstate'], '$lockstate' => $x['lockstate'],
'$acl' => $x['acl'], '$acl' => $x['acl'],
'$allow_cid' => $x['allow_cid'],
'$allow_gid' => $x['allow_gid'],
'$deny_cid' => $x['deny_cid'],
'$deny_gid' => $x['deny_gid'],
'$bang' => $x['bang'], '$bang' => $x['bang'],
'$content' => $content, '$content' => $content,
'$renderedContent' => $renderedContent, '$renderedContent' => $renderedContent,

14
view/tpl/wiki.tpl
View File

@ -29,7 +29,7 @@
<div class="clear"></div> <div class="clear"></div>
</div> </div>
<div id="new-wiki-form-wrapper" class="section-content-tools-wrapper" style="display:none;"> <div id="new-wiki-form-wrapper" class="section-content-tools-wrapper" style="display:none;">
<form id="new-wiki-form" action="wiki/{{$channel}}/create/wiki" method="post" > <form id="new-wiki-form" action="wiki/{{$channel}}/create/wiki" method="post" class="acl-form" data-form_id="new-wiki-form" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'>
<div class="clear"></div> <div class="clear"></div>
{{include file="field_input.tpl" field=$wikiName}} {{include file="field_input.tpl" field=$wikiName}}
@ -45,17 +45,17 @@
</div> </div>
<div class="btn-group pull-right"> <div class="btn-group pull-right">
<div id="profile-jot-submit-right" class="btn-group" style="margin-right: 20px;"> <div id="profile-jot-submit-right" class="btn-group">
<button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" title="Permission settings" onclick="return false;"> <button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" title="Permission settings" onclick="return false;">
<i id="jot-perms-icon" class="fa fa-{{$lockstate}} jot-icons">{{$bang}}</i> <i id="jot-perms-icon" class="fa fa-{{$lockstate}} jot-icons"></i>{{$bang}}
</button> </button>
<button id="new-wiki-submit" class="btn btn-primary" type="submit" name="submit" >Create Wiki</button>
</div> </div>
<button id="new-wiki-submit" class="btn btn-primary" type="submit" name="submit" >Create Wiki</button>
</div> </div>
<div>{{$acl}}</div>
</form> </form>
<div class="clear"></div> {{$acl}}
<hr> <div class="clear"></div>
<hr>
</div> </div>
<div id="new-page-form-wrapper" class="section-content-tools-wrapper" style="display:none;"> <div id="new-page-form-wrapper" class="section-content-tools-wrapper" style="display:none;">