diff options
| author | Mario Vavti <mario@mariovavti.com> | 2016-08-05 13:37:47 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2016-08-05 13:37:47 +0200 |
| commit | e7e73e6fd1f2e6d7e9a31ad11aad9f3020c94bbf (patch) | |
| tree | d9e10014b815ad37f0e0169c0f8e63056713329f | |
| parent | bed0a5773fe2300979969b46ef633f28ab84bf43 (diff) | |
| download | volse-hubzilla-e7e73e6fd1f2e6d7e9a31ad11aad9f3020c94bbf.tar.gz volse-hubzilla-e7e73e6fd1f2e6d7e9a31ad11aad9f3020c94bbf.tar.bz2 volse-hubzilla-e7e73e6fd1f2e6d7e9a31ad11aad9f3020c94bbf.zip | |
multi acl: port /thing
| -rw-r--r-- | Zotlabs/Module/Thing.php | 8 | ||||
| -rw-r--r-- | view/js/acl.js | 2 | ||||
| -rw-r--r-- | view/tpl/thing_edit.tpl | 5 | ||||
| -rw-r--r-- | view/tpl/thing_input.tpl | 5 |
4 files changed, 13 insertions, 7 deletions
diff --git a/Zotlabs/Module/Thing.php b/Zotlabs/Module/Thing.php index 65fc0588e..a7ac63f73 100644 --- a/Zotlabs/Module/Thing.php +++ b/Zotlabs/Module/Thing.php @@ -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') )); diff --git a/view/js/acl.js b/view/js/acl.js index 9b9f0eba3..a1af5f4f0 100644 --- a/view/js/acl.js +++ b/view/js/acl.js @@ -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'); diff --git a/view/tpl/thing_edit.tpl b/view/tpl/thing_edit.tpl index 356693782..b23584fe1 100644 --- a/view/tpl/thing_edit.tpl +++ b/view/tpl/thing_edit.tpl @@ -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}} diff --git a/view/tpl/thing_input.tpl b/view/tpl/thing_input.tpl index 75497e878..3e178925c 100644 --- a/view/tpl/thing_input.tpl +++ b/view/tpl/thing_input.tpl @@ -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}} |