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

Gabriela Navarro
2 parents e313c171 3b8c552a
Showing 1 changed file with 3 additions and 29 deletions Show diff stats
lib/mpog_software_plugin.rb
@@ -89,7 +89,7 @@ class MpogSoftwarePlugin &lt; Noosfero::Plugin
       if context.params.has_key?(:language)
         language_transaction
       end
-      
+
       if context.params.has_key?(:database)
         databases_transaction
       end
@@ -139,38 +139,12 @@ class MpogSoftwarePlugin &lt; Noosfero::Plugin
     ["mpog-software-validations.js", "mpog-user-validations.js", "mpog-institution-validations.js"]
   end
  
-  def alternative_exclusion
-    if context.profile.person?
-      if context.profile.disable
-        context.session[:notice] = _('The profile was deactivated.')
-        context.profile.user.forget_me
-        context.session.delete(:user)
-
-        true
-      end
-    elsif context.profile.community?
-      context.profile.software_info.software_languages.delete_all
-      context.profile.destroy
-
-      mensage = context.profile.software_info.nil? ? "community" : "software"
-      context.session[:notice] = _("The #{mensage} was deleted.")
-    else
-      false
-    end
-  end
-
   def add_new_organization_button
     Proc::new do
       button(:add, _('Create a new software'), :controller => 'mpog_software_plugin_myprofile', :action => 'new_software')
     end
   end
  
-  def alternative_reactive_account(person)
-    person.visible = true
-    person.save
-    true
-  end
-
   # FIXME - if in error log apears has_permission?, try to use this method
   def has_permission?(person, permission, target)
     person.has_permission_without_plugins?(permission, target)
@@ -179,11 +153,11 @@ class MpogSoftwarePlugin &lt; Noosfero::Plugin
   def incomplete_registration params
     person = User.find(params[:user]).person
     percentege = calc_percentage_registration(person)
-    if percentege >= 0 and percentege <= 100 
+    if percentege >= 0 and percentege <= 100
       return _("Registration "+percentege.to_s+"% incomplete ")
     end
   end
-    
+
   def calc_percentage_registration person
     empty_fields = 0
     required_list = ["cell_phone","contact_phone","institution","comercial_phone","country","city","state","organization_website","role","area_interest","image"]
...	...	@@ -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"]
...	...