mirror of
https://codeberg.org/streams/streams.git
synced 2024-09-19 16:55:18 +00:00
fix some regressions with permission roles
This commit is contained in:
parent
d868ebe4ba
commit
746ea5a369
7 changed files with 8 additions and 10 deletions
|
@ -866,7 +866,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 ],
|
||||
'$permcat' => [ 'permcat', t('Permission role'), '', '<span class="loading invisible">' . t('Loading') . '<span class="jumping-dots"><span class="dot-1">.</span><span class="dot-2">.</span><span class="dot-3">.</span></span></span>',$permcats ],
|
||||
'$permcat_new' => t('Add permission role'),
|
||||
'$permcat_enable' => feature_enabled(local_channel(),'permcats'),
|
||||
'$addr' => $contact['xchan_addr'],
|
||||
|
|
|
@ -237,7 +237,7 @@ class Defperms extends \Zotlabs\Web\Controller {
|
|||
$o .= replace_macros($tpl, [
|
||||
'$header' => t('Connection Default Permissions'),
|
||||
'$autoperms' => array('autoperms',t('Apply these permissions automatically'), ((get_pconfig(local_channel(),'system','autoperms')) ? 1 : 0), t('If enabled, connection requests will be approved without your interaction'), $yes_no),
|
||||
'$permcat' => [ 'permcat', t('Permission role'), '', '',$permcats ],
|
||||
'$permcat' => [ 'permcat', t('Permission role'), '', '<span class="loading invisible">' . t('Loading') . '<span class="jumping-dots"><span class="dot-1">.</span><span class="dot-2">.</span><span class="dot-3">.</span></span></span>',$permcats ],
|
||||
'$permcat_new' => t('Add permission role'),
|
||||
'$permcat_enable' => feature_enabled(local_channel(),'permcats'),
|
||||
'$section' => $section,
|
||||
|
|
|
@ -19,7 +19,7 @@ $(document).ready(function() {
|
|||
|
||||
|
||||
$('#id_permcat').change(function() {
|
||||
$('.loading-role-rotator').spin(true);
|
||||
$('.loading').toggleClass('invisible');
|
||||
var permName = $('#id_permcat').val();
|
||||
loadAbookRole(permName);
|
||||
});
|
||||
|
@ -128,7 +128,7 @@ function loadAbookRole(name) {
|
|||
if(this.value)
|
||||
$('#me_id_perms_' + this.name).attr('checked','checked');
|
||||
});
|
||||
$('.loading-role-rotator').spin(false);
|
||||
$('.loading').toggleClass('invisible');
|
||||
});
|
||||
}
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
$(document).ready(function() {
|
||||
|
||||
$('#id_permcat').change(function() {
|
||||
$('.loading-role-rotator').show();
|
||||
$('.loading').toggleClass('invisible');
|
||||
var permName = $('#id_permcat').val();
|
||||
loadConnectionRole(permName);
|
||||
});
|
||||
|
@ -25,7 +25,7 @@ function loadConnectionRole(name) {
|
|||
if(this.value)
|
||||
$('#id_perms_' + this.name).attr('checked','checked');
|
||||
});
|
||||
$('.loading-role-rotator').hide();
|
||||
$('.loading').toggleClass('invisible');
|
||||
});
|
||||
}
|
||||
|
||||
|
|
|
@ -19,7 +19,7 @@ $(document).ready(function() {
|
|||
});
|
||||
|
||||
$('#id_permcat_list').change(function() {
|
||||
$('.loading-role-rotator').spin(true);
|
||||
$('.loading').toggleClass('invisible');
|
||||
var permName = $('#id_permcat').val();
|
||||
loadPermcat(permName);
|
||||
});
|
||||
|
@ -172,7 +172,7 @@ function loadPermcat(name) {
|
|||
if(this.value)
|
||||
$('#me_id_perms_' + this.name).attr('checked','checked');
|
||||
});
|
||||
$('.loading-role-rotator').spin(false);
|
||||
$('.loading').toggleClass('invisible');
|
||||
});
|
||||
}
|
||||
|
||||
|
|
|
@ -485,7 +485,6 @@
|
|||
</div>
|
||||
|
||||
{{if $permcat_enable}}
|
||||
<div class="loading-role-rotator"></div>
|
||||
<a href="settings/permcats" class="pull-right"><i class="fa fa-plus"></i> {{$permcat_new}}</a>
|
||||
{{include file="field_select.tpl" field=$permcat}}
|
||||
{{/if}}
|
||||
|
|
|
@ -17,7 +17,6 @@
|
|||
<p>{{$permnote_self}}</p>
|
||||
</div>
|
||||
{{if $permcat_enable}}
|
||||
<div class="loading-role-rotator spinner-wrapper"></div>
|
||||
<a href="settings/permcats" class="pull-right"><i class="fa fa-plus"></i> {{$permcat_new}}</a>
|
||||
{{include file="field_select.tpl" field=$permcat}}
|
||||
{{/if}}
|
||||
|
|
Loading…
Reference in a new issue