Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes several multipart question errors #220

Closed
wants to merge 1 commit into from
+7 −7
Closed

Fixes several multipart question errors #220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/views/multipart_questions/_form.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
},
success: function(result) { eval(result); },
helper: fixHelper
}).disableSelection();
});
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This fixes firefox being unable to use the add part "select" inputs.

}
$(document).ready(makeSortable());
<% end %>
Expand Down
6 changes: 3 additions & 3 deletions app/views/multipart_questions/_one_kind_part_dependencies.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
<div style="float:left">
<%= text %>
<span class="<%= common_id_class %>">
(<%= link_to "Change", nil, :remote=>true,
:onclick => "$('.#{common_id_class} %>').toggle();" %>)</span>:
(<%= link_to "Change", "" , :remote=>true,
:onclick => "$('.#{common_id_class}').toggle();" %>)</span>:
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This fixes #219.

Also fixes error in console when clicking (Change), then Add, then clicking (Change) again.


<% used_question_ids = [] %>

Expand Down Expand Up @@ -48,4 +48,4 @@
<% end %>
</div>
<% end %>
</div>
</div>
6 changes: 3 additions & 3 deletions app/views/multipart_questions/_pair_with_x.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@

<%= question_id_text_no_version(pair.independent_question) %>
<span class="<%= form_id_class %>" style="display:none">
<% form_tag question_dependency_pair_path(pair),
<%= form_tag question_dependency_pair_path(pair),
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This fixes the X's for removing question dependencies not being there.

:method => "delete",
:style => "display:inline",
:remote => true do %>
<%= hidden_field_tag :question_part_id, part.id %>
<%= submit_tag "",
:style => "border:none; background-color:white; display:inline; margin: -3px",
:style => "border:none; background-color:white; display:inline; margin: -3px; padding: 0px;",
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a fix to make the X button not look terrible.

:class => "ui-icon ui-icon-closethick",
:confirm => "Are you sure you want to remove " +
question_id_text_no_version(pair.independent_question) +
" as a #{pair.is_requirement? ? "prerequisite" : "support"}?" %>
<% end %>
</span>
</span>