Download as
Browse Code »

Commit 8fb3bd4a70eceafe550c2411b557b2aa9cd1e283

Authored by Gabriela Navarro
Committed by Fabio Teixeira
1 parent 9e178cd3
Exists in master and in 5 other branches fix_search_by_software_highlight_block, r4, refactor_software_info_365, stable, update_translations

Add new fields on institution edit and visualization view 

Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
Signed-off-by: Parley Martins <parley@outlook.com>
Showing 3 changed files with 25 additions and 2 deletions   Show diff stats
lib/mpog_software_plugin.rb
  Diff comments   View file @8fb3bd4
@@ -256,6 +256,11 @@ class MpogSoftwarePlugin &lt; Noosfero::Plugin @@ -256,6 +256,11 @@ class MpogSoftwarePlugin &lt; Noosfero::Plugin
256 context.profile.institution.save! 256 context.profile.institution.save!
257 end 257 end
258 258
  259 + if context.params.has_key?(:juridical_nature)
  260 + context.profile.institution.juridical_nature_id = context.params[:juridical_nature]
  261 + context.profile.institution.save!
  262 + end
  263 +
259 if context.params.has_key?(:institution) 264 if context.params.has_key?(:institution)
260 Institution.transaction do 265 Institution.transaction do
261 context.profile.institution.update_attributes!(context.params[:institution]) 266 context.profile.institution.update_attributes!(context.params[:institution])
views/institution_editor_extras.html.erb
  Diff comments   View file @8fb3bd4
@@ -28,4 +28,20 @@ @@ -28,4 +28,20 @@
28 <%= select_tag(:governmental_sphere, options_for_select(GovernmentalSphere.all.map {|s| [s.name, s.id]}, :selected => context.profile.institution.governmental_sphere_id), :class=>"formlabel") %> 28 <%= select_tag(:governmental_sphere, options_for_select(GovernmentalSphere.all.map {|s| [s.name, s.id]}, :selected => context.profile.institution.governmental_sphere_id), :class=>"formlabel") %>
29 </div> 29 </div>
30 </span> 30 </span>
31 -<% end %>  
32 \ No newline at end of file 31 \ No newline at end of file
  32 +
  33 + <span class= 'public-institutions-fields'>
  34 + <div class="formfield type-select">
  35 + <%= label_tag('juridical_nature', _("Juridical Nature")) %>
  36 + <%= select_tag(:juridical_nature, options_for_select(JuridicalNature.all.map {|j| [j.name, j.id]}, :selected => context.profile.institution.juridical_nature_id), :class=>"formlabel") %>
  37 + </div>
  38 +</span>
  39 +
  40 + <span class= 'public-institutions-fields'>
  41 + <div class="formfieldline">
  42 + <%= _("SISP?") %>
  43 + <%= labelled_radio_button(_('Yes'), 'institution[sisp]', 'true', context.profile.institution.sisp)%>
  44 + <%= labelled_radio_button(_('No'), 'institution[sisp]', 'false', !context.profile.institution.sisp)%>
  45 + </div>
  46 + </span>
  47 +
  48 +<% end %>
views/profile/_institution_tab.html.erb
  Diff comments   View file @8fb3bd4
@@ -15,5 +15,7 @@ @@ -15,5 +15,7 @@
15 <%= display_field(_('Acronym:'), profile.institution, :acronym, true) %> 15 <%= display_field(_('Acronym:'), profile.institution, :acronym, true) %>
16 <%= display_field(_('Governmental Power:'), profile.institution.governmental_power, :name, true) %> 16 <%= display_field(_('Governmental Power:'), profile.institution.governmental_power, :name, true) %>
17 <%= display_field(_('Governmental Sphere:'), profile.institution.governmental_sphere, :name, true) %> 17 <%= display_field(_('Governmental Sphere:'), profile.institution.governmental_sphere, :name, true) %>
  18 + <%= display_field(_('Juridical Nature:'), profile.institution.juridical_nature, :name, true) %>
  19 + <%= content_tag('tr', content_tag('td', _("SISP:")) + content_tag('td', profile.institution.sisp ? _("Yes") : _("No"))) %>
18 <% end %> 20 <% end %>
19 -</table>  
20 \ No newline at end of file 21 \ No newline at end of file
  22 +</table>