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

atokens - we only need one permission column

Browse Source
This commit is contained in:
zotlabs 2017-02-07 19:49:15 -08:00
parent 2d3e20d96e
commit 46d0e23e7b
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Zotlabs/Lib/Permcat.php
View File

@ -79,7 +79,7 @@ class Permcat {
], ],
[ 'moderator', t('moderator','permcat'), [ 'moderator', t('moderator','permcat'),
[ 'view_stream','view_profile','view_contacts','view_storage','view_pages', [ 'view_stream','view_profile','view_contacts','view_storage','view_pages',
'write_storage','post_wall','wite_pages','write_wiki','post_comments','post_like','tag_deliver', 'write_storage','post_wall','write_pages','write_wiki','post_comments','post_like','tag_deliver',
'chat', 'republish' ] 'chat', 'republish' ]
] ]
]; ];
@ -101,10 +101,13 @@ class Permcat {
} }
static public function update($channel_id, $name,$permarr) {
PConfig::Set($channel_id,'permcat',$name,$permarr);
}
static public function delete($channel_id,$name) {
PConfig::Delete($channel_id,'permcat',$name);
}
} }

3
Zotlabs/Module/Settings/Tokens.php
View File

@ -161,7 +161,8 @@ class Tokens {
'$me' => t('My Settings'), '$me' => t('My Settings'),
'$perms' => $perms, '$perms' => $perms,
'$inherited' => t('inherited'), '$inherited' => t('inherited'),
'$notself' => '1', '$notself' => 0,
'$self' => 1,
'$permlbl' => t('Individual Permissions'), '$permlbl' => t('Individual Permissions'),
'$permnote' => t('Some permissions may be inherited from your channel\'s <a href="settings"><strong>privacy settings</strong></a>, which have higher priority than individual settings. You can <strong>not</strong> change those settings here.'), '$permnote' => t('Some permissions may be inherited from your channel\'s <a href="settings"><strong>privacy settings</strong></a>, which have higher priority than individual settings. You can <strong>not</strong> change those settings here.'),
'$submit' => t('Submit') '$submit' => t('Submit')

2
view/tpl/settings_tokens.tpl
View File

@ -35,7 +35,7 @@
<table id="perms-tool-table" class=form-group> <table id="perms-tool-table" class=form-group>
<tr> <tr>
<td></td><td class="abook-them">{{$them}}</td><td colspan="2" class="abook-me">{{$me}}</td> <td></td><td colspan="2" class="abook-me">{{$me}}</td>
</tr> </tr>
{{foreach $perms as $prm}} {{foreach $perms as $prm}}
{{include file="field_acheckbox.tpl" field=$prm}} {{include file="field_acheckbox.tpl" field=$prm}}