diff options
| author | modela bitweaver <bitweaver@modela> | 2014-05-29 14:09:20 -0400 |
|---|---|---|
| committer | modela bitweaver <bitweaver@modela> | 2014-05-29 14:09:20 -0400 |
| commit | 9d1cd6b4aa665224fa439c8be767d877baf817a9 (patch) | |
| tree | 76a263c2cde22c7eb6a7b8ae0367245520aaccc9 | |
| parent | 0ac10419d1f0dbdb04b4feeda2f9664af61f21d0 (diff) | |
| download | liberty-9d1cd6b4aa665224fa439c8be767d877baf817a9.tar.gz liberty-9d1cd6b4aa665224fa439c8be767d877baf817a9.tar.bz2 liberty-9d1cd6b4aa665224fa439c8be767d877baf817a9.zip | |
resolve conflicts
| -rw-r--r-- | templates/service_content_icon_inc.tpl | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/templates/service_content_icon_inc.tpl b/templates/service_content_icon_inc.tpl index 0cfe226..daa67ad 100644 --- a/templates/service_content_icon_inc.tpl +++ b/templates/service_content_icon_inc.tpl @@ -21,6 +21,7 @@ {smartlink ipackage=liberty ifile="content_permissions.php" ititle="Assign Permissions" booticon="icon-key" class=$iconClass ipackage=liberty ifile="content_permissions.php" content_id="$serviceHash.content_id"} {/if} {/if} + {if $role_model } {smartlink ipackage=liberty ifile="content_role_permissions.php" ititle="Assign Permissions" booticon="icon-key" class=$iconClass ipackage=liberty ifile="content_permissions.php" content_id=$serviceHash.content_id} {else} |