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.

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

Sortable lists #1559

Merged
merged 13 commits into from
Jul 15, 2014
Merged

Sortable lists #1559

merged 13 commits into from
Jul 15, 2014

Conversation

arkon
Copy link
Contributor

@arkon arkon commented Jul 3, 2014

Deals with being able to reorder the annotation categories list (issue #80).

Also replaces the mechanism used for rubrics with a jQuery-based one (as opposed to a deprecated Rails method).

@david-yz-liu
Copy link
Contributor

Got this error in functional tests:

/var/lib/gems/1.9.1/gems/activesupport-3.2.18/lib/active_support/dependencies.rb:251:in `require': /home/david/Documents/Markus/test/functional/rubrics_controller_test.rb:399: syntax error, unexpected $end, expecting keyword_end (SyntaxError)
    from /var/lib/gems/1.9.1/gems/activesupport-3.2.18/lib/active_support/dependencies.rb:251:in `block in require'
    from /var/lib/gems/1.9.1/gems/activesupport-3.2.18/lib/active_support/dependencies.rb:236:in `load_dependency'
    from /var/lib/gems/1.9.1/gems/activesupport-3.2.18/lib/active_support/dependencies.rb:251:in `require'
    from /var/lib/gems/1.9.1/gems/rake-10.3.2/lib/rake/rake_test_loader.rb:10:in `block (2 levels) in <main>'
    from /var/lib/gems/1.9.1/gems/rake-10.3.2/lib/rake/rake_test_loader.rb:9:in `each'
    from /var/lib/gems/1.9.1/gems/rake-10.3.2/lib/rake/rake_test_loader.rb:9:in `block in <main>'
    from /var/lib/gems/1.9.1/gems/rake-10.3.2/lib/rake/rake_test_loader.rb:4:in `select'
    from /var/lib/gems/1.9.1/gems/rake-10.3.2/lib/rake/rake_test_loader.rb:4:in `<main>'

@arkon
Copy link
Contributor Author

arkon commented Jul 9, 2014

@david-yz-liu The test was fixed, by the way (accidentally deleted an end).

@david-yz-liu
Copy link
Contributor

Now getting two errors:

test_: An admin on :add_annotation_category should with error on save. (AnnotationCategoriesControllerTest):
NoMethodError: undefined method `+' for nil:NilClass
    /home/david/Documents/Markus/app/controllers/annotation_categories_controller.rb:24:in `add_annotation_category'

test_: An authenticated and authorized admin doing a POST should be able to update_positions. (FlexibleCriteriaControllerTest):
NoMethodError: undefined method `each' for nil:NilClass

@arkon
Copy link
Contributor Author

arkon commented Jul 11, 2014

@david-yz-liu Those tests should be fine now!

@david-yz-liu
Copy link
Contributor

Cool, looks good except the text selection bug that we just talked about.

@arkon
Copy link
Contributor Author

arkon commented Jul 15, 2014

@david-yz-liu I've prevented text selection and also fixed an issue where dragging again before an AJAX call was complete would break the sortable list.

david-yz-liu pushed a commit that referenced this pull request Jul 15, 2014
Fixes #80. Warning: will require database migration.
@david-yz-liu david-yz-liu merged commit 9137e89 into MarkUsProject:master Jul 15, 2014
@arkon arkon deleted the sortable-lists branch July 15, 2014 15:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants