decidim-proposals 0.26.8 → 0.27.0.rc1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/cells/decidim/proposals/collaborative_draft_m_cell.rb +1 -1
- data/app/cells/decidim/proposals/highlighted_proposals_for_component_cell.rb +9 -1
- data/app/cells/decidim/proposals/proposal_m_cell.rb +6 -8
- data/app/commands/decidim/proposals/accept_access_to_collaborative_draft.rb +1 -1
- data/app/commands/decidim/proposals/admin/answer_proposal.rb +1 -1
- data/app/commands/decidim/proposals/admin/assign_proposals_to_valuator.rb +1 -1
- data/app/commands/decidim/proposals/admin/create_proposal.rb +10 -7
- data/app/commands/decidim/proposals/admin/create_proposal_note.rb +2 -2
- data/app/commands/decidim/proposals/admin/discard_participatory_text.rb +1 -1
- data/app/commands/decidim/proposals/admin/import_participatory_text.rb +1 -1
- data/app/commands/decidim/proposals/admin/import_proposals.rb +2 -5
- data/app/commands/decidim/proposals/admin/merge_proposals.rb +1 -1
- data/app/commands/decidim/proposals/admin/notify_proposal_answer.rb +1 -3
- data/app/commands/decidim/proposals/admin/publish_answers.rb +1 -1
- data/app/commands/decidim/proposals/admin/split_proposals.rb +1 -1
- data/app/commands/decidim/proposals/admin/unassign_proposals_from_valuator.rb +1 -1
- data/app/commands/decidim/proposals/admin/update_participatory_text.rb +1 -1
- data/app/commands/decidim/proposals/admin/update_proposal.rb +8 -2
- data/app/commands/decidim/proposals/admin/update_proposal_category.rb +5 -3
- data/app/commands/decidim/proposals/admin/update_proposal_scope.rb +3 -3
- data/app/commands/decidim/proposals/create_collaborative_draft.rb +5 -5
- data/app/commands/decidim/proposals/create_proposal.rb +1 -1
- data/app/commands/decidim/proposals/destroy_proposal.rb +1 -1
- data/app/commands/decidim/proposals/publish_collaborative_draft.rb +1 -1
- data/app/commands/decidim/proposals/publish_proposal.rb +1 -1
- data/app/commands/decidim/proposals/reject_access_to_collaborative_draft.rb +1 -1
- data/app/commands/decidim/proposals/request_access_to_collaborative_draft.rb +1 -1
- data/app/commands/decidim/proposals/unvote_proposal.rb +1 -1
- data/app/commands/decidim/proposals/update_collaborative_draft.rb +1 -1
- data/app/commands/decidim/proposals/update_proposal.rb +8 -2
- data/app/commands/decidim/proposals/vote_proposal.rb +1 -1
- data/app/commands/decidim/proposals/withdraw_collaborative_draft.rb +1 -1
- data/app/commands/decidim/proposals/withdraw_proposal.rb +1 -1
- data/app/controllers/concerns/decidim/proposals/orderable.rb +7 -5
- data/app/controllers/decidim/proposals/admin/proposals_controller.rb +7 -7
- data/app/controllers/decidim/proposals/collaborative_drafts_controller.rb +10 -10
- data/app/controllers/decidim/proposals/proposal_votes_controller.rb +1 -1
- data/app/controllers/decidim/proposals/proposals_controller.rb +25 -18
- data/app/events/decidim/proposals/publish_proposal_event.rb +0 -8
- data/app/forms/decidim/proposals/admin/import_participatory_text_form.rb +4 -4
- data/app/forms/decidim/proposals/admin/proposal_base_form.rb +4 -4
- data/app/forms/decidim/proposals/admin/proposal_form.rb +2 -0
- data/app/forms/decidim/proposals/admin/proposals_fork_form.rb +2 -2
- data/app/forms/decidim/proposals/admin/proposals_import_form.rb +1 -1
- data/app/forms/decidim/proposals/proposal_form.rb +11 -4
- data/app/forms/decidim/proposals/proposal_wizard_create_step_form.rb +3 -0
- data/app/helpers/decidim/proposals/admin/proposal_bulk_actions_helper.rb +4 -0
- data/app/helpers/decidim/proposals/application_helper.rb +4 -17
- data/app/helpers/decidim/proposals/proposal_cells_helper.rb +1 -3
- data/app/helpers/decidim/proposals/proposal_wizard_helper.rb +7 -7
- data/app/helpers/decidim/proposals/proposals_helper.rb +1 -1
- data/app/jobs/decidim/proposals/notify_proposals_mentioned_job.rb +1 -1
- data/app/models/decidim/proposals/collaborative_draft.rb +10 -0
- data/app/models/decidim/proposals/collaborative_draft_collaborator_request.rb +0 -2
- data/app/models/decidim/proposals/proposal.rb +47 -8
- data/app/queries/decidim/proposals/filtered_proposals.rb +1 -1
- data/app/queries/decidim/proposals/similar_proposals.rb +1 -1
- data/app/services/decidim/proposals/proposal_search.rb +16 -71
- data/app/validators/proposal_length_validator.rb +2 -5
- data/app/views/decidim/proposals/admin/participatory_texts/_article-preview.html.erb +2 -2
- data/app/views/decidim/proposals/admin/proposals/_form.html.erb +1 -1
- data/app/views/decidim/proposals/admin/proposals/_proposal-tr.html.erb +2 -2
- data/app/views/decidim/proposals/admin/proposals/edit.html.erb +0 -1
- data/app/views/decidim/proposals/admin/proposals/index.html.erb +0 -1
- data/app/views/decidim/proposals/admin/proposals/new.html.erb +0 -1
- data/app/views/decidim/proposals/admin/proposals/publish_answers.js.erb +1 -1
- data/app/views/decidim/proposals/admin/proposals/show.html.erb +0 -1
- data/app/views/decidim/proposals/admin/proposals/update_attribute.js.erb +26 -0
- data/app/views/decidim/proposals/collaborative_drafts/_edit_form_fields.html.erb +9 -17
- data/app/views/decidim/proposals/collaborative_drafts/_filters.html.erb +4 -4
- data/app/views/decidim/proposals/collaborative_drafts/_wizard_aside.html.erb +1 -1
- data/app/views/decidim/proposals/collaborative_drafts/edit.html.erb +3 -1
- data/app/views/decidim/proposals/collaborative_drafts/new.html.erb +3 -1
- data/app/views/decidim/proposals/collaborative_drafts/show.html.erb +1 -1
- data/app/views/decidim/proposals/proposals/_edit_form_fields.html.erb +13 -36
- data/app/views/decidim/proposals/proposals/_filters.html.erb +5 -5
- data/app/views/decidim/proposals/proposals/_linked_proposals.html.erb +1 -2
- data/app/views/decidim/proposals/proposals/_proposals.html.erb +5 -5
- data/app/views/decidim/proposals/proposals/complete.html.erb +3 -1
- data/app/views/decidim/proposals/proposals/edit.html.erb +3 -1
- data/app/views/decidim/proposals/proposals/edit_draft.html.erb +3 -1
- data/app/views/decidim/proposals/proposals/new.html.erb +3 -1
- data/config/locales/am-ET.yml +1 -0
- data/config/locales/ar.yml +4 -262
- data/config/locales/bg.yml +1 -9
- data/config/locales/ca.yml +19 -31
- data/config/locales/cs.yml +32 -44
- data/config/locales/da.yml +1 -0
- data/config/locales/de.yml +7 -104
- data/config/locales/el.yml +5 -146
- data/config/locales/en.yml +12 -25
- data/config/locales/eo.yml +1 -0
- data/config/locales/es-MX.yml +18 -30
- data/config/locales/es-PY.yml +18 -30
- data/config/locales/es.yml +15 -27
- data/config/locales/et.yml +1 -0
- data/config/locales/eu.yml +203 -261
- data/config/locales/fi-plain.yml +17 -28
- data/config/locales/fi.yml +21 -32
- data/config/locales/fr-CA.yml +20 -31
- data/config/locales/fr.yml +20 -31
- data/config/locales/ga-IE.yml +1 -2
- data/config/locales/gl.yml +14 -11
- data/config/locales/hr.yml +1 -0
- data/config/locales/hu.yml +13 -60
- data/config/locales/id-ID.yml +5 -15
- data/config/locales/is-IS.yml +8 -17
- data/config/locales/it.yml +11 -14
- data/config/locales/ja.yml +67 -79
- data/config/locales/ko.yml +1 -0
- data/config/locales/lb.yml +1 -0
- data/config/locales/lt.yml +1 -986
- data/config/locales/lv.yml +5 -13
- data/config/locales/mt.yml +1 -0
- data/config/locales/nl.yml +14 -18
- data/config/locales/no.yml +6 -10
- data/config/locales/om-ET.yml +1 -0
- data/config/locales/pl.yml +5 -26
- data/config/locales/pt-BR.yml +6 -12
- data/config/locales/pt.yml +6 -10
- data/config/locales/ro-RO.yml +9 -9
- data/config/locales/ru.yml +8 -16
- data/config/locales/si-LK.yml +1 -0
- data/config/locales/sk.yml +6 -14
- data/config/locales/sl.yml +4 -0
- data/config/locales/so-SO.yml +1 -0
- data/config/locales/sr-CS.yml +1 -2
- data/config/locales/sv.yml +14 -12
- data/config/locales/sw-KE.yml +1 -0
- data/config/locales/ti-ER.yml +1 -0
- data/config/locales/tr-TR.yml +7 -11
- data/config/locales/uk.yml +8 -16
- data/config/locales/val-ES.yml +1 -0
- data/config/locales/vi.yml +1 -0
- data/config/locales/zh-CN.yml +5 -12
- data/config/locales/zh-TW.yml +1 -964
- data/db/migrate/20180529110230_move_authorships_to_coauthorships.rb +1 -0
- data/db/migrate/20181003074440_fix_user_groups_ids_in_proposals_endorsements.rb +2 -9
- data/db/migrate/20200708091228_move_proposals_fields_to_i18n.rb +18 -28
- data/db/migrate/20201002085508_fix_proposals_data.rb +13 -25
- data/lib/decidim/proposals/component.rb +25 -21
- data/lib/decidim/proposals/engine.rb +0 -6
- data/lib/decidim/proposals/import/proposal_answer_creator.rb +4 -10
- data/lib/decidim/proposals/proposal_serializer.rb +1 -9
- data/lib/decidim/proposals/test/factories.rb +1 -1
- data/lib/decidim/proposals/version.rb +1 -1
- metadata +25 -50
- data/app/services/decidim/proposals/collaborative_draft_search.rb +0 -59
- data/app/views/decidim/proposals/admin/proposals/_js-callout.html.erb +0 -6
- data/app/views/decidim/proposals/admin/proposals/update_category.js.erb +0 -26
- data/app/views/decidim/proposals/admin/proposals/update_scope.js.erb +0 -27
- data/config/environment.rb +0 -0
- data/config/locales/fa-IR.yml +0 -1
- data/config/locales/gn-PY.yml +0 -1
- data/config/locales/ka-GE.yml +0 -1
- data/config/locales/kaa.yml +0 -1
- data/config/locales/lo-LA.yml +0 -1
- data/config/locales/oc-FR.yml +0 -1
- data/lib/tasks/proposals/upgrade/decdim_proposal_upgrade_tasks.rake +0 -34
@@ -1,59 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
module Decidim
|
4
|
-
module Proposals
|
5
|
-
# A service to encapsualte all the logic when searching and filtering
|
6
|
-
# collaborative drafts in a participatory process.
|
7
|
-
class CollaborativeDraftSearch < ResourceSearch
|
8
|
-
text_search_fields :title, :body
|
9
|
-
|
10
|
-
# Public: Initializes the service.
|
11
|
-
# component - A Decidim::Component to get the drafts from.
|
12
|
-
# page - The page number to paginate the results.
|
13
|
-
# per_page - The number of drafts to return per page.
|
14
|
-
def initialize(options = {})
|
15
|
-
super(CollaborativeDraft.all, options)
|
16
|
-
end
|
17
|
-
|
18
|
-
# Handle the search_text filter
|
19
|
-
#
|
20
|
-
# We can't use the search from `ResourceFilter` since these fields aren't
|
21
|
-
# translated.
|
22
|
-
def search_search_text
|
23
|
-
query
|
24
|
-
.where("title::text ILIKE ?", "%#{search_text}%")
|
25
|
-
.or(query.where("body ILIKE ?", "%#{search_text}%"))
|
26
|
-
end
|
27
|
-
|
28
|
-
# Handle the state filter
|
29
|
-
def search_state
|
30
|
-
return query if state.member?("all")
|
31
|
-
|
32
|
-
apply_scopes(%w(open withdrawn published), state)
|
33
|
-
end
|
34
|
-
|
35
|
-
# Filters drafts by the name of the classes they are linked to. By default,
|
36
|
-
# returns all drafts. When a `related_to` param is given, then it camelcases item
|
37
|
-
# to find the real class name and checks the links for the Collaborative Draft.
|
38
|
-
#
|
39
|
-
# The `related_to` param is expected to be in this form:
|
40
|
-
#
|
41
|
-
# "decidim/meetings/meeting"
|
42
|
-
#
|
43
|
-
# This can be achieved by performing `klass.name.underscore`.
|
44
|
-
#
|
45
|
-
# Returns only those drafts that are linked to the given class name.
|
46
|
-
def search_related_to
|
47
|
-
from = query
|
48
|
-
.joins(:resource_links_from)
|
49
|
-
.where(decidim_resource_links: { to_type: related_to.camelcase })
|
50
|
-
|
51
|
-
to = query
|
52
|
-
.joins(:resource_links_to)
|
53
|
-
.where(decidim_resource_links: { from_type: related_to.camelcase })
|
54
|
-
|
55
|
-
query.where(id: from).or(query.where(id: to))
|
56
|
-
end
|
57
|
-
end
|
58
|
-
end
|
59
|
-
end
|
@@ -1,26 +0,0 @@
|
|
1
|
-
<% if flash.now[:error].present? %>
|
2
|
-
$("#js-form-recategorize-proposals #category_id").addClass("is-invalid-input")
|
3
|
-
$("<%= escape_javascript(render partial: %q{js-callout}, locals: { css: %q{alert}, text: flash.now[:error] }) %>").appendTo(".callout-wrapper");
|
4
|
-
<% end %>
|
5
|
-
|
6
|
-
<% if flash.now[:alert].present? %>
|
7
|
-
$("#js-form-recategorize-proposals #category_id").removeClass("is-invalid-input")
|
8
|
-
$("<%= escape_javascript(render partial: %q{js-callout}, locals: { css: %q{warning}, text: flash.now[:alert] }) %>").appendTo(".callout-wrapper");
|
9
|
-
<% end %>
|
10
|
-
|
11
|
-
<% if flash.now[:notice].present? %>
|
12
|
-
$("<%= escape_javascript(render partial: %q{js-callout}, locals: { css: %q{success}, text: flash.now[:notice] }) %>").appendTo(".callout-wrapper");
|
13
|
-
|
14
|
-
<% proposal_ids.each do |id| %>
|
15
|
-
$(".table-list [data-id='<%= id %>']")
|
16
|
-
.replaceWith("<%= escape_javascript(render partial: %q{proposal-tr}, locals: { proposal: proposal_find(id) }) %>");
|
17
|
-
<% end %>
|
18
|
-
|
19
|
-
$("#js-form-recategorize-proposals #category_id").removeClass("is-invalid-input")
|
20
|
-
$(".js-check-all").prop('checked', false);
|
21
|
-
$(".js-check-all-proposal").prop('checked', false);
|
22
|
-
window.hideBulkActionsButton();
|
23
|
-
window.hideBulkActionForms();
|
24
|
-
window.showOtherActionsButtons();
|
25
|
-
window.selectedProposalsCountUpdate();
|
26
|
-
<% end %>
|
@@ -1,27 +0,0 @@
|
|
1
|
-
<% if flash.now[:error].present? %>
|
2
|
-
$("#js-form-scope-change-proposals #scope_id").addClass("is-invalid-input")
|
3
|
-
$("<%= escape_javascript(render partial: %q{js-callout}, locals: { css: %q{alert}, text: flash.now[:error] }) %>").appendTo(".callout-wrapper");
|
4
|
-
<% end %>
|
5
|
-
|
6
|
-
<% if flash.now[:alert].present? %>
|
7
|
-
$("#js-form-scope-change-proposals #scope_id").removeClass("is-invalid-input")
|
8
|
-
$("<%= escape_javascript(render partial: %q{js-callout}, locals: { css: %q{warning}, text: flash.now[:alert] }) %>").appendTo(".callout-wrapper");
|
9
|
-
<% end %>
|
10
|
-
|
11
|
-
<% if flash.now[:notice].present? %>
|
12
|
-
$("<%= escape_javascript(render partial: %q{js-callout}, locals: { css: %q{success}, text: flash.now[:notice] }) %>").appendTo(".callout-wrapper");
|
13
|
-
|
14
|
-
<% @proposal_ids.each do |id| %>
|
15
|
-
$(".table-list [data-id='<%= id %>']")
|
16
|
-
.replaceWith("<%= escape_javascript(render partial: %q{proposal-tr}, locals: { proposal: proposal_find(id) }) %>");
|
17
|
-
<% end %>
|
18
|
-
|
19
|
-
$("#js-form-scope-change-proposals #scope_id").removeClass("is-invalid-input")
|
20
|
-
$(".js-check-all").prop('checked', false);
|
21
|
-
$(".js-check-all-proposal").prop('checked', false);
|
22
|
-
|
23
|
-
window.hideBulkActionForms();
|
24
|
-
window.hideBulkActionsButton();
|
25
|
-
window.showOtherActionsButtons();
|
26
|
-
window.selectedProposalsCountUpdate();
|
27
|
-
<% end %>
|
data/config/environment.rb
DELETED
File without changes
|
data/config/locales/fa-IR.yml
DELETED
@@ -1 +0,0 @@
|
|
1
|
-
fa:
|
data/config/locales/gn-PY.yml
DELETED
@@ -1 +0,0 @@
|
|
1
|
-
gn:
|
data/config/locales/ka-GE.yml
DELETED
@@ -1 +0,0 @@
|
|
1
|
-
ka:
|
data/config/locales/kaa.yml
DELETED
@@ -1 +0,0 @@
|
|
1
|
-
kaa:
|
data/config/locales/lo-LA.yml
DELETED
@@ -1 +0,0 @@
|
|
1
|
-
lo:
|
data/config/locales/oc-FR.yml
DELETED
@@ -1 +0,0 @@
|
|
1
|
-
oc:
|
@@ -1,34 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
namespace :decidim do
|
4
|
-
namespace :proposals do
|
5
|
-
namespace :upgrade do
|
6
|
-
desc "Removes all proposal valuator records of which the role assignment does not exists"
|
7
|
-
task remove_valuator_orphan_records: :environment do
|
8
|
-
if Decidim.module_installed?("participatory_processes")
|
9
|
-
Decidim::Proposals::ValuationAssignment
|
10
|
-
.where(valuator_role_type: "Decidim::ParticipatoryProcessUserRole")
|
11
|
-
.where
|
12
|
-
.not(valuator_role_id: Decidim::ParticipatoryProcessUserRole.pluck(:id))
|
13
|
-
.destroy_all
|
14
|
-
end
|
15
|
-
|
16
|
-
if Decidim.module_installed?("assemblies")
|
17
|
-
Decidim::Proposals::ValuationAssignment
|
18
|
-
.where(valuator_role_type: "Decidim::AssemblyUserRole")
|
19
|
-
.where
|
20
|
-
.not(valuator_role_id: Decidim::AssemblyUserRole.pluck(:id))
|
21
|
-
.destroy_all
|
22
|
-
end
|
23
|
-
|
24
|
-
if Decidim.module_installed?("conferences")
|
25
|
-
Decidim::Proposals::ValuationAssignment
|
26
|
-
.where(valuator_role_type: "Decidim::ConferenceUserRole")
|
27
|
-
.where
|
28
|
-
.not(valuator_role_id: Decidim::ConferenceUserRole.pluck(:id))
|
29
|
-
.destroy_all
|
30
|
-
end
|
31
|
-
end
|
32
|
-
end
|
33
|
-
end
|
34
|
-
end
|