andis/fetsite
1
0
Fork 0
forked from bofh/fetsite
Code Issues Pull Requests Releases Wiki Activity

AutoCommit Mon Aug 10 13:03:04 CEST 2015

Browse Source
This commit is contained in:
Andreas Stephanides
2015-08-10 13:03:04 +02:00
parent cb73bbfa43
commit 3835c0e773
6 changed files with 115 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/views/survey/choices/_choice.html.erb
View File

@@ -2,7 +2,7 @@
<%= div_tag_for(choice) do %>
<%
if current_user.nil?
unless can?(:answer,choice.question)
t=choice.text
else
value=(current_user.id.nil?)? false : choice.answers.where(user_id: current_user.id).count>0
@@ -13,7 +13,7 @@ end
%>
<%= t %> <%= link_to fa_icon("pencil"), edit_survey_choice_path(choice) , class: "btn btn-link navbar-btn" , remote: true
<%= t %> <%= link_to fa_icon("pencil"), edit_survey_choice_path(choice) , class: "btn btn-link navbar-btn" , remote: true if can? :edit, choice
%>
<%= link_to fa_icon("trash"), survey_choice_path(choice) , class: "btn btn-link navbar-btn" , remote: true , method: :delete, data: { confirm: 'Are you sure?' } %>
<%= link_to fa_icon("trash"), survey_choice_path(choice) , class: "btn btn-link navbar-btn" , remote: true , method: :delete, data: { confirm: 'Are you sure?' } if can? :delete,choice %>
<% end %>

13
app/views/survey/questions/_question.html.erb
View File

@@ -1,4 +1,4 @@
<% if current_user.nil? %>
<% unless can?(:answer,question) %>
<%= div_tag_for(question) do%>
<%= render partial: "survey/questions/answeredquestion", object: question unless question.flag_delete%>
<% end %>
@@ -7,16 +7,19 @@
<div >
<b><%= question.title%></b>
<%= question.text %>
<%= link_to fa_icon("pencil"), edit_survey_question_path(question) , class: "btn btn-link navbar-btn" , remote: true %>
<%= flag_link(question, "delete")%>
<%= flag_link(question, "template")%>
<%= link_to fa_icon("pencil"), edit_survey_question_path(question) , class: "btn btn-link navbar-btn" , remote: true if can? :edit, question %>
<%= flag_link(question, "locked") %>
<%= flag_link(question, "template") %>
<%= flag_link(question, "delete") %>
<% unless question.flag_delete %>
<ul class="choice-list">
<% question.choices.each do |c| %>
<li><%= render c %></li>
<% end %>
</ul>
<%= link_to "+" , new_survey_choice_path(params:{question_id: question.id}), remote: true%>
<%= link_to "+" , new_survey_choice_path(params:{question_id: question.id}), remote: true if can? :edit, question %>
<% end %>
</div>
<%= render partial: "survey/questions/answeredquestion", object: question if question.answers.where(user_id: current_user.id).count>0 unless question.flag_delete %>