decidim-core 0.13.1 → 0.14.1

data/app/presenters/decidim/resource_locator_presenter.rb

@@ -38,6 +38,15 @@ module Decidim
       collection_route("path", options)
     end
 
+    # Builds the admin edit path to the resource.
+    #
+    # options - An optional hash of options to pass to the Rails router
+    #
+    # Returns a String.
+    def edit(options = {})
+      admin_route_proxy.send("edit_#{member_route_name}_path", resource, options)
+    end
+
     private
 
     # Private: Build the route to the resource.
@@ -74,5 +83,9 @@ module Decidim
     def route_proxy
       @route_proxy ||= EngineRouter.main_proxy(component || resource)
     end
+
+    def admin_route_proxy
+      @admin_route_proxy ||= EngineRouter.admin_proxy(component || resource)
+    end
   end
 end

data/app/presenters/decidim/user_presenter.rb

@@ -44,7 +44,7 @@ module Decidim
     end
 
     def following_count
-      __getobj__.following_follows.count
+      __getobj__.following_users.count
     end
   end
 end

data/app/queries/decidim/messaging/user_conversations.rb

@@ -17,7 +17,7 @@ module Decidim
 
       def query
         Conversation
-          .joins(:participations)
+          .includes(:participations)
           .where(decidim_messaging_participations: { decidim_participant_id: user.id })
       end
 

data/app/resolvers/decidim/hashtags_resolver.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Decidim
+  # A GraphQL resolver to handle `hashtags'
+  class HashtagsResolver
+    def initialize(organization, term)
+      @organization = organization
+      @term = term
+    end
+
+    def hashtags
+      Decidim::Hashtag.where(organization: @organization).where("name like ?", "#{@term}%")
+    end
+  end
+end

data/app/services/decidim/action_authorizer.rb

@@ -7,14 +7,16 @@ module Decidim
     #
     # Initializes the ActionAuthorizer.
     #
-    # user    - The user to authorize against.
+    # user      - The user to authorize against.
+    # action    - The action to authenticate.
     # component - The component to authenticate against.
-    # action  - The action to authenticate.
+    # resource  - The resource to authenticate against. Can be nil.
     #
-    def initialize(user, component, action)
+    def initialize(user, action, component, resource)
       @user = user
-      @component = component
       @action = action.to_s if action
+      @component = resource&.component || component
+      @resource = resource
     end
 
     #
@@ -28,7 +30,7 @@ module Decidim
       raise AuthorizationError, "Missing data" unless component && action
 
       status_code, data = if authorization_handler_name
-                            authorization_handler.authorize(authorization, permission_options, component)
+                            authorization_handler.authorize(authorization, permission_options, component, resource)
                           else
                             [:ok, {}]
                           end
@@ -38,7 +40,7 @@ module Decidim
 
     private
 
-    attr_reader :user, :component, :action
+    attr_reader :user, :component, :resource, :action
 
     def authorization
       return nil unless user && authorization_handler_name
@@ -62,8 +64,7 @@ module Decidim
 
     def permission
       return nil unless component && action
-
-      @permission ||= component.permissions&.fetch(action, nil)
+      @permission ||= resource&.permissions&.fetch(action, nil) || component.permissions&.fetch(action, nil)
     end
 
     class AuthorizationStatus

data/app/types/decidim/core/date_time_type.rb

@@ -6,7 +6,7 @@ module Decidim
       name "DateTime"
       description "An ISO8601 date with time"
       coerce_input ->(value, _ctx) { Time.iso8601(value) }
-      coerce_result ->(value, _ctx) { value.to_datetime.iso8601 }
+      coerce_result ->(value, _ctx) { value.to_time.iso8601 }
     end
   end
 end

data/app/types/decidim/core/hashtag_type.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Core
+    # This type represents a User.
+    HashtagType = GraphQL::ObjectType.define do
+      name "HashtagType"
+      description "hashtags list"
+
+      field :name, !types.String, "The hashtag's name"
+    end
+  end
+end

data/app/uploaders/decidim/homepage_image_uploader.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Decidim
-  # This class deals with uploading hero images to ParticipatoryProcesses.
+  # This class deals with uploading hero images to organizations.
   class HomepageImageUploader < ImageUploader
     include CarrierWave::MiniMagick
 

data/app/uploaders/decidim/image_uploader.rb

@@ -6,6 +6,7 @@ module Decidim
     include CarrierWave::MiniMagick
 
     process :validate_size, :validate_dimensions
+    process quality: Decidim.image_uploader_quality
 
     # CarrierWave automatically calls this method and validates the content
     # type fo the temp file to match against any of these options.

data/app/views/decidim/authorization_modals/show.html.erb

@@ -0,0 +1,32 @@
+<button class="close-button" data-close aria-label="Close modal"
+        type="button">
+  <span aria-hidden="true">&times;</span>
+</button>
+<div class="reveal__header <%= status.code %>-authorization">
+  <h3 class="reveal__title"><%= t ".#{status.code}.title" %></h3>
+</div>
+<p><%= t ".#{status.code}.explanation", authorization: t("#{status.handler_name}.name", scope: "decidim.authorization_handlers") %></p>
+<% if status.data[:extra_explanation] %>
+<p><%= t status.data[:extra_explanation][:key], **status.data[:extra_explanation][:params] %></p>
+<% end %>
+<% if status.data[:fields] %>
+<ul>
+  <% status.data[:fields].each do |field, value| %>
+    <li><strong><%= t ".#{status.code}.invalid_field", field: t("#{status.handler_name}.fields.#{field}", scope: "decidim.authorization_handlers"), value: value ? "(#{value})" : "" %></strong></li>
+  <% end %>
+</ul>
+<% end %>
+<div class="row">
+  <div class="columns medium-8 medium-offset-2">
+    <% if status.data[:action].present? %>
+      <%= link_to t(".#{status.code}.#{status.data[:action]}", authorization: t("#{status.handler_name}.name", scope: "decidim.authorization_handlers")), authorize_action_path, class: "button expanded" %>
+    <% else %>
+      <button class="button expanded" data-close><%= t ".#{status.code}.ok" %></button>
+    <% end %>
+  </div>
+</div>
+<% if status.data[:cancel] %>
+<div class="text-center">
+  <button class="link" data-close><%= t ".#{status.code}.cancel" %></button>
+</div>
+<% end %>

data/app/views/decidim/messaging/conversations/create.js.erb

@@ -1,2 +1,2 @@
-$("#messages").append("<%= j(render "message", message: conversation.messages.first).html_safe %>");
+$("#messages").append("<%= j(cell("decidim/message", conversation.messages.first).show).html_safe %>");
 $(".add-message").replaceWith("<%= j(render "reply", form: form, conversation: conversation).html_safe %>");

data/app/views/decidim/messaging/conversations/index.html.erb

@@ -1,51 +1 @@
-<main class="wrapper">
-  <div class="row">
-    <div class="columns">
-      <div class="title-action">
-        <h1 class="heading1 title-action__title">
-          <%= t(".title") %>
-        </h1>
-      </div>
-    </div>
-  </div>
-  <div class="row">
-    <div class="columns large-8">
-      <% if @conversations.empty? %>
-        <div class="callout secondary">
-          <p><%= t(".no_conversations") %></p>
-        </div>
-      <% else %>
-        <div class="card card--list conversations">
-          <% @conversations.each do |conversation| %>
-            <%= link_to decidim.conversation_path(conversation), class: "card--list__item" do %>
-              <div class="card--list__titled-text">
-                <h6 class="card--list__heading heading6">
-                  <%= username_list(conversation.interlocutors(current_user)) %>
-                </h6>
-
-                <span class="card--list__annotation">
-                  <%= conversation.last_message.friendly_created_at %>
-                </span>
-
-                <span class="text-small">
-                  <%= truncate conversation.last_message.body, length: 150 %>
-                </span>
-
-                <% if conversation.unread_count(current_user) > 0 %>
-                  <span class="card--list__counter">
-                    <span><%= conversation.unread_count(current_user) %></span>
-                  </span>
-                <% end %>
-              </div>
-              <div class="card--list__data">
-                <span class="card--list__data__icon">
-                  <%= icon "chevron-right" %>
-                </span>
-              </div>
-            <% end %>
-          <% end %>
-        </div>
-      <% end %>
-    </div>
-  </div>
-</main>
+<%= cell "decidim/profile", current_user, context: { content_cell: "decidim/conversations" } %>

data/app/views/decidim/messaging/conversations/new.html.erb

@@ -1,5 +1 @@
-<%= render layout: "show", locals: { participants: [@form.recipient] } do %>
-  <div id="messages"></div>
-
-  <%= render "start", form: @form %>
-<% end %>
+<%= cell "decidim/profile", current_user, context: { content_cell: "decidim/new_conversation", form: @form } %>

data/app/views/decidim/messaging/conversations/show.html.erb

@@ -1,9 +1 @@
-<%= render layout: "show", locals: { participants: conversation.interlocutors(current_user) } do %>
-  <div id="messages">
-    <% conversation.messages.each do |message| %>
-      <%= render "message", message: message %>
-    <% end %>
-  </div>
-
-  <%= render "reply", form: @form, conversation: conversation %>
-<% end %>
+<%= cell "decidim/profile", current_user, context: { content_cell: "decidim/conversation", conversation: conversation } %>

data/app/views/decidim/messaging/conversations/update.js.erb

@@ -1,2 +1,2 @@
-$("#messages").append("<%= j(render "message", message: message).html_safe %>");
+$("#messages").append("<%= j(cell("decidim/message", message).show).html_safe %>");
 $(".new_message textarea#message_body").val("");

data/app/views/decidim/notifications/index.html.erb

@@ -0,0 +1 @@
+<%= cell "decidim/profile", current_user, context: { content_cell: "decidim/notifications" } %>

data/app/views/decidim/pages/decidim_page.html.erb

@@ -3,6 +3,15 @@
   description: translated_attribute(page.content)
 ) %>
 
+<%
+edit_link(
+  decidim_admin.edit_static_page_path(page),
+  :update,
+  :static_page,
+  static_page: page
+)
+%>
+
 <main class="wrapper">
   <%= cell "decidim/tos_page", :announcement %>
 

data/app/views/decidim/pages/home.html.erb

@@ -1,17 +1,13 @@
-<%= render partial: "decidim/pages/home/hero" %>
-
-<% if !translated_attribute(current_organization.description).blank? %>
-  <%= render partial: "decidim/pages/home/sub_hero" %>
+<%
+  edit_link(
+    decidim_admin.edit_organization_path,
+    :update,
+    :organization,
+    organization: current_organization
+  )
+%>
+
+<% Decidim::ContentBlock.published.for_scope(:homepage, organization: current_organization).each do |content_block| %>
+  <% next unless content_block.manifest %>
+  <%= cell content_block.manifest.cell, content_block %>
 <% end %>
-
-<%= render partial: "decidim/pages/home/highlighted_content_banner" %>
-
-<%= render partial: "decidim/pages/home/highlighted_processes" %>
-
-<%= render partial: "decidim/pages/home/extended" %>
-
-<% if current_organization.show_statistics? %>
-  <%= render partial: "decidim/pages/home/statistics" %>
-<% end %>
-
-<%= render partial: "decidim/pages/home/footer_sub_hero" %>

data/app/views/decidim/pages/index.html.erb

@@ -1,5 +1,13 @@
 <% add_decidim_page_title(t(".title")) %>
 
+<%
+edit_link(
+  decidim_admin.static_pages_path,
+  :read,
+  :static_page
+)
+%>
+
 <main class="wrapper">
   <div class="row column">
     <h1 class="heading1 page-title"><%= t ".title" %></h1>

data/app/views/decidim/profiles/_user_follow.erb

@@ -11,12 +11,12 @@
                 <% end %>
                 <div>
                   <div class="author__name--container">
-                    <%= link_to profile_user.name, profile_user.profile_path, class: "author__name"%>
+                    <%= link_to profile_user.name, profile_user.profile_path, class: "author__name" %>
                     <% if profile_user.badge.present? %>
                       <%= icon profile_user.badge, class: "author__verified" %>
                     <% end %>
                   </div>
-                  <%= link_to profile_user.nickname, profile_user.profile_path, class: "author__nickname"%>
+                  <%= link_to profile_user.nickname, profile_user.profile_path, class: "author__nickname" %>
                 </div>
               </div>
             </div>

data/app/views/decidim/profiles/show.html.erb

@@ -1,37 +1 @@
-<main class="wrapper">
-  <div class="row">
-    <div class="columns medium-9 medium-offset-3">
-      <ul class="tabs" id="profile-tabs">
-        <% if current_user && current_user == user %>
-          <li class="tabs-title<%= " is-active" if active_content == "notifications" %>">
-            <%= aria_selected_link_to t(".notifications"), profile_notifications_path(nickname: user.nickname), aria_link_type: active_content == "notifications" %>
-          </li>
-        <% end %>
-        <li class="tabs-title<%= " is-active" if active_content == "following" %>">
-          <%= aria_selected_link_to t(".following"), profile_following_path(nickname: user.nickname), aria_link_type: active_content == "following" %>
-        </li>
-        <li class="tabs-title<%= " is-active" if active_content == "followers" %>">
-          <%= aria_selected_link_to t(".followers"), profile_followers_path(nickname: user.nickname), aria_link_type: active_content == "followers" %>
-        </li>
-      </ul>
-    </div>
-  </div>
-  <div class="row">
-    <div class="columns medium-3">
-      <%= render partial: "user", locals: { user: user } %>
-    </div>
-    <div class="columns medium-9">
-      <div class="tabs-content" data-tabs-content="profile-tabs">
-        <div class="tabs-panel is-active">
-          <% if active_content == "notifications" %>
-            <%= cell "decidim/notifications", current_user, context: { current_user: current_user } %>
-          <% elsif active_content == "following" %>
-            <%= cell "decidim/following", user, context: { current_user: current_user } %>
-          <% elsif active_content == "followers" %>
-            <%= cell "decidim/followers", user, context: { current_user: current_user } %>
-          <% end %>
-        </div>
-      </div>
-    </div>
-  </div>
-</main>
+<%= cell "decidim/profile", user, context: { content_cell: @content_cell } %>

data/app/views/decidim/searches/_results.html.erb

@@ -1,5 +1,5 @@
 <div class="row small-up-1 medium-up-2 card-grid">
   <% @results.each do |result| %>
-    <%= card_for result.resource, context: { label: true }, show_footer_actions: false %>
+    <%= card_for result.resource, { context: { label: true, show_space: true }, show_footer_actions: false } %>
   <% end %>
 </div>

data/app/views/decidim/shared/_author_reference.html.erb

@@ -1 +1 @@
-<%= card_for author, context: {extra_classes: ["author-data--small"]} %>
+<%= card_for author, context: { extra_classes: ["author-data--small"] } %>

data/app/views/decidim/shared/_authorization_modal.html.erb

@@ -0,0 +1 @@
+<div class="reveal" id="authorizationModal" data-reveal></div>

data/app/views/decidim/shared/_tags.html.erb

@@ -1 +1 @@
-<%= cell "decidim/tags", resource, context: {extra_classes: [tags_class_extra]} %>
+<%= cell "decidim/tags", resource, context: { extra_classes: [tags_class_extra] } %>

data/app/views/kaminari/decidim/_page.html.erb

@@ -7,5 +7,5 @@
     per_page:      number of items to fetch per page
     remote:        data-remote -%>
 <li class="page<%= " current" if page.current? %>">
-  <%= link_to_unless page.current?, page, url, {remote: remote, rel: page.rel} %>
+  <%= link_to_unless page.current?, page, url, { remote: remote, rel: page.rel } %>
 </li>

data/app/views/layouts/decidim/_application.html.erb

@@ -3,7 +3,11 @@
   title: current_organization.name,
   url: request.original_url,
   twitter_handler: current_organization.twitter_handler,
-  image_url: current_organization.homepage_image.url
+  image_url: Decidim::ContentBlock.published.find_by(
+    organization: current_organization,
+    scope: :homepage,
+    manifest_name: :hero
+  ).try(:images_container).try(:background_image).try(:url)
 }) %>
 
 <!DOCTYPE html>
@@ -23,5 +27,6 @@
     <% end %>
 
     <%= render partial: "decidim/shared/login_modal" %>
+    <%= render partial: "decidim/shared/authorization_modal" %>
   </body>
 </html>