Fix institution dialog JS

Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>

Fix institution dialog JS
Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
Gabriela Navarro · Fabio Teixeira
1 parent 94ed7304
Showing 3 changed files with 52 additions and 2 deletions Show diff stats
controllers/gov_user_plugin_controller.rb
lib/ext/communities_block.rb
public/views/create-institution.js
@@ -67,6 +67,7 @@ class GovUserPluginController &lt; ApplicationController
     response_message = save_institution @institutions
     if request.xhr? #User create institution
+      puts "-"*80, response_message
       render :json => response_message.to_json
     else #Admin create institution
       session[:notice] = response_message[:message] # consume the notice
@@ -0,0 +1,49 @@
+require_dependency 'communities_block'
+
+class CommunitiesBlock
+
+  def profile_list
+    result = get_visible_profiles
+
+    list_without_institution = []
+
+    result.each do |profile|
+      if profile.class == Community && !profile.institution?
+        list_without_institution << profile
+      end
+    end
+
+    result = list_without_institution
+
+    result.slice(0..get_limit-1)
+  end
+
+  def profile_count
+    profile_list.count
+  end
+
+  private
+
+  def get_visible_profiles
+    visible_profiles = profiles.visible.includes(
+    [:image,:domains,:preferred_domain,:environment]
+    )
+    if !prioritize_profiles_with_image
+      return visible_profiles.all(
+      :limit => get_limit,
+      :order => 'profiles.updated_at DESC'
+      ).sort_by {rand}
+    elsif profiles.visible.with_image.count >= get_limit
+      return visible_profiles.with_image.all(
+      :limit => get_limit * 5,
+      :order => 'profiles.updated_at DESC'
+      ).sort_by {rand}
+    else
+      return visible_profiles.with_image.sort_by {rand} +
+      visible_profiles.without_image.all(
+      :limit => get_limit * 5, :order => 'profiles.updated_at DESC'
+      ).sort_by {rand}
+    end
+  end
+
+end
@@ -53,7 +53,7 @@ modulejs.define(&#39;CreateInstitution&#39;, [&#39;jquery&#39;, &#39;NoosferoRoot&#39;, &#39;SelectElement&#39;]
       name : $("#community_name").val(),
       country : $("#community_country").val(),
       state : $("#community_state").val(),
-      city : $("#community_city").val()
+      city : $("#city_field").val()
     }
   }
@@ -102,7 +102,7 @@ modulejs.define(&#39;CreateInstitution&#39;, [&#39;jquery&#39;, &#39;NoosferoRoot&#39;, &#39;SelectElement&#39;]
         errors += "<li>"+response.errors[i]+"</li>";
       }
       errors += "</ul>";
-      if($('#institution_dialog') != []){
+      if($('#institution_dialog') == 0){
         $('#create_institution_errors').switchClass("show-field", "hide-field");
         $('#errorExplanation').html("<h2>"+response.message+"</h2>"+errors);
       }else{
	@@ -67,6 +67,7 @@ class GovUserPluginController < ApplicationController		@@ -67,6 +67,7 @@ class GovUserPluginController < ApplicationController
67	response_message = save_institution @institutions	67	response_message = save_institution @institutions
68		68
69	if request.xhr? #User create institution	69	if request.xhr? #User create institution
		70	+ puts "-"*80, response_message
70	render :json => response_message.to_json	71	render :json => response_message.to_json
71	else #Admin create institution	72	else #Admin create institution
72	session[:notice] = response_message[:message] # consume the notice	73	session[:notice] = response_message[:message] # consume the notice
@@ -0,0 +1,49 @@		@@ -0,0 +1,49 @@
	1	+require_dependency 'communities_block'
	2	+
	3	+class CommunitiesBlock
	4	+
	5	+ def profile_list
	6	+ result = get_visible_profiles
	7	+
	8	+ list_without_institution = []
	9	+
	10	+ result.each do \|profile\|
	11	+ if profile.class == Community && !profile.institution?
	12	+ list_without_institution << profile
	13	+ end
	14	+ end
	15	+
	16	+ result = list_without_institution
	17	+
	18	+ result.slice(0..get_limit-1)
	19	+ end
	20	+
	21	+ def profile_count
	22	+ profile_list.count
	23	+ end
	24	+
	25	+ private
	26	+
	27	+ def get_visible_profiles
	28	+ visible_profiles = profiles.visible.includes(
	29	+ [:image,:domains,:preferred_domain,:environment]
	30	+ )
	31	+ if !prioritize_profiles_with_image
	32	+ return visible_profiles.all(
	33	+ :limit => get_limit,
	34	+ :order => 'profiles.updated_at DESC'
	35	+ ).sort_by {rand}
	36	+ elsif profiles.visible.with_image.count >= get_limit
	37	+ return visible_profiles.with_image.all(
	38	+ :limit => get_limit * 5,
	39	+ :order => 'profiles.updated_at DESC'
	40	+ ).sort_by {rand}
	41	+ else
	42	+ return visible_profiles.with_image.sort_by {rand} +
	43	+ visible_profiles.without_image.all(
	44	+ :limit => get_limit * 5, :order => 'profiles.updated_at DESC'
	45	+ ).sort_by {rand}
	46	+ end
	47	+ end
	48	+
	49	+end
	@@ -53,7 +53,7 @@ modulejs.define('CreateInstitution', ['jquery', 'NoosferoRoot', 'SelectElement']		@@ -53,7 +53,7 @@ modulejs.define('CreateInstitution', ['jquery', 'NoosferoRoot', 'SelectElement']
53	name : $("#community_name").val(),	53	name : $("#community_name").val(),
54	country : $("#community_country").val(),	54	country : $("#community_country").val(),
55	state : $("#community_state").val(),	55	state : $("#community_state").val(),
56	- city : $("#community_city").val()	56	+ city : $("#city_field").val()
57	}	57	}
58	}	58	}
59		59
	@@ -102,7 +102,7 @@ modulejs.define('CreateInstitution', ['jquery', 'NoosferoRoot', 'SelectElement']		@@ -102,7 +102,7 @@ modulejs.define('CreateInstitution', ['jquery', 'NoosferoRoot', 'SelectElement']
102	errors += "<li>"+response.errors[i]+"</li>";	102	errors += "<li>"+response.errors[i]+"</li>";
103	}	103	}
104	errors += "</ul>";	104	errors += "</ul>";
105	- if($('#institution_dialog') != []){	105	+ if($('#institution_dialog') == 0){
106	$('#create_institution_errors').switchClass("show-field", "hide-field");	106	$('#create_institution_errors').switchClass("show-field", "hide-field");
107	$('#errorExplanation').html("<h2>"+response.message+"</h2>"+errors);	107	$('#errorExplanation').html("<h2>"+response.message+"</h2>"+errors);
108	}else{	108	}else{