diff --git a/app/views/topics/_topic.html.erb b/app/views/topics/_topic.html.erb index d2036e51..6dd5af7d 100644 --- a/app/views/topics/_topic.html.erb +++ b/app/views/topics/_topic.html.erb @@ -5,6 +5,11 @@ #%> <%= div_for topic do %> + + <% if topic.authorize_to_edit(user) %> +
+ <% end %> +
<% if topic.user == user %><%= link_to 'Delete', topic_path(topic), :class => 'delete', :confirm => 'Delete this topic and all synapses linking to it?', :method => :delete, :remote => true%><% end %> @@ -59,4 +64,8 @@
+ + <% if topic.authorize_to_edit(user) %> +
+ <% end %> <% end %> diff --git a/config/database.yml.default b/config/database.yml.default new file mode 100644 index 00000000..6705ca8f --- /dev/null +++ b/config/database.yml.default @@ -0,0 +1,21 @@ +development: + min_messages: WARNING + adapter: postgresql + host: 127.0.0.1 + port: 5432 + encoding: unicode + database: metamap002_development + pool: 5 + username: postgres + password: "3112" + +production: + min_messages: WARNING + adapter: postgresql + host: ec2-107-21-107-194.compute-1.amazonaws.com + port: 5432 + encoding: unicode + database: ddcrn2lgphjk9k + pool: 5 + username: qqpckkahytovwv + password: "njeP6cMA8EjM9ukHk9s3ReOdy7"