aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Zotlabs/Module/Connedit.php10
-rw-r--r--view/js/mod_connedit.js10
-rwxr-xr-xview/tpl/abook_edit.tpl3
3 files changed, 23 insertions, 0 deletions
diff --git a/Zotlabs/Module/Connedit.php b/Zotlabs/Module/Connedit.php
index 92f4fc345..8f382246a 100644
--- a/Zotlabs/Module/Connedit.php
+++ b/Zotlabs/Module/Connedit.php
@@ -793,6 +793,15 @@ class Connedit extends \Zotlabs\Web\Controller {
$perms[] = array('perms_' . $k, $v, ((array_key_exists($k,$their_perms)) ? intval($their_perms[$k]) : ''),$thisperm, 1, (($checkinherited & PERMS_SPECIFIC) ? '' : '1'), '', $checkinherited);
}
+ $pcat = new \Zotlabs\Lib\Permcat(local_channel());
+ $pcatlist = $pcat->listing();
+ $permcats = [];
+ if($pcatlist) {
+ foreach($pcatlist as $pc) {
+ $permcats[$pc['name']] = $pc['localname'];
+ }
+ }
+
$locstr = '';
$locs = q("select hubloc_addr as location from hubloc left join site on hubloc_url = site_url where hubloc_hash = '%s'
@@ -817,6 +826,7 @@ class Connedit extends \Zotlabs\Web\Controller {
$o .= replace_macros($tpl, [
'$header' => (($self) ? t('Connection Default Permissions') : sprintf( t('Connection: %s'),$contact['xchan_name'])),
'$autoperms' => array('autoperms',t('Apply these permissions automatically'), ((get_pconfig(local_channel(),'system','autoperms')) ? 1 : 0), t('Connection requests will be approved without your interaction'), $yes_no),
+ '$permcat' => [ 'permcat', t('Permission role'), '', '',$permcats ],
'$addr' => $contact['xchan_addr'],
'$section' => $section,
'$sections' => $sections,
diff --git a/view/js/mod_connedit.js b/view/js/mod_connedit.js
index d750f3a2f..4739c490c 100644
--- a/view/js/mod_connedit.js
+++ b/view/js/mod_connedit.js
@@ -17,6 +17,15 @@ $(document).ready(function() {
connectFullShare();
});
+
+ $('#id_permcat').change(function() {
+ $('.loading-role-rotator').spin(true);
+ var permName = $('#id_permcat').val();
+ loadAbookRole(permName);
+ });
+
+
+
$(document).on('click', '.vcard-header, .vcard-cancel-btn', updateView);
$(document).on('click', '.add-field', doAdd);
$(document).on('click', '.remove-field', doRemove);
@@ -119,6 +128,7 @@ function loadAbookRole(name) {
if(this.value)
$('#me_id_perms_' + this.name).attr('checked','checked');
});
+ $('.loading-role-rotator').spin(false);
});
}
diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl
index 6f89e2199..231841659 100755
--- a/view/tpl/abook_edit.tpl
+++ b/view/tpl/abook_edit.tpl
@@ -473,6 +473,9 @@
{{if $self}}{{$permnote_self}}{{/if}}
</div>
+ <div class="loading-role-rotator"></div>
+ {{include file="field_select.tpl" field=$permcat}}
+
<table id="perms-tool-table" class=form-group>
<tr>
<td></td>