diff --git a/app/controllers/topics_controller.rb b/app/controllers/topics_controller.rb index b2d698e41..71794ffe7 100644 --- a/app/controllers/topics_controller.rb +++ b/app/controllers/topics_controller.rb @@ -1,4 +1,5 @@ class TopicsController < ApplicationController + # include CommentableActions before_action :set_community diff --git a/app/views/topics/_topics.html.erb b/app/views/topics/_topics.html.erb index 689178143..26ac9cac8 100644 --- a/app/views/topics/_topics.html.erb +++ b/app/views/topics/_topics.html.erb @@ -6,6 +6,10 @@ <% topics.each do |topic| %>
<%= link_to topic.title, community_topic_path(@community, topic) %> +
+ <%= topic.author.name %> +
+ <%= I18n.l topic.created_at %> <% if topic.author == current_user %> <%= link_to t("topic.edit"), edit_community_topic_path(@community.id, topic), class: 'button expanded' %> <% end %> diff --git a/app/views/topics/new.html.erb b/app/views/topics/new.html.erb index c6620a396..d420e730f 100644 --- a/app/views/topics/new.html.erb +++ b/app/views/topics/new.html.erb @@ -1,5 +1,6 @@
+ <%= render "shared/back_link" %>

<%= t("topic.create") %>

<%= render '/topics/form' %> diff --git a/db/migrate/20170807082243_create_topics.rb b/db/migrate/20170807082243_create_topics.rb index 3af567279..5c554ee88 100644 --- a/db/migrate/20170807082243_create_topics.rb +++ b/db/migrate/20170807082243_create_topics.rb @@ -4,6 +4,7 @@ class CreateTopics < ActiveRecord::Migration t.string :title, null: false t.integer :author_id t.references :community, index: true + t.timestamps null: false end end end diff --git a/db/schema.rb b/db/schema.rb index 7c29bccb9..1dd51131d 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -891,9 +891,11 @@ ActiveRecord::Schema.define(version: 20170807082243) do add_index "tags", ["spending_proposals_count"], name: "index_tags_on_spending_proposals_count", using: :btree create_table "topics", force: :cascade do |t| - t.string "title", null: false - t.integer "author_id" - t.integer "community_id" + t.string "title", null: false + t.integer "author_id" + t.integer "community_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false end add_index "topics", ["community_id"], name: "index_topics_on_community_id", using: :btree