Download as
Browse Code »

Commit 7495e3aa4d2678c82d79a51d830b9ffec30176ed

Authored by David Silva
1 parent 362e45e6
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

institution_fields: Add label for sisp when the user is not admin 

Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com>
Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
Showing 2 changed files with 20 additions and 2 deletions   Show diff stats
views/institution_editor_extras.html.erb
  Diff comments   View file @7495e3a
... ... @@ -36,12 +36,15 @@
36 36 </div>
37 37 </span>
38 38  
39   - <% if @show_sisp_field %>
40 39 <span class= 'public-institutions-fields'>
41 40 <div class="formfieldline">
  41 + <% if @show_sisp_field %>
42 42 <%= _("SISP?") %>
43 43 <%= labelled_radio_button(_('Yes'), 'institution[sisp]', 'true', context.profile.institution.sisp)%>
44 44 <%= labelled_radio_button(_('No'), 'institution[sisp]', 'false', !context.profile.institution.sisp)%>
  45 + <% else %>
  46 + <%= _("SISP?") %>
  47 + <%= label_tag('SISP', context.profile.institution.sisp ? "YES" : "NO") %>
45 48 </div>
46 49 </span>
47 50 <% end %>
... ...
views/mpog_software_plugin/create_institution.html.erb
  Diff comments   View file @7495e3a
... ... @@ -75,8 +75,23 @@
75 75 <%= inst.select(:juridical_nature, [[_("Select a Juridical Nature"), 0]]|JuridicalNature.all.map {|j| [j.name, j.id]}, {:selected=>0})%>
76 76 </div>
77 77 </span>
78   - <br />
  78 +
  79 + <span class='required-field public-institutions-fields'>
  80 + <div class="formfield type-text">
  81 + <%= _("SISP?") %>
  82 + <% if @show_sisp_field %>
79 83  
  84 + <%= inst.label("sisp" ,_("Yes")) %>
  85 + <%= inst.radio_button(:sisp, true) %>
  86 + <%= inst.label("sisp" ,_("No")) %>
  87 + <%= inst.radio_button(:sisp, false) %>
  88 + <% else %>
  89 + <%= inst.label("sisp", _("No")) %>
  90 + <% end %>
  91 + </div>
  92 + </span>
  93 + <br />
  94 +
80 95 <div>
81 96 <p><%= recaptcha_tags :ajax => true, :display => {:theme => 'clean'} %> </p>
82 97 <%= link_to(_('Save'), '#', :id=>'save_institution_button', :class=>'button with-text icon-add') %>
... ...