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

multi acl: port /thing

Browse Source
This commit is contained in:
Mario Vavti 2016-08-05 13:37:47 +02:00
parent bed0a5773f
commit e7e73e6fd1
4 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Zotlabs/Module/Thing.php
View File

@ -312,6 +312,10 @@ class Thing extends \Zotlabs\Web\Controller {
'$imgurl' => $r[0]['obj_imgurl'],
'$permissions' => t('Permissions'),
'$aclselect' => populate_acl($channel_acl,false),
'$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']),
'$lockstate' => $lockstate,
'$submit' => t('Submit')
));
@ -358,6 +362,10 @@ class Thing extends \Zotlabs\Web\Controller {
'$img_lbl' => t('URL for photo of thing (optional)'),
'$permissions' => t('Permissions'),
'$aclselect' => populate_acl($channel_acl,false),
'$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']),
'$lockstate' => $lockstate,
'$submit' => t('Submit')
));

2
view/js/acl.js
View File

@ -62,7 +62,7 @@ function ACL(backend_url) {
}
ACL.prototype.get_form_data = function(event, form_id) {
ACL.prototype.get_form_data = function(event) {
form_id = $(this).data('form_id');

5
view/tpl/thing_edit.tpl
View File

@ -1,5 +1,5 @@
<h2>{{$thing_hdr}}</h2>
<form action="thing" method="post" >
<form id="thing-edit-form" action="thing" method="post" class="acl-form" data-form_id="thing-edit-form" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'>
<input type="hidden" name="term_hash" value="{{$thing_hash}}" />
{{if $multiprof }}
@ -29,8 +29,6 @@
<div class="thing-end"></div>
{{$aclselect}}
{{if $lockstate}}
<button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;">
<i id="jot-perms-icon" class="fa fa-{{$lockstate}}"></i>
@ -40,3 +38,4 @@
<input type="submit" class="thing-submit" name="submit" value="{{$submit}}" />
</form>
{{$aclselect}}

5
view/tpl/thing_input.tpl
View File

@ -1,5 +1,5 @@
<h2>{{$thing_hdr}}</h2>
<form action="thing" method="post" >
<form id="thing-new-form" action="thing" method="post" class="acl-form" data-form_id="thing-new-form" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'>
{{if $multiprof }}
<div class="thing-profile-label">{{$profile_lbl}}</div>
@ -29,8 +29,6 @@
<div class="thing-end"></div>
{{$aclselect}}
{{if $lockstate}}
<button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;">
<i id="jot-perms-icon" class="fa fa-{{$lockstate}}"></i>
@ -40,3 +38,4 @@
<input type="submit" class="thing-submit" name="submit" value="{{$submit}}" />
</form>
{{$aclselect}}