Menu
▾
▴
Re: [Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[30745] branches/6.x
|
From: Jonny B. <jo...@ti...> - 2010-12-23 10:23:30
|
No probs - nice to get to these things eventually! (only took a year! :) I was wondering that on an object of category with non-global perms set maybe this should be the first (default) tab on that page? jb On 21 Dec 2010, at 15:48, Marc Laporte wrote: > Hi! > > I just noticed this. > > This is very useful! Thanks! > > M ;-) > > > On Wed, Nov 17, 2010 at 9:45 AM, <jon...@us...> wrote: >> Revision: 30745 >> http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=30745&view=rev >> Author: jonnybradley >> Date: 2010-11-17 14:45:17 +0000 (Wed, 17 Nov 2010) >> >> Log Message: >> ----------- >> [ENH] admin object perms: Improve permission differences view, now on a separate tab. >> >> Modified Paths: >> -------------- >> branches/6.x/templates/tiki-objectpermissions.tpl >> branches/6.x/tiki-objectpermissions.php >> >> Modified: branches/6.x/templates/tiki-objectpermissions.tpl >> =================================================================== >> --- branches/6.x/templates/tiki-objectpermissions.tpl 2010-11-17 14:20:15 UTC (rev 30744) >> +++ branches/6.x/templates/tiki-objectpermissions.tpl 2010-11-17 14:45:17 UTC (rev 30745) >> @@ -29,11 +29,7 @@ >> {tr}This category's direct permissions override any global permissions affecting objects in it.{/tr} >> {/if} >> <br /> >> - {if $tiki_p_admin eq 'y'} >> - {if !empty($permissions_added)}<em>{tr}Permissions added:{/tr} {$permissions_added}</em><br />{/if} >> - {if !empty($permissions_removed)}<em>{tr}Permissions removed:{/tr} {$permissions_removed}</em><br />{/if} >> - {tr}To edit global permissions{/tr} {self_link objectType='global' objectId='' objectName='' permType=$permType}{tr}click here{/tr}{/self_link}. >> - {/if} >> + {tr}To edit global permissions{/tr} {self_link objectType='global' objectId='' objectName='' permType=$permType}{tr}click here{/tr}{/self_link}. >> {/remarksbox} >> {elseif $permissions_displayed eq 'category'} >> {remarksbox type="warning" title="{tr}Warning{/tr}"} >> @@ -109,6 +105,13 @@ >> {/remarksbox} >> >> {/tab} >> + >> + {if !empty($permissions_added) or !empty($permissions_removed)} >> + {tab name="{tr}View Differences{/tr}"} >> + {if !empty($permissions_added)}<p><strong>{tr}Permissions added:{/tr}</strong></p><blockquote>{$permissions_added}</blockquote><br />{/if} >> + {if !empty($permissions_removed)}<p><strong>{tr}Permissions removed:{/tr}</strong></p><blockquote>{$permissions_removed}</blockquote><br />{/if} >> + {/tab} >> + {/if} >> >> {tab name="{tr}Select groups{/tr}"} >> <form method="post" action="{$smarty.server.PHP_SELF}?{query}"> >> >> Modified: branches/6.x/tiki-objectpermissions.php >> =================================================================== >> --- branches/6.x/tiki-objectpermissions.php 2010-11-17 14:20:15 UTC (rev 30744) >> +++ branches/6.x/tiki-objectpermissions.php 2010-11-17 14:45:17 UTC (rev 30745) >> @@ -679,17 +679,30 @@ >> $displayedPermissions = $parent; >> } else { // direct object perms >> $comparator = new Perms_Reflection_PermissionComparator( $globPerms, $displayedPermissions ); >> - $permissions_added = ''; $permissions_removed = ''; >> + $permissions_added = array(); $permissions_removed = array(); >> foreach($comparator->getAdditions() as $p) { >> - $permissions_added .= empty($permissions_added) ? '' : ', '; >> - $permissions_added .= $p[0] . ':' . $p[1]; >> + if (!isset($permissions_added[$p[0]])) { >> + $permissions_added[$p[0]] = array(); >> + } >> + $permissions_added[$p[0]][] = str_replace('tiki_p_', '', $p[1]); >> } >> foreach($comparator->getRemovals() as $p) { >> - $permissions_removed .= empty($permissions_removed) ? '' : ', '; >> - $permissions_removed .= $p[0] . ':' . $p[1]; >> + if (!isset($permissions_removed[$p[0]])) { >> + $permissions_removed[$p[0]] = array(); >> + } >> + $permissions_removed[$p[0]][] = str_replace('tiki_p_', '', $p[1]); >> } >> - $smarty->assign('permissions_added', $permissions_added); >> - $smarty->assign('permissions_removed', $permissions_removed); >> + $added = ''; $removed = ''; >> + foreach($permissions_added as $gp => $pm) { >> + $added .= '<br />'; >> + $added .= '<strong>' . $gp . ':</strong> ' . implode(', ', $pm); >> + } >> + foreach($permissions_removed as $gp => $pm) { >> + $removed .= '<br />'; >> + $removed .= '<strong>' . $gp . ':</strong> ' . implode(', ', $pm); >> + } >> + $smarty->assign('permissions_added', $added); >> + $smarty->assign('permissions_removed', $removed); >> } >> >> return $displayedPermissions; >> >> >> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. >> >> ------------------------------------------------------------------------------ >> Beautiful is writing same markup. Internet Explorer 9 supports >> standards for HTML5, CSS3, SVG 1.1, ECMAScript5, and DOM L2 & L3. >> Spend less time writing and rewriting code and more time creating great >> experiences on the web. Be a part of the beta today >> http://p.sf.net/sfu/msIE9-sfdev2dev >> _______________________________________________ >> Tikiwiki-cvs mailing list >> Tik...@li... >> https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs >> > > > > -- > Marc Laporte > > http://MarcLaporte.com > http://Tiki.org/MarcLaporte > http://AvanTech.net > > ------------------------------------------------------------------------------ > Lotusphere 2011 > Register now for Lotusphere 2011 and learn how > to connect the dots, take your collaborative environment > to the next level, and enter the era of Social Business. > http://p.sf.net/sfu/lotusphere-d2d > _______________________________________________ > Tikiwiki-cvs mailing list > Tik...@li... > https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs |