Download as
Browse Code »

Commit 861e5a40692d661603bc1cb370736c34f318e10a

Authored by Gabriela Navarro
2 parents e313c171 3b8c552a
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

Merge branch 'master' of gitlab.com:softwarepublico/mpog_software

Showing 1 changed file with 3 additions and 29 deletions   Show diff stats
lib/mpog_software_plugin.rb
  Diff comments   View file @861e5a4
... ... @@ -89,7 +89,7 @@ class MpogSoftwarePlugin < Noosfero::Plugin
89 89 if context.params.has_key?(:language)
90 90 language_transaction
91 91 end
92   -
  92 +
93 93 if context.params.has_key?(:database)
94 94 databases_transaction
95 95 end
... ... @@ -139,38 +139,12 @@ class MpogSoftwarePlugin < Noosfero::Plugin
139 139 ["mpog-software-validations.js", "mpog-user-validations.js", "mpog-institution-validations.js"]
140 140 end
141 141  
142   - def alternative_exclusion
143   - if context.profile.person?
144   - if context.profile.disable
145   - context.session[:notice] = _('The profile was deactivated.')
146   - context.profile.user.forget_me
147   - context.session.delete(:user)
148   -
149   - true
150   - end
151   - elsif context.profile.community?
152   - context.profile.software_info.software_languages.delete_all
153   - context.profile.destroy
154   -
155   - mensage = context.profile.software_info.nil? ? "community" : "software"
156   - context.session[:notice] = _("The #{mensage} was deleted.")
157   - else
158   - false
159   - end
160   - end
161   -
162 142 def add_new_organization_button
163 143 Proc::new do
164 144 button(:add, _('Create a new software'), :controller => 'mpog_software_plugin_myprofile', :action => 'new_software')
165 145 end
166 146 end
167 147  
168   - def alternative_reactive_account(person)
169   - person.visible = true
170   - person.save
171   - true
172   - end
173   -
174 148 # FIXME - if in error log apears has_permission?, try to use this method
175 149 def has_permission?(person, permission, target)
176 150 person.has_permission_without_plugins?(permission, target)
... ... @@ -179,11 +153,11 @@ class MpogSoftwarePlugin < Noosfero::Plugin
179 153 def incomplete_registration params
180 154 person = User.find(params[:user]).person
181 155 percentege = calc_percentage_registration(person)
182   - if percentege >= 0 and percentege <= 100
  156 + if percentege >= 0 and percentege <= 100
183 157 return _("Registration "+percentege.to_s+"% incomplete ")
184 158 end
185 159 end
186   -
  160 +
187 161 def calc_percentage_registration person
188 162 empty_fields = 0
189 163 required_list = ["cell_phone","contact_phone","institution","comercial_phone","country","city","state","organization_website","role","area_interest","image"]
... ...