typus 3.0.12 → 3.1.0.rc1
Sign up to get free protection for your applications and to get access to all the features.
- data/Gemfile +10 -16
- data/README.md +7 -10
- data/app/assets/{vendor/typus/vendor/jquery.fancybox-1.3.4/fancybox → images/typus}/blank.gif +0 -0
- data/app/assets/{vendor/typus/vendor/jquery.fancybox-1.3.4/fancybox → images/typus}/fancy_close.png +0 -0
- data/app/assets/{vendor/typus/vendor/jquery.fancybox-1.3.4/fancybox → images/typus}/fancy_loading.png +0 -0
- data/app/assets/{vendor/typus/vendor/jquery.fancybox-1.3.4/fancybox → images/typus}/fancy_nav_left.png +0 -0
- data/app/assets/{vendor/typus/vendor/jquery.fancybox-1.3.4/fancybox → images/typus}/fancy_nav_right.png +0 -0
- data/app/assets/{vendor/typus/vendor/jquery.fancybox-1.3.4/fancybox → images/typus}/fancy_shadow_e.png +0 -0
- data/app/assets/{vendor/typus/vendor/jquery.fancybox-1.3.4/fancybox → images/typus}/fancy_shadow_n.png +0 -0
- data/app/assets/{vendor/typus/vendor/jquery.fancybox-1.3.4/fancybox → images/typus}/fancy_shadow_ne.png +0 -0
- data/app/assets/{vendor/typus/vendor/jquery.fancybox-1.3.4/fancybox → images/typus}/fancy_shadow_nw.png +0 -0
- data/app/assets/{vendor/typus/vendor/jquery.fancybox-1.3.4/fancybox → images/typus}/fancy_shadow_s.png +0 -0
- data/app/assets/{vendor/typus/vendor/jquery.fancybox-1.3.4/fancybox → images/typus}/fancy_shadow_se.png +0 -0
- data/app/assets/{vendor/typus/vendor/jquery.fancybox-1.3.4/fancybox → images/typus}/fancy_shadow_sw.png +0 -0
- data/app/assets/{vendor/typus/vendor/jquery.fancybox-1.3.4/fancybox → images/typus}/fancy_shadow_w.png +0 -0
- data/app/assets/{vendor/typus/vendor/jquery.fancybox-1.3.4/fancybox → images/typus}/fancy_title_left.png +0 -0
- data/app/assets/{vendor/typus/vendor/jquery.fancybox-1.3.4/fancybox → images/typus}/fancy_title_main.png +0 -0
- data/app/assets/{vendor/typus/vendor/jquery.fancybox-1.3.4/fancybox → images/typus}/fancy_title_over.png +0 -0
- data/app/assets/{vendor/typus/vendor/jquery.fancybox-1.3.4/fancybox → images/typus}/fancy_title_right.png +0 -0
- data/app/assets/{vendor/typus/vendor/jquery.fancybox-1.3.4/fancybox → images/typus}/fancybox-x.png +0 -0
- data/app/assets/{vendor/typus/vendor/jquery.fancybox-1.3.4/fancybox → images/typus}/fancybox-y.png +0 -0
- data/app/assets/{vendor/typus/vendor/jquery.fancybox-1.3.4/fancybox → images/typus}/fancybox.png +0 -0
- data/app/assets/javascripts/typus/application.js +7 -0
- data/app/assets/{vendor/typus/javascripts/application.js → javascripts/typus/custom.js} +0 -0
- data/app/assets/{vendor/typus/javascripts → javascripts/typus}/jquery.application.js +6 -8
- data/app/assets/{vendor/typus/javascripts → javascripts/typus}/jquery.rails.autocomplete.js +0 -0
- data/app/assets/{vendor/typus/javascripts → javascripts/typus}/jquery.searchField.js +0 -0
- data/app/assets/stylesheets/typus/application.css +7 -0
- data/app/assets/{vendor/typus/stylesheets/application.css → stylesheets/typus/custom.css} +0 -0
- data/app/assets/stylesheets/typus/pagination.css +17 -0
- data/app/assets/{vendor/typus/stylesheets → stylesheets/typus}/reset.css +0 -0
- data/app/assets/{vendor/typus/stylesheets → stylesheets/typus}/screen.css +2 -27
- data/app/assets/vendor/{typus/vendor/jquery-tokeninput → jquery-tokeninput}/css/token-input-facebook.css +0 -0
- data/app/assets/vendor/{typus/vendor/jquery-tokeninput → jquery-tokeninput}/css/token-input-mac.css +0 -0
- data/app/assets/vendor/{typus/vendor/jquery-tokeninput → jquery-tokeninput}/css/token-input.css +0 -0
- data/app/assets/vendor/{typus/vendor/jquery-tokeninput → jquery-tokeninput}/js/jquery.tokeninput.js +0 -0
- data/app/assets/vendor/{typus/vendor/jquery-ui-1.8.12.custom → jquery-ui-1.8.12.custom}/css/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png +0 -0
- data/app/assets/vendor/{typus/vendor/jquery-ui-1.8.12.custom → jquery-ui-1.8.12.custom}/css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png +0 -0
- data/app/assets/vendor/{typus/vendor/jquery-ui-1.8.12.custom → jquery-ui-1.8.12.custom}/css/ui-lightness/images/ui-bg_flat_10_000000_40x100.png +0 -0
- data/app/assets/vendor/{typus/vendor/jquery-ui-1.8.12.custom → jquery-ui-1.8.12.custom}/css/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png +0 -0
- data/app/assets/vendor/{typus/vendor/jquery-ui-1.8.12.custom → jquery-ui-1.8.12.custom}/css/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png +0 -0
- data/app/assets/vendor/{typus/vendor/jquery-ui-1.8.12.custom → jquery-ui-1.8.12.custom}/css/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png +0 -0
- data/app/assets/vendor/{typus/vendor/jquery-ui-1.8.12.custom → jquery-ui-1.8.12.custom}/css/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png +0 -0
- data/app/assets/vendor/{typus/vendor/jquery-ui-1.8.12.custom → jquery-ui-1.8.12.custom}/css/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png +0 -0
- data/app/assets/vendor/{typus/vendor/jquery-ui-1.8.12.custom → jquery-ui-1.8.12.custom}/css/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png +0 -0
- data/app/assets/vendor/{typus/vendor/jquery-ui-1.8.12.custom → jquery-ui-1.8.12.custom}/css/ui-lightness/images/ui-icons_222222_256x240.png +0 -0
- data/app/assets/vendor/{typus/vendor/jquery-ui-1.8.12.custom → jquery-ui-1.8.12.custom}/css/ui-lightness/images/ui-icons_228ef1_256x240.png +0 -0
- data/app/assets/vendor/{typus/vendor/jquery-ui-1.8.12.custom → jquery-ui-1.8.12.custom}/css/ui-lightness/images/ui-icons_ef8c08_256x240.png +0 -0
- data/app/assets/vendor/{typus/vendor/jquery-ui-1.8.12.custom → jquery-ui-1.8.12.custom}/css/ui-lightness/images/ui-icons_ffd27a_256x240.png +0 -0
- data/app/assets/vendor/{typus/vendor/jquery-ui-1.8.12.custom → jquery-ui-1.8.12.custom}/css/ui-lightness/images/ui-icons_ffffff_256x240.png +0 -0
- data/app/assets/vendor/{typus/vendor/jquery-ui-1.8.12.custom → jquery-ui-1.8.12.custom}/css/ui-lightness/jquery-ui-1.8.12.custom.css +0 -0
- data/app/assets/vendor/{typus/vendor/jquery-ui-1.8.12.custom → jquery-ui-1.8.12.custom}/index.html +0 -0
- data/app/assets/vendor/{typus/vendor/jquery-ui-1.8.12.custom → jquery-ui-1.8.12.custom}/js/jquery-ui-1.8.12.custom.min.js +0 -0
- data/app/assets/vendor/jquery.fancybox-1.3.4/fancybox/blank.gif +0 -0
- data/app/assets/vendor/jquery.fancybox-1.3.4/fancybox/fancy_close.png +0 -0
- data/app/assets/vendor/jquery.fancybox-1.3.4/fancybox/fancy_loading.png +0 -0
- data/app/assets/vendor/jquery.fancybox-1.3.4/fancybox/fancy_nav_left.png +0 -0
- data/app/assets/vendor/jquery.fancybox-1.3.4/fancybox/fancy_nav_right.png +0 -0
- data/app/assets/vendor/jquery.fancybox-1.3.4/fancybox/fancy_shadow_e.png +0 -0
- data/app/assets/vendor/jquery.fancybox-1.3.4/fancybox/fancy_shadow_n.png +0 -0
- data/app/assets/vendor/jquery.fancybox-1.3.4/fancybox/fancy_shadow_ne.png +0 -0
- data/app/assets/vendor/jquery.fancybox-1.3.4/fancybox/fancy_shadow_nw.png +0 -0
- data/app/assets/vendor/jquery.fancybox-1.3.4/fancybox/fancy_shadow_s.png +0 -0
- data/app/assets/vendor/jquery.fancybox-1.3.4/fancybox/fancy_shadow_se.png +0 -0
- data/app/assets/vendor/jquery.fancybox-1.3.4/fancybox/fancy_shadow_sw.png +0 -0
- data/app/assets/vendor/jquery.fancybox-1.3.4/fancybox/fancy_shadow_w.png +0 -0
- data/app/assets/vendor/jquery.fancybox-1.3.4/fancybox/fancy_title_left.png +0 -0
- data/app/assets/vendor/jquery.fancybox-1.3.4/fancybox/fancy_title_main.png +0 -0
- data/app/assets/vendor/jquery.fancybox-1.3.4/fancybox/fancy_title_over.png +0 -0
- data/app/assets/vendor/jquery.fancybox-1.3.4/fancybox/fancy_title_right.png +0 -0
- data/app/assets/vendor/jquery.fancybox-1.3.4/fancybox/fancybox-x.png +0 -0
- data/app/assets/vendor/jquery.fancybox-1.3.4/fancybox/fancybox-y.png +0 -0
- data/app/assets/vendor/jquery.fancybox-1.3.4/fancybox/fancybox.png +0 -0
- data/app/assets/vendor/{typus/vendor/jquery.fancybox-1.3.4 → jquery.fancybox-1.3.4}/fancybox/jquery.easing-1.3.pack.js +0 -0
- data/app/assets/vendor/{typus/vendor/jquery.fancybox-1.3.4 → jquery.fancybox-1.3.4}/fancybox/jquery.fancybox-1.3.4.css +0 -0
- data/app/assets/vendor/{typus/vendor/jquery.fancybox-1.3.4 → jquery.fancybox-1.3.4}/fancybox/jquery.fancybox-1.3.4.js +0 -0
- data/app/assets/vendor/{typus/vendor/jquery.fancybox-1.3.4 → jquery.fancybox-1.3.4}/fancybox/jquery.fancybox-1.3.4.pack.js +0 -0
- data/app/assets/vendor/{typus/vendor/jquery.fancybox-1.3.4 → jquery.fancybox-1.3.4}/fancybox/jquery.mousewheel-3.0.4.pack.js +0 -0
- data/app/controllers/admin/base_controller.rb +5 -3
- data/app/controllers/admin/resources_controller.rb +3 -7
- data/app/controllers/admin/session_controller.rb +2 -5
- data/app/helpers/admin/base_helper.rb +1 -1
- data/app/helpers/admin/display_helper.rb +0 -2
- data/app/helpers/admin/file_preview_helper.rb +10 -10
- data/app/helpers/admin/filters_helper.rb +1 -1
- data/app/helpers/admin/relationships_helper.rb +20 -21
- data/app/helpers/admin/sidebar_helper.rb +1 -8
- data/app/helpers/admin/table_helper.rb +8 -8
- data/app/views/admin/dashboard/_applications.html.erb +1 -1
- data/app/views/admin/helpers/base/_apps.html.erb +2 -7
- data/app/views/admin/helpers/base/_header.html.erb +1 -1
- data/app/views/admin/helpers/resources/_errors.html.erb +1 -1
- data/app/views/admin/helpers/sidebar/_sidebar.html.erb +1 -1
- data/app/views/admin/resources/index.html.erb +4 -4
- data/app/views/admin/shared/_head.html.erb +2 -17
- data/app/views/admin/templates/_belongs_to_with_autocomplete.html.erb +1 -1
- data/app/views/admin/templates/_has_n.html.erb +3 -3
- data/app/views/admin/templates/_has_one.html.erb +2 -2
- data/app/views/admin/templates/_selector.html.erb +7 -2
- data/config/locales/typus.ca.yml +1 -1
- data/config/locales/typus.de.models.yml +5 -6
- data/config/locales/typus.de.yml +36 -39
- data/config/locales/typus.el.yml +1 -1
- data/config/locales/typus.es.yml +1 -1
- data/config/locales/typus.fr.yml +1 -2
- data/config/locales/typus.hu.yml +1 -1
- data/config/locales/typus.locale.yml.template +1 -1
- data/config/locales/typus.pt-BR.yml +1 -1
- data/config/locales/typus.ru.yml +1 -1
- data/config/locales/typus.zh-CN.yml +1 -1
- data/config/routes.rb +2 -2
- data/lib/generators/templates/config/initializers/typus.rb +1 -3
- data/lib/generators/templates/config/typus/README +0 -1
- data/lib/generators/typus/migration_generator.rb +0 -3
- data/lib/support/active_record.rb +7 -9
- data/lib/typus.rb +7 -8
- data/lib/typus/authentication/session.rb +3 -2
- data/lib/typus/controller/associations.rb +2 -2
- data/lib/typus/controller/format.rb +3 -3
- data/lib/typus/engine.rb +2 -6
- data/lib/typus/i18n.rb +4 -0
- data/lib/typus/orm/active_record/admin_user_v1.rb +13 -12
- data/lib/typus/orm/active_record/admin_user_v2.rb +31 -1
- data/lib/typus/orm/active_record/class_methods.rb +1 -0
- data/lib/typus/orm/base.rb +0 -4
- data/lib/typus/regex.rb +2 -0
- data/lib/typus/version.rb +1 -1
- data/test/app/controllers/admin/account_controller_test.rb +94 -0
- data/test/app/controllers/admin/assets_controller_test.rb +156 -0
- data/test/app/controllers/admin/base_controller_test.rb +25 -0
- data/test/app/controllers/admin/birds_controller_test.rb +33 -0
- data/test/app/controllers/admin/cases_controller_test.rb +20 -0
- data/test/app/controllers/admin/categories_controller_test.rb +134 -0
- data/test/app/controllers/admin/comments_controller_test.rb +71 -0
- data/test/app/controllers/admin/dashboard_controller_test.rb +150 -0
- data/test/app/controllers/admin/image_holders_controller_test.rb +74 -0
- data/test/app/controllers/admin/invoices_controller_test.rb +77 -0
- data/test/app/controllers/admin/orders_controller_test.rb +17 -0
- data/test/app/controllers/admin/pages_controller_test.rb +33 -0
- data/test/app/controllers/admin/posts_controller_test.rb +764 -0
- data/test/app/controllers/admin/projects_controller_test.rb +48 -0
- data/test/app/controllers/admin/session_controller_test.rb +91 -0
- data/test/app/controllers/admin/status_controller_test.rb +33 -0
- data/test/app/controllers/admin/typus_users_controller_test.rb +154 -0
- data/test/app/controllers/admin/users_controller_test.rb +101 -0
- data/test/app/controllers/admin/views_controller_test.rb +36 -0
- data/test/app/helpers/admin/base_helper_test.rb +75 -0
- data/test/app/helpers/admin/dashboard_helper_test.rb +28 -0
- data/test/app/helpers/admin/file_preview_helper_test.rb +90 -0
- data/test/app/helpers/admin/filters_helper_test.rb +166 -0
- data/test/app/helpers/admin/form_helper_test.rb +126 -0
- data/test/app/helpers/admin/list_helper_test.rb +76 -0
- data/test/app/helpers/admin/relationships_helper_test.rb +19 -0
- data/test/app/helpers/admin/resources_helper_test.rb +46 -0
- data/test/app/helpers/admin/search_helper_test.rb +56 -0
- data/test/app/helpers/admin/sidebar_helper_test.rb +20 -0
- data/test/app/helpers/admin/table_helper_test.rb +245 -0
- data/test/app/mailers/admin/mailer_test.rb +20 -0
- data/test/app/models/admin_user_test.rb +22 -0
- data/test/app/models/typus_user_roles_test.rb +125 -0
- data/test/app/models/typus_user_test.rb +145 -0
- data/test/app/models/user_test.rb +38 -0
- data/test/config/routes_test.rb +30 -0
- data/test/factories.rb +134 -0
- data/test/fixtures/config/broken/application.yml +68 -0
- data/test/fixtures/config/broken/application_roles.yml +20 -0
- data/test/fixtures/config/broken/empty.yml +0 -0
- data/test/fixtures/config/broken/empty_roles.yml +0 -0
- data/test/fixtures/config/broken/undefined.yml +3 -0
- data/test/fixtures/config/broken/undefined_roles.yml +6 -0
- data/test/fixtures/config/default/typus.yml +13 -0
- data/test/fixtures/config/default/typus_roles.yml +2 -0
- data/test/fixtures/config/empty/empty_01.yml +0 -0
- data/test/fixtures/config/empty/empty_01_roles.yml +0 -0
- data/test/fixtures/config/empty/empty_02.yml +0 -0
- data/test/fixtures/config/empty/empty_02_roles.yml +0 -0
- data/test/fixtures/config/locales/es.yml +10 -0
- data/test/fixtures/config/namespaced/application.yml +5 -0
- data/test/fixtures/config/namespaced/application_roles.yml +2 -0
- data/test/fixtures/config/ordered/001_roles.yml +2 -0
- data/test/fixtures/config/ordered/002_roles.yml +2 -0
- data/test/fixtures/config/unordered/app_one_roles.yml +2 -0
- data/test/fixtures/config/unordered/app_two_roles.yml +2 -0
- data/test/fixtures/rails_app/.gitignore +4 -0
- data/test/fixtures/rails_app/Capfile +7 -0
- data/test/fixtures/rails_app/README +256 -0
- data/test/fixtures/rails_app/Rakefile +7 -0
- data/test/fixtures/rails_app/app/controllers/admin/admin_users_controller.rb +2 -0
- data/test/fixtures/rails_app/app/controllers/admin/animals_controller.rb +2 -0
- data/test/fixtures/rails_app/app/controllers/admin/article/entries_controller.rb +2 -0
- data/test/fixtures/rails_app/app/controllers/admin/assets_controller.rb +51 -0
- data/test/fixtures/rails_app/app/controllers/admin/birds_controller.rb +2 -0
- data/test/fixtures/rails_app/app/controllers/admin/cases_controller.rb +2 -0
- data/test/fixtures/rails_app/app/controllers/admin/categories_controller.rb +2 -0
- data/test/fixtures/rails_app/app/controllers/admin/comments_controller.rb +2 -0
- data/test/fixtures/rails_app/app/controllers/admin/dogs_controller.rb +2 -0
- data/test/fixtures/rails_app/app/controllers/admin/entries_controller.rb +2 -0
- data/test/fixtures/rails_app/app/controllers/admin/hits_controller.rb +37 -0
- data/test/fixtures/rails_app/app/controllers/admin/image_holders_controller.rb +2 -0
- data/test/fixtures/rails_app/app/controllers/admin/invoices_controller.rb +2 -0
- data/test/fixtures/rails_app/app/controllers/admin/orders_controller.rb +2 -0
- data/test/fixtures/rails_app/app/controllers/admin/pages_controller.rb +7 -0
- data/test/fixtures/rails_app/app/controllers/admin/posts_controller.rb +2 -0
- data/test/fixtures/rails_app/app/controllers/admin/project_collaborators_controller.rb +2 -0
- data/test/fixtures/rails_app/app/controllers/admin/projects_controller.rb +2 -0
- data/test/fixtures/rails_app/app/controllers/admin/status_controller.rb +2 -0
- data/test/fixtures/rails_app/app/controllers/admin/typus_users_controller.rb +2 -0
- data/test/fixtures/rails_app/app/controllers/admin/users_controller.rb +2 -0
- data/test/fixtures/rails_app/app/controllers/admin/views_controller.rb +8 -0
- data/test/fixtures/rails_app/app/controllers/admin/watch_dog_controller.rb +2 -0
- data/test/fixtures/rails_app/app/controllers/application_controller.rb +3 -0
- data/test/fixtures/rails_app/app/helpers/application_helper.rb +2 -0
- data/test/fixtures/rails_app/app/helpers/form_helper.rb +3 -0
- data/test/fixtures/rails_app/app/models/admin_user.rb +7 -0
- data/test/fixtures/rails_app/app/models/animal.rb +21 -0
- data/test/fixtures/rails_app/app/models/article.rb +10 -0
- data/test/fixtures/rails_app/app/models/article/entry.rb +2 -0
- data/test/fixtures/rails_app/app/models/asset.rb +45 -0
- data/test/fixtures/rails_app/app/models/bird.rb +2 -0
- data/test/fixtures/rails_app/app/models/case.rb +2 -0
- data/test/fixtures/rails_app/app/models/category.rb +31 -0
- data/test/fixtures/rails_app/app/models/comment.rb +17 -0
- data/test/fixtures/rails_app/app/models/delayed/task.rb +5 -0
- data/test/fixtures/rails_app/app/models/dog.rb +2 -0
- data/test/fixtures/rails_app/app/models/entry.rb +23 -0
- data/test/fixtures/rails_app/app/models/hit.rb +27 -0
- data/test/fixtures/rails_app/app/models/image_holder.rb +21 -0
- data/test/fixtures/rails_app/app/models/invoice.rb +10 -0
- data/test/fixtures/rails_app/app/models/order.rb +9 -0
- data/test/fixtures/rails_app/app/models/page.rb +24 -0
- data/test/fixtures/rails_app/app/models/post.rb +32 -0
- data/test/fixtures/rails_app/app/models/project.rb +17 -0
- data/test/fixtures/rails_app/app/models/project_collaborator.rb +16 -0
- data/test/fixtures/rails_app/app/models/site.rb +16 -0
- data/test/fixtures/rails_app/app/models/typus_user.rb +15 -0
- data/test/fixtures/rails_app/app/models/user.rb +16 -0
- data/test/fixtures/rails_app/app/models/view.rb +19 -0
- data/test/fixtures/rails_app/app/views/admin/assets/_index.html.erb +3 -0
- data/test/fixtures/rails_app/app/views/admin/cases/_index.html.erb +3 -0
- data/test/fixtures/rails_app/app/views/admin/categories/_index.html.erb +3 -0
- data/test/fixtures/rails_app/app/views/admin/dashboard/_sidebar.html.erb +11 -0
- data/test/fixtures/rails_app/app/views/admin/entries/_index.html.erb +3 -0
- data/test/fixtures/rails_app/app/views/admin/hits/_edit.html.erb +7 -0
- data/test/fixtures/rails_app/app/views/admin/hits/_index.html.erb +3 -0
- data/test/fixtures/rails_app/app/views/admin/hits/index.html.erb +28 -0
- data/test/fixtures/rails_app/app/views/admin/pages/_index.html.erb +3 -0
- data/test/fixtures/rails_app/app/views/admin/posts/_edit.html.erb +1 -0
- data/test/fixtures/rails_app/app/views/admin/posts/_index.html.erb +5 -0
- data/test/fixtures/rails_app/app/views/admin/posts/_new.html.erb +1 -0
- data/test/fixtures/rails_app/app/views/admin/posts/_show.html.erb +1 -0
- data/test/fixtures/rails_app/app/views/admin/resources/_sidebar.html.erb +1 -0
- data/test/fixtures/rails_app/app/views/admin/status/index.html.erb +9 -0
- data/test/fixtures/rails_app/app/views/admin/templates/_datepicker.html.erb +1 -0
- data/test/fixtures/rails_app/app/views/admin/watch_dog/index.html.erb +9 -0
- data/test/fixtures/rails_app/config.ru +4 -0
- data/test/fixtures/rails_app/config/application.rb +55 -0
- data/test/fixtures/rails_app/config/boot.rb +6 -0
- data/test/fixtures/rails_app/config/database.yml +42 -0
- data/test/fixtures/rails_app/config/deploy.rb +36 -0
- data/test/fixtures/rails_app/config/environment.rb +5 -0
- data/test/fixtures/rails_app/config/environments/development.rb +38 -0
- data/test/fixtures/rails_app/config/environments/production.rb +57 -0
- data/test/fixtures/rails_app/config/environments/test.rb +44 -0
- data/test/fixtures/rails_app/config/initializers/backtrace_silencers.rb +7 -0
- data/test/fixtures/rails_app/config/initializers/dragonfly.rb +1 -0
- data/test/fixtures/rails_app/config/initializers/inflections.rb +11 -0
- data/test/fixtures/rails_app/config/initializers/mime_types.rb +5 -0
- data/test/fixtures/rails_app/config/initializers/secret_token.rb +7 -0
- data/test/fixtures/rails_app/config/initializers/session_store.rb +8 -0
- data/test/fixtures/rails_app/config/initializers/wrap_parameters.rb +12 -0
- data/test/fixtures/rails_app/config/locales/en.yml +5 -0
- data/test/fixtures/rails_app/config/mongoid.yml +20 -0
- data/test/fixtures/rails_app/config/routes.rb +61 -0
- data/test/fixtures/rails_app/config/typus/README +68 -0
- data/test/fixtures/rails_app/config/typus/admin.yml +16 -0
- data/test/fixtures/rails_app/config/typus/admin_roles.yml +3 -0
- data/test/fixtures/rails_app/config/typus/crud_basic.yml +10 -0
- data/test/fixtures/rails_app/config/typus/crud_basic_roles.yml +2 -0
- data/test/fixtures/rails_app/config/typus/crud_extended.yml +66 -0
- data/test/fixtures/rails_app/config/typus/crud_extended_roles.yml +18 -0
- data/test/fixtures/rails_app/config/typus/crud_namespaced.yml +10 -0
- data/test/fixtures/rails_app/config/typus/crud_namespaced_roles.yml +2 -0
- data/test/fixtures/rails_app/config/typus/has_many.yml +0 -0
- data/test/fixtures/rails_app/config/typus/has_many_roles.yml +0 -0
- data/test/fixtures/rails_app/config/typus/has_many_through.yml +23 -0
- data/test/fixtures/rails_app/config/typus/has_many_through_roles.yml +4 -0
- data/test/fixtures/rails_app/config/typus/has_one.yml +12 -0
- data/test/fixtures/rails_app/config/typus/has_one_roles.yml +3 -0
- data/test/fixtures/rails_app/config/typus/mongo_db.yml +4 -0
- data/test/fixtures/rails_app/config/typus/mongo_db_roles.yml +2 -0
- data/test/fixtures/rails_app/config/typus/polymorphic.yml +17 -0
- data/test/fixtures/rails_app/config/typus/polymorphic_roles.yml +5 -0
- data/test/fixtures/rails_app/config/typus/resource_roles.yml +7 -0
- data/test/fixtures/rails_app/config/typus/sti.yml +5 -0
- data/test/fixtures/rails_app/config/typus/sti_roles.yml +2 -0
- data/test/fixtures/rails_app/config/typus/unknown.yml +3 -0
- data/test/fixtures/rails_app/config/typus/unknown_roles.yml +5 -0
- data/test/fixtures/rails_app/db/.gitkeep +0 -0
- data/test/fixtures/rails_app/db/schema.rb +209 -0
- data/test/fixtures/rails_app/db/seeds.rb +58 -0
- data/test/fixtures/rails_app/db/seeds/assets/000.jpg +0 -0
- data/test/fixtures/rails_app/db/seeds/assets/001.jpg +0 -0
- data/test/fixtures/rails_app/db/seeds/assets/002.jpg +0 -0
- data/test/fixtures/rails_app/db/seeds/assets/003.jpg +0 -0
- data/test/fixtures/rails_app/db/seeds/assets/004.jpg +0 -0
- data/test/fixtures/rails_app/public/404.html +26 -0
- data/test/fixtures/rails_app/public/422.html +26 -0
- data/test/fixtures/rails_app/public/500.html +26 -0
- data/test/fixtures/rails_app/public/favicon.ico +0 -0
- data/test/fixtures/rails_app/public/images/rails.png +0 -0
- data/test/fixtures/rails_app/public/robots.txt +5 -0
- data/test/fixtures/rails_app/public/stylesheets/.gitkeep +0 -0
- data/test/fixtures/rails_app/script/rails +6 -0
- data/test/lib/support/active_record_test.rb +139 -0
- data/test/lib/support/fake_user_test.rb +63 -0
- data/test/lib/support/hash_test.rb +25 -0
- data/test/lib/support/object_test.rb +10 -0
- data/test/lib/support/string_test.rb +80 -0
- data/test/lib/typus/configuration_test.rb +48 -0
- data/test/lib/typus/controller/actions_test.rb +141 -0
- data/test/lib/typus/controller/associations_test.rb +7 -0
- data/test/lib/typus/controller/autocomplete_test.rb +7 -0
- data/test/lib/typus/controller/filters_test.rb +73 -0
- data/test/lib/typus/controller/format_test.rb +7 -0
- data/test/lib/typus/i18n_test.rb +13 -0
- data/test/lib/typus/orm/active_record/class_methods_test.rb +381 -0
- data/test/lib/typus/orm/active_record/search_test.rb +328 -0
- data/test/lib/typus/regex_test.rb +62 -0
- data/test/lib/typus/resources_test.rb +41 -0
- data/test/lib/typus_test.rb +132 -0
- data/test/test_helper.rb +41 -0
- data/typus.gemspec +3 -10
- metadata +525 -137
- data/.gitmodules +0 -3
- data/app/assets/vendor/typus/javascripts/jquery.rails.js +0 -158
- data/app/assets/vendor/typus/vendor/jquery-ui-1.8.12.custom/js/jquery-1.5.1.min.js +0 -16
- data/app/views/admin/templates/_text_with_ckeditor.html.erb +0 -13
- data/config/locales/typus.pt-PT.models.yml +0 -17
- data/config/locales/typus.pt-PT.yml +0 -83
@@ -0,0 +1,48 @@
|
|
1
|
+
require "test_helper"
|
2
|
+
|
3
|
+
=begin
|
4
|
+
|
5
|
+
What's being tested here?
|
6
|
+
|
7
|
+
- HasManyThrough
|
8
|
+
|
9
|
+
=end
|
10
|
+
|
11
|
+
class Admin::ProjectsControllerTest < ActionController::TestCase
|
12
|
+
|
13
|
+
setup do
|
14
|
+
admin_sign_in
|
15
|
+
@project = Factory(:project)
|
16
|
+
@user = @project.user
|
17
|
+
end
|
18
|
+
|
19
|
+
should_eventually "be able to destroy items" do
|
20
|
+
get :destroy, :id => @user.id, :method => :delete
|
21
|
+
assert_response :redirect
|
22
|
+
assert_equal "User successfully removed.", flash[:notice]
|
23
|
+
assert_redirected_to :action => :index
|
24
|
+
end
|
25
|
+
|
26
|
+
context "relate colaborators to project" do
|
27
|
+
|
28
|
+
setup do
|
29
|
+
@request.env['HTTP_REFERER'] = "/admin/projects/edit/#{@project.id}"
|
30
|
+
end
|
31
|
+
|
32
|
+
should "work" do
|
33
|
+
user = Factory(:user)
|
34
|
+
|
35
|
+
assert_difference('@project.collaborators.count') do
|
36
|
+
post :relate, :id => @project.id, :related => { :model => 'User', :id => user.id, :association_name => 'collaborators' }
|
37
|
+
end
|
38
|
+
|
39
|
+
assert_response :redirect
|
40
|
+
assert_redirected_to @request.env['HTTP_REFERER']
|
41
|
+
assert_equal "Project successfully updated.", flash[:notice]
|
42
|
+
end
|
43
|
+
|
44
|
+
should_eventually "not allow to add collaborator twice"
|
45
|
+
|
46
|
+
end
|
47
|
+
|
48
|
+
end
|
@@ -0,0 +1,91 @@
|
|
1
|
+
require "test_helper"
|
2
|
+
|
3
|
+
=begin
|
4
|
+
|
5
|
+
What's being tested here?
|
6
|
+
|
7
|
+
- Sessions
|
8
|
+
|
9
|
+
=end
|
10
|
+
|
11
|
+
class Admin::SessionControllerTest < ActionController::TestCase
|
12
|
+
|
13
|
+
context "Setup" do
|
14
|
+
|
15
|
+
should "redirect_to_new_admin_account_when_no_admin_users" do
|
16
|
+
get :new
|
17
|
+
assert_response :redirect
|
18
|
+
assert_redirected_to new_admin_account_path
|
19
|
+
end
|
20
|
+
|
21
|
+
end
|
22
|
+
|
23
|
+
context "With users" do
|
24
|
+
|
25
|
+
setup do
|
26
|
+
@typus_user = Factory(:typus_user)
|
27
|
+
end
|
28
|
+
|
29
|
+
should "render new" do
|
30
|
+
get :new
|
31
|
+
assert_response :success
|
32
|
+
end
|
33
|
+
|
34
|
+
should "render new and verify title and header" do
|
35
|
+
get :new
|
36
|
+
assert_select "title", "Typus — Sign in"
|
37
|
+
assert_select "h1", "Typus"
|
38
|
+
end
|
39
|
+
|
40
|
+
should "render session layout" do
|
41
|
+
get :new
|
42
|
+
assert_template "new"
|
43
|
+
assert_template "layouts/admin/session"
|
44
|
+
end
|
45
|
+
|
46
|
+
should "verify_typus_sign_in_layout_does_not_include_recover_password_link" do
|
47
|
+
get :new
|
48
|
+
assert !@response.body.include?("Recover password")
|
49
|
+
end
|
50
|
+
|
51
|
+
should "verify new includes recover_password_link when mailer_sender is set" do
|
52
|
+
Typus.expects(:mailer_sender).returns("john@example.com")
|
53
|
+
get :new
|
54
|
+
assert @response.body.include?("Recover password")
|
55
|
+
end
|
56
|
+
|
57
|
+
should "not_create_session_for_invalid_users" do
|
58
|
+
post :create, { :typus_user => { :email => "john@example.com", :password => "XXXXXXXX" } }
|
59
|
+
assert_response :redirect
|
60
|
+
assert_redirected_to new_admin_session_path
|
61
|
+
end
|
62
|
+
|
63
|
+
should "not_create_session_for_a_disabled_user" do
|
64
|
+
typus_user = Factory(:typus_user, :email => "disabled@example.com", :status => false)
|
65
|
+
|
66
|
+
post :create, { :typus_user => { :email => typus_user.email, :password => "12345678" } }
|
67
|
+
|
68
|
+
assert_nil @request.session[:typus_user_id]
|
69
|
+
assert_response :redirect
|
70
|
+
assert_redirected_to new_admin_session_path
|
71
|
+
end
|
72
|
+
|
73
|
+
should "create_session_for_an_enabled_user" do
|
74
|
+
post :create, { :typus_user => { :email => @typus_user.email, :password => "12345678" } }
|
75
|
+
assert_equal @typus_user.id, @request.session[:typus_user_id]
|
76
|
+
assert_response :redirect
|
77
|
+
assert_redirected_to admin_dashboard_path
|
78
|
+
end
|
79
|
+
|
80
|
+
should "destroy" do
|
81
|
+
delete :destroy
|
82
|
+
|
83
|
+
assert_nil @request.session[:typus_user_id]
|
84
|
+
assert_response :redirect
|
85
|
+
assert_redirected_to new_admin_session_path
|
86
|
+
assert flash.empty?
|
87
|
+
end
|
88
|
+
|
89
|
+
end
|
90
|
+
|
91
|
+
end
|
@@ -0,0 +1,33 @@
|
|
1
|
+
require "test_helper"
|
2
|
+
|
3
|
+
=begin
|
4
|
+
|
5
|
+
What's being tested here?
|
6
|
+
|
7
|
+
- Resource controller (which is not associated with a model).
|
8
|
+
|
9
|
+
=end
|
10
|
+
|
11
|
+
class Admin::StatusControllerTest < ActionController::TestCase
|
12
|
+
|
13
|
+
test "admin has access" do
|
14
|
+
admin_sign_in
|
15
|
+
get :index
|
16
|
+
assert_response :success
|
17
|
+
assert_template 'index'
|
18
|
+
end
|
19
|
+
|
20
|
+
test "editor should not have access" do
|
21
|
+
editor_sign_in
|
22
|
+
get :index
|
23
|
+
assert_response :unprocessable_entity
|
24
|
+
end
|
25
|
+
|
26
|
+
test "not logged in user is redirected to new_admin_session_path" do
|
27
|
+
reset_session
|
28
|
+
get :index
|
29
|
+
assert_response :redirect
|
30
|
+
assert_redirected_to new_admin_session_path # (:back_to => '/admin/status')
|
31
|
+
end
|
32
|
+
|
33
|
+
end
|
@@ -0,0 +1,154 @@
|
|
1
|
+
require "test_helper"
|
2
|
+
|
3
|
+
=begin
|
4
|
+
|
5
|
+
What's being tested here?
|
6
|
+
|
7
|
+
- Stuff related to Admin users. (a.k.a. Profile Stuff)
|
8
|
+
|
9
|
+
=end
|
10
|
+
|
11
|
+
class Admin::TypusUsersControllerTest < ActionController::TestCase
|
12
|
+
|
13
|
+
context "Admin" do
|
14
|
+
|
15
|
+
setup do
|
16
|
+
admin_sign_in
|
17
|
+
@typus_user_editor = Factory(:typus_user, :email => "editor@example.com", :role => "editor")
|
18
|
+
@request.env['HTTP_REFERER'] = '/admin/typus_users'
|
19
|
+
end
|
20
|
+
|
21
|
+
should "be able to render new" do
|
22
|
+
get :new
|
23
|
+
assert_response :success
|
24
|
+
end
|
25
|
+
|
26
|
+
should "not be able to toogle his status" do
|
27
|
+
get :toggle, { :id => @typus_user.id, :field => 'status' }
|
28
|
+
assert_response :unprocessable_entity
|
29
|
+
end
|
30
|
+
|
31
|
+
should "be able to toggle other users status" do
|
32
|
+
get :toggle, { :id => @typus_user_editor.id, :field => 'status' }
|
33
|
+
assert_response :redirect
|
34
|
+
assert_redirected_to @request.env['HTTP_REFERER']
|
35
|
+
assert_equal "Typus user successfully updated.", flash[:notice]
|
36
|
+
end
|
37
|
+
|
38
|
+
should "not be able to destroy himself" do
|
39
|
+
delete :destroy, :id => @typus_user.id
|
40
|
+
assert_response :unprocessable_entity
|
41
|
+
end
|
42
|
+
|
43
|
+
should "be able to destroy other users" do
|
44
|
+
assert_difference('TypusUser.count', -1) do
|
45
|
+
delete :destroy, :id => @typus_user_editor.id
|
46
|
+
end
|
47
|
+
|
48
|
+
assert_response :redirect
|
49
|
+
assert_redirected_to @request.env['HTTP_REFERER']
|
50
|
+
assert_equal "Typus user successfully removed.", flash[:notice]
|
51
|
+
end
|
52
|
+
|
53
|
+
should "not be able to change his role" do
|
54
|
+
post :update, :id => @typus_user.id, :typus_user => { :role => 'editor' }
|
55
|
+
assert_response :unprocessable_entity
|
56
|
+
end
|
57
|
+
|
58
|
+
should "be able to update other users role" do
|
59
|
+
post :update, :id => @typus_user_editor.id, :typus_user => { :role => 'admin' }
|
60
|
+
assert_response :redirect
|
61
|
+
assert_redirected_to "/admin/typus_users/edit/#{@typus_user_editor.id}"
|
62
|
+
assert_equal "Typus user successfully updated.", flash[:notice]
|
63
|
+
end
|
64
|
+
|
65
|
+
end
|
66
|
+
|
67
|
+
context "Editor" do
|
68
|
+
|
69
|
+
setup do
|
70
|
+
editor_sign_in
|
71
|
+
@request.env['HTTP_REFERER'] = '/admin/typus_users'
|
72
|
+
end
|
73
|
+
|
74
|
+
should "not be able to create typus_users" do
|
75
|
+
get :new
|
76
|
+
assert_response :unprocessable_entity
|
77
|
+
end
|
78
|
+
|
79
|
+
should "be able to edit his profile" do
|
80
|
+
get :edit, :id => @typus_user.id
|
81
|
+
assert_response :success
|
82
|
+
end
|
83
|
+
|
84
|
+
should "be able to update his profile" do
|
85
|
+
post :update, :id => @typus_user.id, :typus_user => { :role => 'editor' }
|
86
|
+
assert_response :redirect
|
87
|
+
assert_redirected_to "/admin/typus_users/edit/#{@typus_user.id}"
|
88
|
+
assert_equal "Typus user successfully updated.", flash[:notice]
|
89
|
+
end
|
90
|
+
|
91
|
+
should "not be able to change his role" do
|
92
|
+
post :update, :id => @typus_user.id, :typus_user => { :role => 'admin' }
|
93
|
+
assert_response :unprocessable_entity
|
94
|
+
end
|
95
|
+
|
96
|
+
should "not be able to destroy his profile" do
|
97
|
+
delete :destroy, :id => @typus_user.id
|
98
|
+
assert_response :unprocessable_entity
|
99
|
+
end
|
100
|
+
|
101
|
+
should "not be able to toggle his status" do
|
102
|
+
get :toggle, { :id => @typus_user.id, :field => 'status' }
|
103
|
+
assert_response :unprocessable_entity
|
104
|
+
end
|
105
|
+
|
106
|
+
should "not be able to edit other profiles" do
|
107
|
+
get :edit, :id => Factory(:typus_user).id
|
108
|
+
assert_response :unprocessable_entity
|
109
|
+
end
|
110
|
+
|
111
|
+
should "not be able to update other profiles" do
|
112
|
+
post :update, :id => Factory(:typus_user).id, :typus_user => { :role => 'admin' }
|
113
|
+
assert_response :unprocessable_entity
|
114
|
+
end
|
115
|
+
|
116
|
+
should "not be able to destroy other profiles" do
|
117
|
+
delete :destroy, :id => Factory(:typus_user).id
|
118
|
+
assert_response :unprocessable_entity
|
119
|
+
end
|
120
|
+
|
121
|
+
should "not be able to toggle other profiles status" do
|
122
|
+
get :toggle, :id => Factory(:typus_user).id, :field => 'status'
|
123
|
+
assert_response :unprocessable_entity
|
124
|
+
end
|
125
|
+
|
126
|
+
end
|
127
|
+
|
128
|
+
##
|
129
|
+
# Designer doesn't have TypusUser permissions BUT can update his profile.
|
130
|
+
#
|
131
|
+
|
132
|
+
context "Designer" do
|
133
|
+
|
134
|
+
setup do
|
135
|
+
designer_sign_in
|
136
|
+
end
|
137
|
+
|
138
|
+
should "be able to edit his profile" do
|
139
|
+
get :edit, :id => @typus_user.id
|
140
|
+
assert_response :success
|
141
|
+
end
|
142
|
+
|
143
|
+
should "be able to update his profile" do
|
144
|
+
post :update, :id => @typus_user.id, :typus_user => { :role => 'designer', :email => 'designer@withafancydomain.com' }
|
145
|
+
|
146
|
+
assert_response :redirect
|
147
|
+
assert_redirected_to "/admin/typus_users/edit/#{@typus_user.id}"
|
148
|
+
assert_equal "Typus user successfully updated.", flash[:notice]
|
149
|
+
assert_equal "designer@withafancydomain.com", assigns(:item).email
|
150
|
+
end
|
151
|
+
|
152
|
+
end
|
153
|
+
|
154
|
+
end
|
@@ -0,0 +1,101 @@
|
|
1
|
+
require "test_helper"
|
2
|
+
|
3
|
+
=begin
|
4
|
+
|
5
|
+
What's being tested here?
|
6
|
+
|
7
|
+
- HasManyThrough
|
8
|
+
|
9
|
+
=end
|
10
|
+
|
11
|
+
class Admin::UsersControllerTest < ActionController::TestCase
|
12
|
+
|
13
|
+
setup do
|
14
|
+
admin_sign_in
|
15
|
+
@project = Factory(:project)
|
16
|
+
@user = @project.user
|
17
|
+
end
|
18
|
+
|
19
|
+
should_eventually "be able to destroy items" do
|
20
|
+
get :destroy, :id => @user.id, :method => :delete
|
21
|
+
|
22
|
+
assert_response :redirect
|
23
|
+
assert_equal "User successfully removed.", flash[:notice]
|
24
|
+
assert_redirected_to :action => :index
|
25
|
+
end
|
26
|
+
|
27
|
+
context "index" do
|
28
|
+
|
29
|
+
setup do
|
30
|
+
@user_1 = Factory(:user)
|
31
|
+
@project_1 = Factory(:project, :user => @user_1)
|
32
|
+
Factory(:project, :user => @user_1)
|
33
|
+
@project_2 = Factory(:project)
|
34
|
+
end
|
35
|
+
|
36
|
+
should "filter by projects" do
|
37
|
+
get :index, :projects => @project_1.id
|
38
|
+
assert_equal [@user_1], assigns(:items)
|
39
|
+
|
40
|
+
get :index, :projects => @project_2.id
|
41
|
+
assert_not_equal [@user_1], assigns(:items)
|
42
|
+
end
|
43
|
+
|
44
|
+
end
|
45
|
+
|
46
|
+
context "unrelate collaborators" do
|
47
|
+
|
48
|
+
##
|
49
|
+
# We have a project with many collaborators (which are users)
|
50
|
+
#
|
51
|
+
|
52
|
+
setup do
|
53
|
+
@project = Factory(:project)
|
54
|
+
@user = Factory(:user)
|
55
|
+
@project.collaborators << @user
|
56
|
+
|
57
|
+
@request.env['HTTP_REFERER'] = "/admin/projects/edit/#{@project.id}"
|
58
|
+
end
|
59
|
+
|
60
|
+
should "work" do
|
61
|
+
assert_difference('@project.collaborators.count', -1) do
|
62
|
+
post :unrelate, :id => @user.id,
|
63
|
+
:resource => 'Project',
|
64
|
+
:resource_id => @project.id,
|
65
|
+
:association_name => "collaborators"
|
66
|
+
end
|
67
|
+
assert_response :redirect
|
68
|
+
assert_redirected_to @request.env['HTTP_REFERER']
|
69
|
+
assert_equal "Project successfully updated.", flash[:notice]
|
70
|
+
end
|
71
|
+
|
72
|
+
end
|
73
|
+
|
74
|
+
##
|
75
|
+
# THIS IS HERE BECAUSE I FOUND A BIG HOLE IN THE FILTERS STUFF!
|
76
|
+
#
|
77
|
+
context "autocomplete" do
|
78
|
+
|
79
|
+
setup do
|
80
|
+
25.times { Factory(:user) }
|
81
|
+
end
|
82
|
+
|
83
|
+
should "work and return a json hash with ten items" do
|
84
|
+
get :autocomplete, :term => "User"
|
85
|
+
assert_response :success
|
86
|
+
assert assigns(:items).size.eql?(20)
|
87
|
+
end
|
88
|
+
|
89
|
+
should "work and return json hash with one item" do
|
90
|
+
User.first.update_attributes(:name => "fesplugas")
|
91
|
+
|
92
|
+
get :autocomplete, :term => "jmeiss"
|
93
|
+
assert assigns(:items).size.eql?(0)
|
94
|
+
|
95
|
+
get :autocomplete, :term => "fesplugas"
|
96
|
+
assert assigns(:items).size.eql?(1)
|
97
|
+
end
|
98
|
+
|
99
|
+
end
|
100
|
+
|
101
|
+
end
|
@@ -0,0 +1,36 @@
|
|
1
|
+
require "test_helper"
|
2
|
+
|
3
|
+
=begin
|
4
|
+
|
5
|
+
What's being tested here?
|
6
|
+
|
7
|
+
- `set_context` which forces the display of items related to domain.
|
8
|
+
|
9
|
+
=end
|
10
|
+
|
11
|
+
class Admin::ViewsControllerTest < ActionController::TestCase
|
12
|
+
|
13
|
+
setup do
|
14
|
+
@request.session[:typus_user_id] = Factory(:typus_user).id
|
15
|
+
@site = Factory(:site, :domain => 'test.host')
|
16
|
+
Factory(:view, :site => @site)
|
17
|
+
Factory(:view)
|
18
|
+
end
|
19
|
+
|
20
|
+
teardown do
|
21
|
+
reset_session
|
22
|
+
end
|
23
|
+
|
24
|
+
should_eventually "get :index returns only views on the current_context" do
|
25
|
+
get :index
|
26
|
+
assert_response :success
|
27
|
+
assert_equal [@site], assigns(:items)
|
28
|
+
end
|
29
|
+
|
30
|
+
test "get :new should initialize item in the current_scope" do
|
31
|
+
get :new
|
32
|
+
assert_response :success
|
33
|
+
assert assigns(:item).site.eql?(@site)
|
34
|
+
end
|
35
|
+
|
36
|
+
end
|