decidim-pages 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c3d233904e106ab91960203e3f4ac4a6869459f
-  data.tar.gz: 5f20be39206fe2d05d57785372cf44d5ccf45d4b
+  metadata.gz: 88bb89278413c1a92dbf2ec9a45bd89accc621bf
+  data.tar.gz: d8684f7249a48bf29392faa275f01f5c6780d673
 SHA512:
-  metadata.gz: 596cd0d1cfc1dff33a47854f7bc2457c50edcf4bf235a8dc3f3fbfca1f01a5fc86df2b0c98644a9ca28c2b3b13e04093b9d8c502bbabe2051ff520cc9107d5de
-  data.tar.gz: 4e72b10277de282c07cd85d8427171293cbc7ac3ad3df31b4e8c862f3a303795a940ebf5dd9196c371d21cc2df5b74d652ad55382c5a75b2dff85b51687d2b6c
+  metadata.gz: 7d83bc17e074007ac388e850d1efd18715a11be5addcd1b8d5cadb99d85f4bc9d95188aa07b34ae3f001499a148e27fdd1d51906c50b6ad830bc645b2dd15d9d
+  data.tar.gz: 37f2e0cf9b8967397be17e1a420f1b3a669f5be9ac0f04cf6159045b261f2b60a2ee39b8e8d0468ad97fa83b6280bda730e39e8496dd2f2c7afbeb687eab55e6

data/app/commands/decidim/pages/admin/update_page.rb

@@ -27,10 +27,7 @@ module Decidim
         private
 
         def update_page
-          @page.update_attributes!(
-            title: @form.title,
-            body: @form.body
-          )
+          @page.update_attributes!(body: @form.body)
         end
       end
     end

data/app/commands/decidim/pages/create_page.rb

@@ -9,10 +9,7 @@ module Decidim
       end
 
       def call
-        @page = Page.new(
-          title: @feature.name,
-          feature: @feature
-        )
+        @page = Page.new(feature: @feature)
 
         @page.save ? broadcast(:ok) : broadcast(:invalid)
       end

data/app/forms/decidim/pages/admin/page_form.rb

@@ -6,10 +6,7 @@ module Decidim
       class PageForm < Decidim::Form
         include TranslatableAttributes
 
-        translatable_attribute :title, String
         translatable_attribute :body, String
-
-        validates :title, translatable_presence: true
       end
     end
   end

data/app/models/decidim/pages/page.rb

@@ -4,13 +4,16 @@ module Decidim
     # The data store for a Page in the Decidim::Pages component. It stores a
     # title, description and any other useful information to render a custom page.
     class Page < Pages::ApplicationRecord
+      include Decidim::Resourceable
+      include Decidim::HasFeature
       include Decidim::Comments::Commentable
 
-      belongs_to :feature, foreign_key: "decidim_feature_id", class_name: Decidim::Feature
-      has_one :organization, through: :feature
+      feature_manifest_name "pages"
 
-      validates :title, :feature, presence: true
-      validate :feature_manifest_matches
+      # Public: Pages doesn't have title so we assign the feature one to it.
+      def title
+        feature.name
+      end
 
       # Public: Overrides the `commentable?` Commentable concern method.
       def commentable?
@@ -19,7 +22,7 @@ module Decidim
 
       # Public: Overrides the `accepts_new_comments?` Commentable concern method.
       def accepts_new_comments?
-         commentable? && !feature.active_step_settings.comments_blocked
+        commentable? && !feature.active_step_settings.comments_blocked
       end
 
       # Public: Overrides the `comments_have_alignment?` Commentable concern method.
@@ -31,13 +34,6 @@ module Decidim
       def comments_have_votes?
         true
       end
-
-      private
-
-      def feature_manifest_matches
-        return unless feature
-        errors.add(:feature, :invalid) unless feature.manifest_name == "pages"
-      end
     end
   end
 end

data/app/views/decidim/pages/admin/pages/_form.html.erb

@@ -1,4 +1,3 @@
 <div class="field">
-  <%= form.translated :text_field, :title, autofocus: true, label: t("models.components.title", scope: "decidim.pages.admin") %>
   <%= form.translated :editor, :body, toolbar: :full, lines: 30, label: t("models.components.body", scope: "decidim.pages.admin")  %>
 </div>

data/app/views/decidim/pages/application/show.html.erb

@@ -1,5 +1,4 @@
 <% add_decidim_meta_tags({
-  title: translated_attribute(@page.title),
   description: translated_attribute(@page.body),
 }) %>
 

data/config/locales/ca.yml

@@ -13,7 +13,6 @@ ca:
         models:
           components:
             body: Cos
-            title: Títol
         pages:
           edit:
             save: Desa la pàgina

data/config/locales/en.yml

@@ -14,7 +14,6 @@ en:
         models:
           components:
             body: Body
-            title: Title
         pages:
           edit:
             save: Save page

data/config/locales/es.yml

@@ -13,7 +13,6 @@ es:
         models:
           components:
             body: Cuerpo
-            title: Título
         pages:
           edit:
             save: Guardar página

data/config/locales/eu.yml

@@ -1,7 +1,20 @@
 eu:
   decidim:
+    features:
+      pages:
+        name: Orrialdea
+        settings:
+          global:
+            comments_enabled: Iruzkin gaituak
     pages:
       admin:
         models:
           components:
-            title: Izenburua
+            body: Testu-gorputza
+        pages:
+          edit:
+            save: Gorde orria
+            title: Editatu orria
+          update:
+            invalid: Erroreak gertatu dira orria gordetzean.
+            success: Orria zuzen gorde da.

data/config/locales/fi.yml

@@ -0,0 +1,22 @@
+fi:
+  decidim:
+    features:
+      pages:
+        name: Sivu
+        settings:
+          global:
+            comments_enabled: Kommentointi sallittu
+          step:
+            comments_blocked: Kommentointi estetty
+    pages:
+      admin:
+        models:
+          components:
+            body: Runko
+        pages:
+          edit:
+            save: Tallenna sivu
+            title: Muokkaa sivua
+          update:
+            invalid: Sivun tallennuksessa oli virheitä.
+            success: Sivu tallennettu onnistuneesti.

data/db/migrate/20170220091402_remove_page_feature_titles.rb

@@ -0,0 +1,5 @@
+class RemovePageFeatureTitles < ActiveRecord::Migration[5.0]
+  def change
+    remove_column :decidim_pages_pages, :title
+  end
+end

data/lib/decidim/pages/engine.rb

@@ -8,6 +8,7 @@ module Decidim
       isolate_namespace Decidim::Pages
 
       routes do
+        resources :pages, only: [:show], controller: :application
         root to: "application#show"
       end
     end

data/lib/decidim/pages/feature.rb

@@ -27,6 +27,10 @@ Decidim.register_feature(:pages) do |feature|
     settings.attribute :comments_blocked, type: :boolean, default: false
   end
 
+  feature.register_resource do |resource|
+    resource.model_class_name = "Decidim::Pages::Page"
+  end
+
   feature.seeds do
     Decidim::ParticipatoryProcess.all.each do |process|
       next unless process.steps.any?
@@ -40,7 +44,6 @@ Decidim.register_feature(:pages) do |feature|
 
       page = Decidim::Pages::Page.create!(
         feature: feature,
-        title: Decidim::Faker::Localized.sentence(2),
         body: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
           Decidim::Faker::Localized.paragraph(3)
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-pages
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-17 00:00:00.000000000 Z
+date: 2017-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -18,28 +18,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.0.6
 - !ruby/object:Gem::Dependency
   name: decidim-comments
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.0.6
 - !ruby/object:Gem::Dependency
   name: rectify
   requirement: !ruby/object:Gem::Requirement
@@ -60,14 +60,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.0.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.0.6
 description: A pages component for decidim's participatory processes.
 email:
 - josepjaume@gmail.com
@@ -98,9 +98,11 @@ files:
 - config/locales/en.yml
 - config/locales/es.yml
 - config/locales/eu.yml
+- config/locales/fi.yml
 - db/migrate/20161116121353_create_decidim_pages.rb
 - db/migrate/20161214150429_add_commentable_to_pages.rb
 - db/migrate/20170110145040_remove_commentable_flag_from_pages.rb
+- db/migrate/20170220091402_remove_page_feature_titles.rb
 - lib/decidim/pages.rb
 - lib/decidim/pages/admin.rb
 - lib/decidim/pages/admin_engine.rb