Unverified Commit 7d6623d0 authored by Benjamin Neff's avatar Benjamin Neff
Browse files

Remove contacts page on profiles 

closes #7769
parent 4fa92c18

Changelog.md

+1 −0
Original line number Diff line number Diff line 
# 0.7.5.0



## Refactor

* Remove the 'make contacts in this aspect visible to each other' option [#7769](https://github.com/diaspora/diaspora/pull/7769)



## Bug fixes

* Prefill conversation form on contacts page only with mutual contacts [#7744](https://github.com/diaspora/diaspora/pull/7744)

app/assets/javascripts/app/pages/profile.js

+0 −4
Original line number Diff line number Diff line
@@ -24,9 +24,6 @@ app.pages.Profile = app.views.Base.extend({ 
    if (app.hasPreload("photos_count")) {

      this.photos = app.parsePreload("photos_count");

    }

    if (app.hasPreload("contacts_count")) {

      this.contacts = app.parsePreload("contacts_count");

    }



    this.streamCollection = _.has(opts, "streamCollection") ? opts.streamCollection : null;

    this.streamViewClass = _.has(opts, "streamView") ? opts.streamView : null;
@@ -70,7 +67,6 @@ app.pages.Profile = app.views.Base.extend({ 
    return new app.views.ProfileHeader({

      model: this.model,

      photos: this.photos,

      contacts: this.contacts

    });

  },

app/assets/javascripts/app/router.js

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ app.Router = Backbone.Router.extend({ 
    "p/:id(/)": "singlePost",

    "people(/)": "peopleSearch",

    "people/:id(/)": "profile",

    "people/:id/contacts(/)": "profile",

    "people/:id/photos(/)": "photos",

    "posts/:id(/)": "singlePost",

    "profile/edit(/)": "settings",

app/assets/javascripts/app/views/profile_header_view.js

+0 −7
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ app.views.ProfileHeader = app.views.Base.extend({ 


  initialize: function(opts) {

    this.photos = _.has(opts, 'photos') ? opts.photos : null;

    this.contacts = _.has(opts, 'contacts') ? opts.contacts : null;

    this.model.on("change", this.render, this);

    $("#mentionModal").on("modal:loaded", this.mentionModalLoaded.bind(this));

    $("#mentionModal").on("hidden.bs.modal", this.mentionModalHidden);
@@ -24,13 +23,11 @@ app.views.ProfileHeader = app.views.Base.extend({ 
    return _.extend({}, this.defaultPresenter(), {

      show_profile_btns: this._shouldShowProfileBtns(),

      show_photos: this._shouldShowPhotos(),

      show_contacts: this._shouldShowContacts(),

      is_blocked: this.model.isBlocked(),

      is_sharing: this.model.isSharing(),

      is_receiving: this.model.isReceiving(),

      is_mutual: this.model.isMutual(),

      has_tags: this._hasTags(),

      contacts: this.contacts,

      photos: this.photos

    });

  },
@@ -51,10 +48,6 @@ app.views.ProfileHeader = app.views.Base.extend({ 
    return (this.photos && this.photos > 0);

  },



  _shouldShowContacts: function() {

    return (this.contacts && this.contacts > 0);

  },



  showMentionModal: function() {

    app.helpers.showModal("#mentionModal");

  },

app/assets/templates/profile_header_tpl.jst.hbs

+0 −17
Original line number Diff line number Diff line
@@ -82,22 +82,5 @@ 
        </a>

      </li>

    {{/if}}

    {{#if show_contacts}}

      <li {{#isCurrentPage 'personContacts' guid}} class="active" {{/isCurrentPage}}>

        {{#if is_own_profile}}

          <a href="{{urlTo 'contacts'}}" id="contacts_link">

            <i class="entypo-users"></i>

            {{t 'profile.contacts'}}

            <div class="badge badge-default">{{contacts}}</div>

          </a>

        {{else}}

          <a href="{{urlTo 'personContacts' guid}}" id="contacts_link">

            <i class="entypo-users"></i>

            {{t 'profile.contacts'}}

            <div class="badge badge-default">{{contacts}}</div>

          </a>

        {{/if}}

      </li>

    {{/if}}

  </div>

</div>