subdirectory_fix: Put ajax routes to use subdirectory

Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>

subdirectory_fix: Put ajax routes to use subdirectory
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Fabio Teixeira · Luciano Prestes
1 parent 2168bebe
Showing 7 changed files with 84 additions and 48 deletions Show diff stats
lib/mpog_software_plugin.rb
public/mpog-custom-libraries.js
public/mpog-incomplete-registration.js
public/mpog-institution-validations.js
public/mpog-software-validations.js
public/mpog-user-validations.js
public/spb-utils.js
@@ -213,7 +213,7 @@ class MpogSoftwarePlugin &lt; Noosfero::Plugin
   end
   def js_files
-    ["mpog-custom-libraries.js", "mpog-software.js", "mpog-software-validations.js", "mpog-user-validations.js", "mpog-institution-validations.js", "mpog-incomplete-registration.js", "mpog-search.js", "jquery.maskedinput.min.js"]
+    ["spb-utils.js", "mpog-software.js", "mpog-software-validations.js", "mpog-user-validations.js", "mpog-institution-validations.js", "mpog-incomplete-registration.js", "mpog-search.js", "jquery.maskedinput.min.js"]
   end
   def add_new_organization_buttons
@@ -1,30 +0,0 @@
-/*
-* "Class" for select and option html generation
-*/
-var SelectElement = (function() {
-  function SelectElement(name, id) {
-    this.select = document.createElement("select");
-  }
-
-  SelectElement.prototype.setAttr = function(attr, value) {
-    return this.select.setAttribute(attr, value);
-  };
-
-  SelectElement.prototype.addOption = function(option) {
-    return this.select.add(option);
-  };
-
-  SelectElement.prototype.getSelect = function() {
-    return this.select;
-  };
-
-  SelectElement.generateOption = function(value, text) {
-    var option;
-    option = document.createElement("option");
-    option.setAttribute("value", value);
-    option.text = text;
-    return option;
-  };
-
-  return SelectElement;
-})();
 \ No newline at end of file
 (function() {
+  var AJAX_URL = {
+    hide_registration_incomplete_percentage:
+      url_with_subdirectory("/plugin/mpog_software/hide_registration_incomplete_percentage")
+  };
+
+
   function hide_incomplete_percentage(evt) {
     evt.preventDefault();
-    jQuery.get("/plugin/mpog_software/hide_registration_incomplete_percentage", {hide:true}, function(response){
+    jQuery.get(AJAX_URL.hide_registration_incomplete_percentage, {hide:true}, function(response){
       if( response == true )
         jQuery("#complete_registration").fadeOut();
     });
 (function(){
+  var AJAX_URL = {
+    create_institution_modal:
+      url_with_subdirectory("/plugin/mpog_software/create_institution"),
+    new_institution:
+      url_with_subdirectory("/plugin/mpog_software/new_institution"),
+    institution_already_exists:
+      url_with_subdirectory("/plugin/mpog_software/institution_already_exists"),
+    get_institutions:
+      url_with_subdirectory("/plugin/mpog_software/get_institutions")
+  };
+
+
   function open_create_institution_modal(evt) {
     evt.preventDefault();
-    jQuery.get("/plugin/mpog_software/create_institution", function(response){
+    jQuery.get(AJAX_URL.create_institution_modal, function(response){
       jQuery("#institution_dialog").html(response);
       set_form_count_custom_data();
@@ -54,6 +66,7 @@
   function success_ajax_response(response) {
     close_loading();
+
     if(response.success){
       var institution_name  = response.institution_data.name;
       var institution_id = response.institution_data.id;
@@ -79,11 +92,10 @@
   function save_institution(evt) {
     evt.preventDefault();
-    var form_data = jQuery("#institution_form").serialize();
     open_loading(jQuery("#loading_message").val());
     jQuery.ajax({
-      url: "/plugin/mpog_software/new_institution",
+      url: AJAX_URL.new_institution,
       data : get_post_data(),
       type: "POST",
       success: success_ajax_response,
@@ -96,16 +108,16 @@
   }
   function institution_already_exists(){
-      if( this.value.length >= 3 ) {
-        jQuery.get("/plugin/mpog_software/institution_already_exists", {name:this.value}, function(response){
-          if( response == true ) {
-            jQuery("#already_exists_text").switchClass("hide-field", "show-field");
-          } else {
-            jQuery("#already_exists_text").switchClass("show-field", "hide-field");
-          }
-        });
-      }
+    if( this.value.length >= 3 ) {
+      jQuery.get(AJAX_URL.institution_already_exists, {name:this.value}, function(response){
+        if( response == true ) {
+          jQuery("#already_exists_text").switchClass("hide-field", "show-field");
+        } else {
+          jQuery("#already_exists_text").switchClass("show-field", "hide-field");
+        }
+      });
     }
+  }
   function get_clone_institution_data(value) {
     var user_institutions = jQuery(".user_institutions").first().clone();
@@ -119,7 +131,7 @@
       source : function(request, response){
         jQuery.ajax({
           type: "GET",
-          url: "/plugin/mpog_software/get_institutions",
+          url: AJAX_URL.get_institutions,
           data: {query: request.term},
           success: function(result){
             response(result);
@@ -246,7 +258,6 @@
     jQuery(".remove-institution").click(remove_institution);
     jQuery("#community_country").change(function(){
-      console.log(this.value)
       show_hide_cnpj_city(this.value);
     });
 (function(){
+  var AJAX_URL = {
+    get_field_data:
+      url_with_subdirectory("/plugin/mpog_software/get_field_data")
+  };
+
+
   function get_hidden_description_field(autocomplete_field, klass) {
     var field = jQuery(autocomplete_field);
     field = field.parent().parent().find(klass);
@@ -35,7 +41,7 @@
       source : function(request, response){
         jQuery.ajax({
           type: "GET",
-          url: "/plugin/mpog_software/get_field_data",
+          url: AJAX_URL.get_field_data,
           data: {query: request.term, field: field_name},
           success: function(result){
             response(result);
 (function(){
+  var AJAX_URL = {
+    check_reactivate_account:
+      url_with_subdirectory("/plugin/mpog_software/check_reactivate_account")
+  };
+
+
   /*
   * "Class" that switch state field between input and select
   * If the Country if Brazil, set state to select field
@@ -95,7 +101,7 @@
   function check_reactivate_account(value, input_object){
     jQuery.ajax({
-      url : "/plugin/mpog_software/check_reactivate_account",
+      url : AJAX_URL.check_reactivate_account,
       type: "GET",
       data: { "email": value },
       success: function(response) {
@@ -0,0 +1,37 @@
+/*
+* "Class" for select and option html generation
+*/
+var SelectElement = (function() {
+  function SelectElement(name, id) {
+    this.select = document.createElement("select");
+  }
+
+  SelectElement.prototype.setAttr = function(attr, value) {
+    return this.select.setAttribute(attr, value);
+  };
+
+  SelectElement.prototype.addOption = function(option) {
+    return this.select.add(option);
+  };
+
+  SelectElement.prototype.getSelect = function() {
+    return this.select;
+  };
+
+  SelectElement.generateOption = function(value, text) {
+    var option;
+    option = document.createElement("option");
+    option.setAttribute("value", value);
+    option.text = text;
+    return option;
+  };
+
+  return SelectElement;
+})();
+
+
+function url_with_subdirectory(url) {
+  var subdirectory = jQuery("meta[property='noosfero:root']").attr("content");
+
+  return subdirectory+url;
+}
 \ No newline at end of file
	@@ -213,7 +213,7 @@ class MpogSoftwarePlugin < Noosfero::Plugin		@@ -213,7 +213,7 @@ class MpogSoftwarePlugin < Noosfero::Plugin
213	end	213	end
214		214
215	def js_files	215	def js_files
216	- ["mpog-custom-libraries.js", "mpog-software.js", "mpog-software-validations.js", "mpog-user-validations.js", "mpog-institution-validations.js", "mpog-incomplete-registration.js", "mpog-search.js", "jquery.maskedinput.min.js"]	216	+ ["spb-utils.js", "mpog-software.js", "mpog-software-validations.js", "mpog-user-validations.js", "mpog-institution-validations.js", "mpog-incomplete-registration.js", "mpog-search.js", "jquery.maskedinput.min.js"]
217	end	217	end
218		218
219	def add_new_organization_buttons	219	def add_new_organization_buttons
	@@ -1,30 +0,0 @@		@@ -1,30 +0,0 @@
1	-/*
2	-* "Class" for select and option html generation
3	-*/
4	-var SelectElement = (function() {
5	- function SelectElement(name, id) {
6	- this.select = document.createElement("select");
7	- }
8	-
9	- SelectElement.prototype.setAttr = function(attr, value) {
10	- return this.select.setAttribute(attr, value);
11	- };
12	-
13	- SelectElement.prototype.addOption = function(option) {
14	- return this.select.add(option);
15	- };
16	-
17	- SelectElement.prototype.getSelect = function() {
18	- return this.select;
19	- };
20	-
21	- SelectElement.generateOption = function(value, text) {
22	- var option;
23	- option = document.createElement("option");
24	- option.setAttribute("value", value);
25	- option.text = text;
26	- return option;
27	- };
28	-
29	- return SelectElement;
30	-})();
31	\ No newline at end of file	0	\ No newline at end of file
	@@ -0,0 +1,37 @@		@@ -0,0 +1,37 @@
		1	+/*
		2	+* "Class" for select and option html generation
		3	+*/
		4	+var SelectElement = (function() {
		5	+ function SelectElement(name, id) {
		6	+ this.select = document.createElement("select");
		7	+ }
		8	+
		9	+ SelectElement.prototype.setAttr = function(attr, value) {
		10	+ return this.select.setAttribute(attr, value);
		11	+ };
		12	+
		13	+ SelectElement.prototype.addOption = function(option) {
		14	+ return this.select.add(option);
		15	+ };
		16	+
		17	+ SelectElement.prototype.getSelect = function() {
		18	+ return this.select;
		19	+ };
		20	+
		21	+ SelectElement.generateOption = function(value, text) {
		22	+ var option;
		23	+ option = document.createElement("option");
		24	+ option.setAttribute("value", value);
		25	+ option.text = text;
		26	+ return option;
		27	+ };
		28	+
		29	+ return SelectElement;
		30	+})();
		31	+
		32	+
		33	+function url_with_subdirectory(url) {
		34	+ var subdirectory = jQuery("meta[property='noosfero:root']").attr("content");
		35	+
		36	+ return subdirectory+url;
		37	+}
0	\ No newline at end of file	38	\ No newline at end of file