Download as
Browse Code »

Commit ba2af642c63ad390dbb71b02f8c387cfed36e19a

Authored by Gust
1 parent 2ee61f6b
Exists in master and in 79 other branches add_sisp_to_chef, add_super_archives_plugin, api_for_colab, automates_core_packing, backup_not_prod, changes_in_buttons_on_content_panel, colab_automated_login, colab_spb_plugin_recipe, colab_widgets_settings, design_validation, dev_env_minimal, disable_email_dev, fix_breadcrumbs_position, fix_categories_software_link, fix_edit_institution, fix_edit_software_with_another_license, fix_get_license_info, fix_gitlab_assets_permission, fix_list_style_inside_article, fix_list_style_on_folder_elements, fix_members_pagination, fix_merge_request_url, fix_models_translations, fix_no_license, fix_software_api, fix_software_block_migration, fix_software_communities_translations, fix_software_communities_unit_test, fix_style_create_institution_admin_panel, fix_superarchives_imports, fix_sym_links_noosfero, focus_search_field_theme, gov-user-refactoring, gov-user-refactoring-rails4, header_fix, institution_modal_on_rating, kalibro-conf-refactoring, kalibro-processor-package, lxc_settings, margin_fix, mezuro_cookbook, prezento, refactor_download_block, refactor_software_communities, refactor_software_for_sisp, register_page, release-process, release-process-v2, remove-unused-images, remove_broken_theme, remove_secondary_email_from_user, remove_sisp_buttons, removing_super_archives_email, review_message, scope2method, signals_user_noosfero, sisp_catalog_header, sisp_colab_config, sisp_dev, sisp_dev_master, sisp_simple_version, software_as_organization, software_catalog_style_fix, software_communities_html_refactor, software_infos_api, spb_minimal_env, spb_to_rails4, spec_refactor, stable-4.1, stable-4.2, stable-4.x, temp_soft_comm_refactoring, theme_header, theme_javascript_refactory, thread_dropdown, thread_page, update_search_by_categories, update_software_api, update_softwares_boxes

Admin dont have to aprove software for himself 

-Delete software if aproval not granted

Signed-off-by: Parley Martins <parley@outlook.com>
Signed-off-by: Gustavo Jaruga <darksshades@gmail.com>
Signed-off-by: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com>
Showing 2 changed files with 4 additions and 4 deletions   Show diff stats
controllers/mpog_software_plugin_myprofile_controller.rb
  Diff comments   View file @ba2af64
... ... @@ -64,7 +64,7 @@ class MpogSoftwarePluginMyprofileController &lt; MyProfileController
64 64 end
65 65 end
66 66  
67   - if environment.enabled?("admin_must_approve_new_communities")
  67 + if environment.enabled?("admin_must_approve_new_communities") and !environment.admins.include?(current_user.person)
68 68 session[:notice] = _('Your new software request will be evaluated by an administrator. You will be notified.')
69 69 redirect_to user.admin_url
70 70 else
... ...
lib/ext/community.rb
  Diff comments   View file @ba2af64
... ... @@ -4,8 +4,8 @@ class Community
4 4  
5 5 attr_accessible :visible
6 6  
7   - has_one :software_info, :dependent=>:delete
8   - has_one :institution, :dependent=>:delete
  7 + has_one :software_info, :dependent=>:destroy
  8 + has_one :institution, :dependent=>:destroy
9 9  
10 10 def self.create_after_moderation(requestor, attributes = {}, software_info = nil, license_info = nil, software_categories = nil)
11 11 community = Community.new(attributes)
... ... @@ -21,7 +21,7 @@ class Community
21 21 software_info.save
22 22 end
23 23  
24   - if community.environment.enabled?('admin_must_approve_new_communities')
  24 + if community.environment.enabled?('admin_must_approve_new_communities') and !community.environment.admins.include?(requestor)
25 25 cc = CreateCommunity.create(attributes.merge(:requestor => requestor, :software_info=>software_info))
26 26 else
27 27 community = Community.create(attributes)
... ...