developers/orbit-basic
2
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'development' into desktop

Browse Source
This commit is contained in:
chris committed 2013-03-05 19:07:58 +08:00
2 parents a9bf400fac dc3966be81
commit 27686a5d04
9 files changed
+66 -21
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

vendor/built_in_modules/archive/init.rb
Vendored
+1 -1
View File
@@ -35,7 +35,7 @@ module Archive
head_label_i18n 'archive.archive',:icon_class=>"icons-archive"
available_for [:admin,:guest,:manager,:sub_manager]
active_for_controllers ({:private=>['archive_file_categorys','archive_files'],:public=>['panel/archive/back_end/tags']})
active_for_object_auth ['BulletinCategory']
# active_for_object_auth ['BulletinCategory']
head_link_path "panel_archive_back_end_archive_files_path"
vendor/built_in_modules/gallery/init.rb
Vendored
+1 -1
View File
@@ -44,7 +44,7 @@ module Gallery
head_label_i18n 'gallery.gallery',:icon_class=>"icons-pictures"
available_for [:admin,:guest,:manager,:sub_manager]
active_for_controllers ({:private=>['albums','album_images','gallery_categories','/panel/gallery/back_end/tags']})
active_for_object_auth ['BulletinCategory']
active_for_object_auth ['GalleryCategory']
head_link_path "panel_gallery_back_end_albums_path"