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

fix some regressions with permission roles

Browse Source
This commit is contained in:
Mario Vavti
2018-01-15 11:34:42 +01:00
committed by Mario
parent 09abba3dd0
commit 42878c40fc
7 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Zotlabs/Module/Connedit.php
View File

@@ -866,7 +866,7 @@ class Connedit extends \Zotlabs\Web\Controller {
$o .= replace_macros($tpl, [ $o .= replace_macros($tpl, [
'$header' => (($self) ? t('Connection Default Permissions') : sprintf( t('Connection: %s'),$contact['xchan_name'])), '$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), '$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_new' => t('Add permission role'),
'$permcat_enable' => feature_enabled(local_channel(),'permcats'), '$permcat_enable' => feature_enabled(local_channel(),'permcats'),
'$addr' => $contact['xchan_addr'], '$addr' => $contact['xchan_addr'],

2
Zotlabs/Module/Defperms.php
View File

@@ -237,7 +237,7 @@ class Defperms extends \Zotlabs\Web\Controller {
$o .= replace_macros($tpl, [ $o .= replace_macros($tpl, [
'$header' => t('Connection Default Permissions'), '$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), '$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_new' => t('Add permission role'),
'$permcat_enable' => feature_enabled(local_channel(),'permcats'), '$permcat_enable' => feature_enabled(local_channel(),'permcats'),
'$section' => $section, '$section' => $section,

4
view/js/mod_connedit.js
View File

@@ -19,7 +19,7 @@ $(document).ready(function() {
$('#id_permcat').change(function() { $('#id_permcat').change(function() {
$('.loading-role-rotator').spin(true); $('.loading').toggleClass('invisible');
var permName = $('#id_permcat').val(); var permName = $('#id_permcat').val();
loadAbookRole(permName); loadAbookRole(permName);
}); });
@@ -128,7 +128,7 @@ function loadAbookRole(name) {
if(this.value) if(this.value)
$('#me_id_perms_' + this.name).attr('checked','checked'); $('#me_id_perms_' + this.name).attr('checked','checked');
}); });
$('.loading-role-rotator').spin(false); $('.loading').toggleClass('invisible');
}); });
} }

4
view/js/mod_defperms.js
View File

@@ -1,7 +1,7 @@
$(document).ready(function() { $(document).ready(function() {
$('#id_permcat').change(function() { $('#id_permcat').change(function() {
$('.loading-role-rotator').show(); $('.loading').toggleClass('invisible');
var permName = $('#id_permcat').val(); var permName = $('#id_permcat').val();
loadConnectionRole(permName); loadConnectionRole(permName);
}); });
@@ -25,7 +25,7 @@ function loadConnectionRole(name) {
if(this.value) if(this.value)
$('#id_perms_' + this.name).attr('checked','checked'); $('#id_perms_' + this.name).attr('checked','checked');
}); });
$('.loading-role-rotator').hide(); $('.loading').toggleClass('invisible');
}); });
} }

4
view/js/mod_settings.js
View File

@@ -19,7 +19,7 @@ $(document).ready(function() {
}); });
$('#id_permcat_list').change(function() { $('#id_permcat_list').change(function() {
$('.loading-role-rotator').spin(true); $('.loading').toggleClass('invisible');
var permName = $('#id_permcat').val(); var permName = $('#id_permcat').val();
loadPermcat(permName); loadPermcat(permName);
}); });
@@ -172,7 +172,7 @@ function loadPermcat(name) {
if(this.value) if(this.value)
$('#me_id_perms_' + this.name).attr('checked','checked'); $('#me_id_perms_' + this.name).attr('checked','checked');
}); });
$('.loading-role-rotator').spin(false); $('.loading').toggleClass('invisible');
}); });
} }

1
view/tpl/abook_edit.tpl
View File

@@ -485,7 +485,6 @@
</div> </div>
{{if $permcat_enable}} {{if $permcat_enable}}
<div class="loading-role-rotator"></div>
<a href="settings/permcats" class="pull-right"><i class="fa fa-plus"></i>&nbsp;{{$permcat_new}}</a> <a href="settings/permcats" class="pull-right"><i class="fa fa-plus"></i>&nbsp;{{$permcat_new}}</a>
{{include file="field_select.tpl" field=$permcat}} {{include file="field_select.tpl" field=$permcat}}
{{/if}} {{/if}}

1
view/tpl/defperms.tpl
View File

@@ -17,7 +17,6 @@
<p>{{$permnote_self}}</p> <p>{{$permnote_self}}</p>
</div> </div>
{{if $permcat_enable}} {{if $permcat_enable}}
<div class="loading-role-rotator spinner-wrapper"></div>
<a href="settings/permcats" class="pull-right"><i class="fa fa-plus"></i>&nbsp;{{$permcat_new}}</a> <a href="settings/permcats" class="pull-right"><i class="fa fa-plus"></i>&nbsp;{{$permcat_new}}</a>
{{include file="field_select.tpl" field=$permcat}} {{include file="field_select.tpl" field=$permcat}}
{{/if}} {{/if}}