remove all links to the old family tree search

issue Beit-Hatfutsot#414
Inna-r · Jun 8, 2017 · 2f62c4d · 2f62c4d
1 parent 1ec930d
commit 2f62c4d
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 16 deletions.
diff --git a/js/modules/main/src/controllers/GeneralSearchController.js b/js/modules/main/src/controllers/GeneralSearchController.js
@@ -224,14 +224,12 @@ GeneralSearchController.prototype = {
         this.handle_search_modifiers(search_params);
         search_params = this.search_params;
         search_params.more = this.$stateParams.more;
-
-       // search_params.more = this.$stateParams.more;
-        /*var prev_search = this.$window.sessionStorage.getItem('ftrees_search_params');
+        var prev_search = this.$window.sessionStorage.getItem('persons_search');
         if (JSON.stringify(search_params) === prev_search) {
             self.notification.put(20);
-        }*/
+        }
         this.$state.go('general-search', search_params, {inherit: false});
-        //this.$window.sessionStorage.setItem('ftrees_search_params', JSON.stringify(search_params));
+        this.$window.sessionStorage.setItem('persons_search', JSON.stringify(search_params));
     },
 
 

diff --git a/js/modules/main/src/controllers/itemCtrl.js b/js/modules/main/src/controllers/itemCtrl.js
@@ -193,13 +193,13 @@ ItemCtrl.prototype = {
     goto_persons: function() {
 		var lang = this.lang[0].toUpperCase() + this.lang.slice(1),
 			params = {};
+			params.collection = 'persons';
 
 		if (this.search_result.name.Header)
-		    params.last_name  = this.search_result.name.Header[lang]
-    else if (this.search_result.place.Header)
-		    params.place = this.search_result.place.Header[lang];
-
-    	this.$state.go('persons', params);
+		    params.q  = this.search_result.name.Header[lang]
+		else if (this.search_result.place.Header)
+		    params.q = this.search_result.place.Header[lang];
+    	this.$state.go('general-search', params);
 	},
 
 	showPrev: function () {

diff --git a/js/modules/main/src/controllers/personViewController.js b/js/modules/main/src/controllers/personViewController.js
@@ -13,7 +13,7 @@ var PersonViewController = function ($http, $window, $document, $rootScope,
 	this.langManager = langManager;
 	this.notification = notification;
 	this.$location = $location;
-	this.ftrees_search_params = JSON.parse(this.$window.sessionStorage.getItem('ftrees_search_params'));
+	this.persons_search = JSON.parse(this.$window.sessionStorage.getItem('persons_search'));
 
 	// renderer
 	this.rootId = "ftree-layout";

diff --git a/js/modules/main/src/controllers/startController.js b/js/modules/main/src/controllers/startController.js
@@ -34,14 +34,15 @@ var StartController = function($rootScope, $scope, langManager, $state, wizard,
 		}
 		else {
 			var params = {};
+			params.collection = 'persons';
 			if (self.wizard.last_search.name != '')
-				params.last_name = self.wizard.last_search.name;
+				params.q = self.wizard.last_search.name;
 			else {
-				if (self.wizard.last_search.place.name != '' ) {
-					params.place = self.wizard.last_search.place;
+				if (self.wizard.last_search.place != '' ) {
+					params.q = self.wizard.last_search.place;
 				}
 			}
-			$state.go('persons', params);
+			$state.go('general-search', params);
 		}
 	});
 	$rootScope.title = langManager.lang == 'en'?'Databases: Images, Name Meanings, Family Trees, Communities | BH':'מאגרים: תמונות, פירוש שם, אילן יוחסין, קהילות | בית התפוצות';

diff --git a/templates/main/ftrees/person.html b/templates/main/ftrees/person.html
@@ -23,7 +23,7 @@ <h3>
         <icon class="twitter-icon" position="[-305, -443]"></icon>
         <icon class="mail-icon" position="[-340, -443]"></icon>
         <mjs-widget item="ctrl.node"></mjs-widget>
-        <div class="ftree-title__back" ng-click="ctrl.$state.go('persons', ctrl.ftrees_search_params)">
+        <div class="ftree-title__back" ng-click="ctrl.$state.go('general-search', ctrl.persons_search)">
           <icon class="ftree-title__back-icon" position="[-313, -700]"></icon>
           <h3>
             <en>Exit Tree</en>