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

hubzilla issue #920 - unable to delete permission groups with space in name

Browse Source
This commit is contained in:
zotlabs 2018-01-22 16:49:45 -08:00
parent deede8e2dd
commit 5967360991
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Zotlabs/Module/Settings/Permcats.php
View File

@ -49,7 +49,7 @@ class Permcats {
if(argc() > 2) if(argc() > 2)
$name = argv(2); $name = hex2bin(argv(2));
if(argc() > 3 && argv(3) === 'drop') { if(argc() > 3 && argv(3) === 'drop') {
\Zotlabs\Lib\Permcat::delete(local_channel(),$name); \Zotlabs\Lib\Permcat::delete(local_channel(),$name);
@ -70,7 +70,7 @@ class Permcats {
if(($pc['name']) && ($name) && ($pc['name'] == $name)) if(($pc['name']) && ($name) && ($pc['name'] == $name))
$existing = $pc['perms']; $existing = $pc['perms'];
if(! $pc['system']) if(! $pc['system'])
$permcats[$pc['name']] = $pc['localname']; $permcats[bin2hex($pc['name'])] = $pc['localname'];
} }
} }

2
view/tpl/settings_permcats.tpl
View File

@ -50,7 +50,7 @@
<table id="permcat-index"> <table id="permcat-index">
{{foreach $permcats as $k => $v}} {{foreach $permcats as $k => $v}}
<tr class="permcat-row-{{$k}}"> <tr class="permcat-row-{{$k}}">
<td width="99%"><a href="settings/permcats/{{$k}}">{{$k}}</a></td> <td width="99%"><a href="settings/permcats/{{$k}}">{{$v}}</a></td>
<td width="1%"><i class="fa fa-trash-o drop-icons" onClick="dropItem('/settings/permcats/{{$k}}/drop', '.permcat-row-{{$k}}')"></i></td> <td width="1%"><i class="fa fa-trash-o drop-icons" onClick="dropItem('/settings/permcats/{{$k}}/drop', '.permcat-row-{{$k}}')"></i></td>
</tr> </tr>
{{/foreach}} {{/foreach}}