Commit 861e5a40692d661603bc1cb370736c34f318e10a

Authored by Gabriela Navarro
2 parents e313c171 3b8c552a

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
@@ -89,7 +89,7 @@ class MpogSoftwarePlugin < Noosfero::Plugin @@ -89,7 +89,7 @@ class MpogSoftwarePlugin < Noosfero::Plugin
89 if context.params.has_key?(:language) 89 if context.params.has_key?(:language)
90 language_transaction 90 language_transaction
91 end 91 end
92 - 92 +
93 if context.params.has_key?(:database) 93 if context.params.has_key?(:database)
94 databases_transaction 94 databases_transaction
95 end 95 end
@@ -139,38 +139,12 @@ class MpogSoftwarePlugin < Noosfero::Plugin @@ -139,38 +139,12 @@ class MpogSoftwarePlugin < Noosfero::Plugin
139 ["mpog-software-validations.js", "mpog-user-validations.js", "mpog-institution-validations.js"] 139 ["mpog-software-validations.js", "mpog-user-validations.js", "mpog-institution-validations.js"]
140 end 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 def add_new_organization_button 142 def add_new_organization_button
163 Proc::new do 143 Proc::new do
164 button(:add, _('Create a new software'), :controller => 'mpog_software_plugin_myprofile', :action => 'new_software') 144 button(:add, _('Create a new software'), :controller => 'mpog_software_plugin_myprofile', :action => 'new_software')
165 end 145 end
166 end 146 end
167 147
168 - def alternative_reactive_account(person)  
169 - person.visible = true  
170 - person.save  
171 - true  
172 - end  
173 -  
174 # FIXME - if in error log apears has_permission?, try to use this method 148 # FIXME - if in error log apears has_permission?, try to use this method
175 def has_permission?(person, permission, target) 149 def has_permission?(person, permission, target)
176 person.has_permission_without_plugins?(permission, target) 150 person.has_permission_without_plugins?(permission, target)
@@ -179,11 +153,11 @@ class MpogSoftwarePlugin < Noosfero::Plugin @@ -179,11 +153,11 @@ class MpogSoftwarePlugin < Noosfero::Plugin
179 def incomplete_registration params 153 def incomplete_registration params
180 person = User.find(params[:user]).person 154 person = User.find(params[:user]).person
181 percentege = calc_percentage_registration(person) 155 percentege = calc_percentage_registration(person)
182 - if percentege >= 0 and percentege <= 100 156 + if percentege >= 0 and percentege <= 100
183 return _("Registration "+percentege.to_s+"% incomplete ") 157 return _("Registration "+percentege.to_s+"% incomplete ")
184 end 158 end
185 end 159 end
186 - 160 +
187 def calc_percentage_registration person 161 def calc_percentage_registration person
188 empty_fields = 0 162 empty_fields = 0
189 required_list = ["cell_phone","contact_phone","institution","comercial_phone","country","city","state","organization_website","role","area_interest","image"] 163 required_list = ["cell_phone","contact_phone","institution","comercial_phone","country","city","state","organization_website","role","area_interest","image"]