Commit 66411419bbf743a6ef2a599f3c97ef9603de825f

Authored by Luciano Prestes
1 parent e50b5e5a
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

Register software redirect to edit community of software

Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com>
controllers/mpog_software_plugin_myprofile_controller.rb
@@ -24,7 +24,6 @@ class MpogSoftwarePluginMyprofileController &lt; MyProfileController @@ -24,7 +24,6 @@ class MpogSoftwarePluginMyprofileController &lt; MyProfileController
24 valid_license = (request.post? && @license_info.valid?) 24 valid_license = (request.post? && @license_info.valid?)
25 if valid_software_info && valid_license && valid_community 25 if valid_software_info && valid_license && valid_community
26 @community = Community.create_after_moderation(user, {:environment => environment}.merge(params[:community]), @software_info, @license_info ) 26 @community = Community.create_after_moderation(user, {:environment => environment}.merge(params[:community]), @software_info, @license_info )
27 - redirect_to :controller => 'mpog_software_plugin_myprofile', :action => 'edit_software', :profile => @community.identifier  
28 27
29 unless params[:q].nil? 28 unless params[:q].nil?
30 admins = params[:q].split(/,/).map{|n| environment.people.find n.to_i} 29 admins = params[:q].split(/,/).map{|n| environment.people.find n.to_i}
@@ -35,6 +34,7 @@ class MpogSoftwarePluginMyprofileController &lt; MyProfileController @@ -35,6 +34,7 @@ class MpogSoftwarePluginMyprofileController &lt; MyProfileController
35 end 34 end
36 end 35 end
37 36
  37 + redirect_to :controller => 'profile_editor', :action => 'edit', :profile => @community.identifier
38 else 38 else
39 # @list_libraries.each do |lib| 39 # @list_libraries.each do |lib|
40 # @errors |= lib.errors.full_messages 40 # @errors |= lib.errors.full_messages
views/mpog_software_plugin_myprofile/new_software.html.erb
@@ -31,14 +31,12 @@ @@ -31,14 +31,12 @@
31 <div id='software-name-field' class='formfield'> 31 <div id='software-name-field' class='formfield'>
32 <span id='software-hostname'><%= environment.default_hostname %>/</span> 32 <span id='software-hostname'><%= environment.default_hostname %>/</span>
33 <%= required text_field(:community, :name, :size => 30, :maxlength => 100) %> 33 <%= required text_field(:community, :name, :size => 30, :maxlength => 100) %>
34 - <%= content_tag(:small,_('Insert the name'), :id => 'name-tag', :class => "helper-tag") %>  
35 </div> 34 </div>
36 35
37 <%= fields_for @software_info do |swf| %> 36 <%= fields_for @software_info do |swf| %>
38 <div class="formfield type-text"> 37 <div class="formfield type-text">
39 <%= swf.label("finality" ,_("Finality"), :class=>"formlabel") %> 38 <%= swf.label("finality" ,_("Finality"), :class=>"formlabel") %>
40 <%= required swf.text_area(:finality, :placeholder => _("It is a software of..."), :cols => 40, :rows => 5, :maxlength => 140) %> 39 <%= required swf.text_area(:finality, :placeholder => _("It is a software of..."), :cols => 40, :rows => 5, :maxlength => 140) %>
41 - <%= content_tag(:small,_('Insert the finality'), :id => 'finality-tag', :class => "helper-tag") %>  
42 </div> 40 </div>
43 <% end %> 41 <% end %>
44 42
@@ -66,22 +64,4 @@ @@ -66,22 +64,4 @@
66 64
67 <% end %> 65 <% end %>
68 66
69 -</div>  
70 -  
71 -  
72 -<script type="text/javascript">  
73 -jQuery(function($) {  
74 - add_balloon('#community_name', '#name-tag');  
75 - add_balloon('#software_info_finality', '#finality-tag');  
76 -});  
77 -  
78 -function add_balloon(input_field, balloon_id){  
79 - jQuery(balloon_id).hide();  
80 - jQuery(input_field).focus(function() {  
81 - jQuery(balloon_id).fadeIn('slow');  
82 - });  
83 - jQuery(input_field).blur(function() {  
84 - jQuery(balloon_id).css('display','none');;  
85 - });  
86 -}  
87 -</script> 67 +</div>
88 \ No newline at end of file 68 \ No newline at end of file