Skip to content

Commit

Permalink
Fix stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
ItsGenis committed Jan 27, 2017
1 parent af8aab3 commit ddfd257
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 16 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,4 @@

**/spec/*_dummy_app
/public/uploads/*
.DS_Store
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ class Debate < Debates::ApplicationRecord
belongs_to :scope, foreign_key: "decidim_scope_id", class_name: Decidim::Scope
belongs_to :category, foreign_key: "decidim_category_id", class_name: Decidim::Category
has_one :organization, through: :feature
has_many :comments, as: :commentable
has_many :comments, as: :decidim_commentable, class_name: Decidim::Comments::Comment

validate :category_belongs_to_organization
validates :title, presence: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
<article class="card card--debate">
<div class="card__content">
<div class="card__header">
<a href="/debate-view-AMA" class="card__link">
<%= link_to decidim_debates.debate_path(debate), class: "card__link" do %>
<h5 class="card__title"><%= translated_attribute debate.title %></h5>
</a>
<% end %>
</div>
<div class="card__datetime">
<div class="card__datetime__date">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<% content_for :meta_description, debate.description %>
<% content_for :meta_title, debate.title %>
<% content_for :meta_description, translated_attribute(debate.description) %>
<% content_for :meta_title, translated_attribute(debate.title) %>
<% content_for :meta_url, debate_url(debate.id) %>
<% content_for :twitter_handler, current_organization.twitter_handler %>

Expand All @@ -9,13 +9,9 @@
<%== translated_attribute debate.title %>
</h2>
<% if feature_settings.comments_always_enabled || current_settings.comments_enabled %>
<div class="author-data">
<div class="author-data__extra">
<a href="#comments" title="<%= t('.comments') %>">
<%= icon "comment-square", aria_label: t('.comments'), role: "img" %> <%= debate.comments.count %>
</a>
</div>
</div>
<a href="#comments" title="<%= t('.comments') %>">
<%= icon "comment-square", aria_label: t('.comments'), role: "img" %> <%= debate.comments.count %>
</a>
<% end %>
</div>
<div class="row">
Expand Down Expand Up @@ -49,7 +45,7 @@

<% if feature_settings.comments_always_enabled || current_settings.comments_enabled %>
<%= content_for :expanded do %>
<%= comments_for debate, arguable: true, votable: true %>
<%= comments_for debate, arguable: false, votable: true %>
<% end %>
<% end %>

Expand Down
7 changes: 5 additions & 2 deletions engines/decidim-debates/decidim-debates.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,14 @@ Gem::Specification.new do |s|
s.name = "decidim-debates"
s.summary = "A debates component for decidim's participatory processes."
s.description = s.summary
s.version = "0.0.1"
s.authors = ["Josep Jaume Rey Peroy", "Marc Riera Casals", "Oriol Gual Oliva", "Genís Matutes Pujol"]
s.email = ["josepjaume@gmail.com", "mrc2407@gmail.com", "oriolgual@gmail.com", "genis.matutes@gmail.com"]

s.files = Dir["{app,config,db,lib}/**/*", "Rakefile", "README.md"]

s.add_dependency "decidim-core", Decidim.version
s.add_dependency "decidim-comments", Decidim.version
s.add_dependency "decidim-core"
s.add_dependency "decidim-comments"
s.add_dependency "rectify", "~> 0.8"
s.add_dependency "date_validator", "~> 0.9"
s.add_dependency "searchlight", "~> 4.1.0"
Expand Down

0 comments on commit ddfd257

Please sign in to comment.