Changeset 843
- Timestamp:
- 12/06/06 03:08:07 (2 years ago)
- Files:
-
- branches/wheeljack/lib/MT/App/CMS.pm (modified) (3 diffs)
- branches/wheeljack/lib/MT/Permission.pm (modified) (1 diff)
- branches/wheeljack/tmpl/cms/list_asset.tmpl (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
branches/wheeljack/lib/MT/App/CMS.pm
r839 r843 987 987 ) : ()), 988 988 class_loop => \@class_loop, 989 can_delete_files => $app->user->is_superuser,989 can_delete_files => ($blog ? $app->{perms}->can_edit_assets : $app->user->is_superuser), 990 990 nav_assets => 1, 991 991 has_expanded_mode => 1, … … 1470 1470 $param->{can_edit_authors} = $perms->can_administer_blog; 1471 1471 $param->{can_edit_config} = $perms->can_edit_config; 1472 $param->{can_edit_assets} = $perms->can_edit_assets; 1472 1473 # FIXME: once we have edit_commenters permission 1474 $param->{can_access_assets} = $param->{can_edit_entries} || $param->{can_edit_assets}; 1473 1475 $param->{can_edit_commenters} = $perms->can_edit_config(); 1474 1476 $param->{can_rebuild} = $perms->can_rebuild; … … 1477 1479 $param->{can_edit_notifications} = $perms->can_edit_notifications; 1478 1480 $param->{has_manage_label} = 1479 $p erms->can_edit_templates|| $perms->can_administer_blog ||1480 $p erms->can_edit_categories || $perms->can_edit_config||1481 $p erms->can_edit_tags;1481 $param->{can_edit_templates} || $perms->can_administer_blog || 1482 $param->{can_edit_categories} || $param->{can_edit_config} || 1483 $param->{can_edit_tags}; 1482 1484 $param->{has_posting_label} = 1483 $p erms->can_post || $perms->can_edit_all_posts||1484 $p erms->can_upload;1485 $param->{can_post} || $param->{can_edit_entries} || 1486 $param->{can_access_assets}; 1485 1487 $param->{has_community_label} = 1486 $p erms->can_post || $perms->can_edit_config||1487 $perms-> can_edit_notifications || $perms->can_edit_all_posts;1488 $param->{can_edit_entries} || $param->{can_edit_config} || 1489 $perms->{can_edit_notifications}; 1488 1490 $param->{can_view_log} = $perms->can_view_blog_log; 1489 1491 } branches/wheeljack/lib/MT/Permission.pm
r816 r843 88 88 [ 2, 'post', 'Create Entries', 1, 'blog'], 89 89 [ 4, 'upload', 'Upload File', 1, 'blog'], 90 [ 65536, 'edit_assets', 'Manage Assets', 1, 'blog'], 90 91 [ 512, 'edit_categories', 'Add/Manage Categories', 1, 'blog'], 91 92 [ 16384, 'edit_tags', 'Manage Tags', 1, 'blog'], branches/wheeljack/tmpl/cms/list_asset.tmpl
r841 r843 125 125 <li class="yah"><a href="<TMPL_VAR NAME=SCRIPT_URL>?__mode=list_assets<TMPL_IF NAME=EDIT_BLOG_ID>&blog_id=<TMPL_VAR NAME=EDIT_BLOG_ID></TMPL_IF>"><MT_TRANS phrase="Assets"></a></li> 126 126 <TMPL_IF NAME=EDIT_BLOG_ID> 127 <TMPL_IF NAME=CAN_UPLOAD> 127 128 <li class="special"> 128 129 <img src="<TMPL_VAR NAME=STATIC_URI>images/status_icons/create.gif" alt="<MT_TRANS phrase="Upload New File">" width="9" height="9" /> … … 130 131 <a href="#" onclick="return openDialog(this.form, 'start_upload', '__type=asset&blog_id=<TMPL_VAR NAME=BLOG_ID>&return_args=<TMPL_VAR NAME=RETURN_ARGS ESCAPE=URL>')"><MT_TRANS phrase="Upload New File"></a></li> 131 132 133 </TMPL_IF> 132 134 </TMPL_IF> 133 135 </ul>
