Merge pull request #857 from vladnicoara/fb-if

LB-1944 Facebook search only when having appId
superdesk · Sep 9, 2014 · 0ed0504 · 0ed0504
2 parents d3afbc9 + 5ee4a36
commit 0ed0504
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 19 deletions.
diff --git a/plugins/livedesk/__plugin__/livedesk/populate_default_data.py b/plugins/livedesk/__plugin__/livedesk/populate_default_data.py
@@ -120,7 +120,7 @@ def createBlogMediaTypes():
            'sms': (False, '', '', ''),
            'comments': (False, '', '', ''),
            'google': (False, 'www.google.com', 'xml', ''),
-           'facebook': (False, 'www.facebook.com', 'xml', 'change-this-to-a-real-appid'),
+           'facebook': (False, 'www.facebook.com', 'xml', ''),
            'twitter': (False, 'www.twitter.com', 'xml', '{"ConsumerKey":"uLW0hK2KZosj8Yl4F17uKg","ConsumerSecret":"iRuM0j8pyUTYgbpwPLqAl9wTBn5JzQB4zLJaiUaEdyE"}'),
            'flickr': (False, 'www.flickr.com', 'xml', 'abf46ef4c670460e95d09cf368606b8a'),
            'youtube': (False, 'www.youtube.com', 'xml', ''),

diff --git a/plugins/livedesk/gui-resources/scripts/js/providers/facebook.js b/plugins/livedesk/gui-resources/scripts/js/providers/facebook.js
@@ -24,11 +24,11 @@ define('providers/facebook', [
             tokenInterval: 0,
             tokenRefreshTime: 3000,         
             data: [],
-            init : function() {
+            init : function(author, appId) {
                 if(!this.initialized || !this.el.children(":first").length) {
                     //this.render();
                     this.adaptor._parent = this;
-                    this.adaptor.init();
+                    this.adaptor.init(author, appId);
                 }
                 this.initialized = true;
             },

diff --git a/plugins/livedesk/gui-resources/scripts/js/providers/facebook/adaptor.js b/plugins/livedesk/gui-resources/scripts/js/providers/facebook/adaptor.js
@@ -7,22 +7,10 @@ define([
 
     $.extend(providers.facebook, {
         adaptor: {
-            init: function() {
+            init: function(author, appId) {
                 var self = this;
-                new $.restAuth('Data/Collaborator/')
-                    .xfilter('Id, Source.Key')
-                    .request({data: { 'qs.name': 'facebook'}})
-                    .done(function(collabs) {
-                        self.appId = '';
-                        if($.isDefined(collabs[0])) {
-                            self.author = collabs[0].Id;
-                            //self.appId = '540742825976268';
-                            if ( collabs[0].Source.Key ) {
-                                self.appId = collabs[0].Source.Key;
-                            }
-                            self._parent.loadFbConnect(self.appId);
-                        } 
-                    });
+                self.author = author;
+                self._parent.loadFbConnect(appId);                
             },
             universal: function(obj) {
                 var meta =  jQuery.extend(true, {}, obj);

diff --git a/plugins/livedesk/gui-resources/scripts/js/providers/facebook/tab.js b/plugins/livedesk/gui-resources/scripts/js/providers/facebook/tab.js