diff --git a/Changelog b/Changelog index 9a2390942..ed7d4e296 100755 --- a/Changelog +++ b/Changelog @@ -1,4 +1,5 @@ 2018-08-07 DariusIII + * Chg: User can change only role allowed permissions (direct versus role based permissions) * Fix: Fix category exclusions for RSS feeds * Chg: Update ApiTransformer to handle null values * Fix: Fix ApiV2 responses diff --git a/app/Http/Controllers/BasePageController.php b/app/Http/Controllers/BasePageController.php index 50c9f0845..e6c8b835b 100644 --- a/app/Http/Controllers/BasePageController.php +++ b/app/Http/Controllers/BasePageController.php @@ -282,7 +282,7 @@ class BasePageController extends Controller $this->smarty->assign('recentforumpostslist', Forumpost::getPosts(Settings::settingValue('..showrecentforumposts'))); } - $parentcatlist = Category::getForMenu(); + $parentcatlist = Category::getForMenu($this->userdata['categoryexclusions']); $this->smarty->assign('parentcatlist', $parentcatlist); $this->smarty->assign('catClass', Category::class); diff --git a/resources/views/themes/Gentele/headermenu.tpl b/resources/views/themes/Gentele/headermenu.tpl index ba551ac9d..14ef2b809 100755 --- a/resources/views/themes/Gentele/headermenu.tpl +++ b/resources/views/themes/Gentele/headermenu.tpl @@ -2,7 +2,7 @@
{if isset($userdata)} {foreach $parentcatlist as $parentcat} - {if $parentcat.id == {$catClass::TV_ROOT} && $userdata->hasDirectPermission('view tv') == true && $userdata->hasPermissionTo('view tv') == true} + {if $parentcat.id == {$catClass::TV_ROOT}}
  • @@ -20,7 +20,7 @@
    • {/if} - {if $parentcat.id == {$catClass::MOVIE_ROOT} && $userdata->hasDirectPermission('view movies') == true && $userdata->hasPermissionTo('view movies') == true} + {if $parentcat.id == {$catClass::MOVIE_ROOT}}
  • @@ -52,7 +52,7 @@
    • {/if} - {if $parentcat.id == {$catClass::GAME_ROOT} && $userdata->hasDirectPermission('view console') == true && $userdata->hasPermissionTo('view console') == true} + {if $parentcat.id == {$catClass::GAME_ROOT}}
  • @@ -82,7 +82,7 @@
    • {/if} - {if $parentcat.id == {$catClass::PC_ROOT} && $userdata->hasDirectPermission('view pc') == true && $userdata->hasPermissionTo('view pc') == true} + {if $parentcat.id == {$catClass::PC_ROOT}}
  • @@ -118,7 +118,7 @@
    • {/if} - {if $parentcat.id == {$catClass::MUSIC_ROOT} && $userdata->hasDirectPermission('view audio') == true && $userdata->hasPermissionTo('view audio') == true} + {if $parentcat.id == {$catClass::MUSIC_ROOT}}
  • @@ -148,7 +148,7 @@
    • {/if} - {if $parentcat.id == {$catClass::BOOKS_ROOT} && $userdata->hasDirectPermission('view books') == true && $userdata->hasPermissionTo('view books') == true} + {if $parentcat.id == {$catClass::BOOKS_ROOT}}
  • @@ -178,7 +178,7 @@
    • {/if} - {if $parentcat.id == {$catClass::XXX_ROOT} && $userdata->hasDirectPermission('view adult') == true && $userdata->hasPermissionTo('view adult') == true} + {if $parentcat.id == {$catClass::XXX_ROOT}}
  • @@ -213,7 +213,7 @@
    • {/if} - {if $parentcat.id == {$catClass::OTHER_ROOT} && $userdata->hasDirectPermission('view other') == true && $userdata->hasPermissionTo('view other') == true} + {if $parentcat.id == {$catClass::OTHER_ROOT}}
  • diff --git a/resources/views/themes/Gentele/profileedit.tpl b/resources/views/themes/Gentele/profileedit.tpl index 7b60e96a6..191b745e2 100755 --- a/resources/views/themes/Gentele/profileedit.tpl +++ b/resources/views/themes/Gentele/profileedit.tpl @@ -74,59 +74,75 @@ - + - + + {if $user->role->hasPermissionTo('view console') == true} + {/if} + {if $user->role->hasPermissionTo('view movies') == true} + {/if} + {if $user->role->hasPermissionTo('view audio') == true} + {/if} + {if $user->role->hasPermissionTo('view pc') == true} + {/if} + {if $user->role->hasPermissionTo('view tv') == true} + {/if} + {if $user->role->hasPermissionTo('view adult') == true} + {/if} + {if $user->role->hasPermissionTo('view books') == true} + {/if} + {if $user->role->hasPermissionTo('view other') == true} + {/if}
    Excluded - CategoriesExcluded + Categories
    Excluded Categories
    View Console releases {html_radios id="viewconsole" name='viewconsole' values=$yesno_ids output=$yesno_names selected={(int)$user->hasDirectPermission('view console')} separator='
    '}
    View Movie releases {html_radios id="viewmovies" name='viewmovies' values=$yesno_ids output=$yesno_names selected={(int)$user->hasDirectPermission('view movies')} separator='
    '}
    View Audio releases {html_radios id="viewaudio" name='viewaudio' values=$yesno_ids output=$yesno_names selected={(int)$user->hasDirectPermission('view audio')} separator='
    '}
    View PC releases {html_radios id="viewpc" name='viewpc' values=$yesno_ids output=$yesno_names selected={(int)$user->hasDirectPermission('view pc')} separator='
    '}
    View TV releases {html_radios id="viewtv" name='viewtv' values=$yesno_ids output=$yesno_names selected={(int)$user->hasDirectPermission('view tv')} separator='
    '}
    View Adult releases {html_radios id="viewadult" name='viewadult' values=$yesno_ids output=$yesno_names selected={(int)$user->hasDirectPermission('view adult')} separator='
    '}
    View Book releases {html_radios id="viewbooks" name='viewbooks' values=$yesno_ids output=$yesno_names selected={(int)$user->hasDirectPermission('view books')} separator='
    '}
    View Other releases {html_radios id="viewother" name='viewother' values=$yesno_ids output=$yesno_names selected={(int)$user->hasDirectPermission('view other')} separator='
    '}