Unverified Commit e0eb76eb authored by Benjamin Neff's avatar Benjamin Neff
Browse files

Remove aspect_ids parameter from publisher 

closes #7683
parent 70c65919

Changelog.md

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
## Bug fixes

* Ignore invalid `diaspora://` links [#7652](https://github.com/diaspora/diaspora/pull/7652)

* Fix deformed avatar in hovercards [#7656](https://github.com/diaspora/diaspora/pull/7656)

* Fix default aspects on profile page and bookmarklet publisher [#7679](https://github.com/diaspora/diaspora/issues/7679)



## Features

* Add birthday notifications [#7624](https://github.com/diaspora/diaspora/pull/7624)

app/controllers/status_messages_controller.rb

+0 −5
Original line number Diff line number Diff line
@@ -20,8 +20,6 @@ class StatusMessagesController < ApplicationController 
      @contact = current_user.contact_for(@person)

      if @contact

        @aspects_with_person = @contact.aspects.load

        @aspect_ids = @aspects_with_person.map(&:id)

        gon.aspect_ids = @aspect_ids

        render layout: nil

      else

        @aspects_with_person = []
@@ -29,8 +27,6 @@ class StatusMessagesController < ApplicationController 
    elsif request.format == :mobile

      @aspect = :all

      @aspects = current_user.aspects.load

      @aspect_ids = @aspects.map(&:id)

      gon.aspect_ids = @aspect_ids

    else

      redirect_to stream_path

    end
@@ -38,7 +34,6 @@ class StatusMessagesController < ApplicationController 


  def bookmarklet

    @aspects = current_user.aspects

    @aspect_ids = current_user.aspect_ids



    gon.preloads[:bookmarklet] = {

      content: params[:content],

app/helpers/aspect_global_helper.rb

+1 −3
Original line number Diff line number Diff line
@@ -17,14 +17,12 @@ module AspectGlobalHelper 
    if stream

      aspects = stream.aspects

      aspect = stream.aspect

      aspect_ids = stream.aspect_ids

    elsif current_user

      aspects = current_user.post_default_aspects

      aspect = aspects.first

      aspect_ids = current_user.aspect_ids

    else

      return {}

    end

    {selected_aspects: aspects, aspect: aspect, aspect_ids: aspect_ids}

    {selected_aspects: aspects, aspect: aspect}

  end

end

app/views/publisher/_publisher.html.haml

+0 −2
Original line number Diff line number Diff line
@@ -62,6 +62,4 @@ 
                           data: {toggle: "modal", target: "#publicExplainModal"}}

              %i.entypo-cog



    = link_to "", contacts_path(aspect_ids: aspect_ids), class: "selected_contacts_link hidden"



= render "shared/public_explain"

app/views/status_messages/bookmarklet.mobile.haml

+1 −1
Original line number Diff line number Diff line
@@ -2,6 +2,6 @@ 
-#   licensed under the Affero General Public License version 3 or later.  See

-#   the COPYRIGHT file.



= render :partial => 'publisher/publisher', :locals => { :aspect => :profile, :selected_aspects => @aspects,  :aspect_ids => @aspect_ids }

= render partial: "publisher/publisher", locals: {aspect: :profile, selected_aspects: @aspects}



= javascript_include_tag "mobile/bookmarklet"