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

multi acl: port /settings

Browse Source
This commit is contained in:
Mario Vavti
2016-08-05 14:45:06 +02:00
parent c029839971
commit b2298d44a4
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Zotlabs/Module/Settings.php
View File

@@ -1220,6 +1220,10 @@ class Settings extends \Zotlabs\Web\Controller {
'$permissions' => t('Default Post and Publish Permissions'), '$permissions' => t('Default Post and Publish Permissions'),
'$permdesc' => t("\x28click to open/close\x29"), '$permdesc' => t("\x28click to open/close\x29"),
'$aclselect' => populate_acl($perm_defaults, false, \Zotlabs\Lib\PermissionDescription::fromDescription(t('Use my default audience setting for the type of object published'))), '$aclselect' => populate_acl($perm_defaults, false, \Zotlabs\Lib\PermissionDescription::fromDescription(t('Use my default audience setting for the type of object published'))),
'$allow_cid' => acl2json($perm_defaults['allow_cid']),
'$allow_gid' => acl2json($perm_defaults['allow_gid']),
'$deny_cid' => acl2json($perm_defaults['deny_cid']),
'$deny_gid' => acl2json($perm_defaults['deny_gid']),
'$suggestme' => $suggestme, '$suggestme' => $suggestme,
'$group_select' => $group_select, '$group_select' => $group_select,
'$role' => array('permissions_role' , t('Channel permissions category:'), $permissions_role, '', get_roles()), '$role' => array('permissions_role' , t('Channel permissions category:'), $permissions_role, '', get_roles()),
@@ -1282,7 +1286,7 @@ class Settings extends \Zotlabs\Web\Controller {
call_hooks('settings_form',$o); call_hooks('settings_form',$o);
$o .= '</form>' . "\r\n"; //$o .= '</form>' . "\r\n";
return $o; return $o;
} }

2
view/js/acl.js
View File

@@ -97,8 +97,6 @@ ACL.prototype.on_submit = function() {
that.form_id.append("<input class='acl-field' type='hidden' name='contact_deny[]' value='"+v+"'>"); that.form_id.append("<input class='acl-field' type='hidden' name='contact_deny[]' value='"+v+"'>");
}); });
//areYouSure jquery plugin: recheck the form here
$('form').trigger('checkform.areYouSure');
}; };
ACL.prototype.search = function() { ACL.prototype.search = function() {

4
view/tpl/settings.tpl
View File

@@ -5,7 +5,7 @@
<div class="clear"></div> <div class="clear"></div>
</div> </div>
{{$nickname_block}} {{$nickname_block}}
<form action="settings" id="settings-form" method="post" autocomplete="off" > <form action="settings" id="settings-form" method="post" autocomplete="off" class="acl-form" data-form_id="settings-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='form_security_token' value='{{$form_security_token}}' /> <input type='hidden' name='form_security_token' value='{{$form_security_token}}' />
<div class="panel-group" id="settings" role="tablist" aria-multiselectable="true"> <div class="panel-group" id="settings" role="tablist" aria-multiselectable="true">
<div class="panel"> <div class="panel">
@@ -72,7 +72,6 @@
{{/if}} {{/if}}
<div id="settings-default-perms" class="form-group" > <div id="settings-default-perms" class="form-group" >
<button type="button" class="btn btn-default" data-toggle="modal" data-target="#aclModal"><i id="jot-perms-icon" class="fa"></i>&nbsp;{{$permissions}}</button> <button type="button" class="btn btn-default" data-toggle="modal" data-target="#aclModal"><i id="jot-perms-icon" class="fa"></i>&nbsp;{{$permissions}}</button>
{{$aclselect}}
</div> </div>
{{$group_select}} {{$group_select}}
{{include file="field_checkbox.tpl" field=$hide_presence}} {{include file="field_checkbox.tpl" field=$hide_presence}}
@@ -174,4 +173,5 @@
</div> </div>
</div> </div>
</form> </form>
{{$aclselect}}
</div> </div>