Made initial commits for new moderation user interface: added moderate buttons to submissions#index, added popup forms, wired up actions
Made initial commits for new moderation user interface: added moderate buttons to submissions#index, added popup forms, wired up actions
Fixing unmerged path
Merge branch 'new_moderation_ui' of github.com:concerto/concerto into new_moderation_ui
Made initial commits for new moderation user interface: added moderate buttons to submissions#index, added popup forms, wired up actions
Fixing merge conflicts
Fixing Gemfile.lock merge conflict
Turned moderate_form into a remote; added update.js.erb for submissions_controller; wired up transitions so that approve and deny happen using ajax
Made initial commits for new moderation user interface: added moderate buttons to submissions#index, added popup forms, wired up actions
Resolving Gemfile.lock merge conflict
Turned moderate_form into a remote; added update.js.erb for submissions_controller; wired up transitions so that approve and deny happen using ajax
Merge branch 'new_moderation_ui' of github.com:concerto/concerto into new_moderation_ui
Removed moderate_form partial (changed to moderate_tile_form); began to wire up Approve and Deny from submissions#show. Please note that Deny is currently NOT FUNCTIONAL from the submissions#show view - need to figure out how to properly submit the form along with the parameters.
For #729, restructured approach on submissions#show for moderation to use form submit buttons. This still does not work fully due to: 1) the moderation_flag needs to be updated depending on whether the approve or deny button is clicked; 2) duration and moderation_reason are not being sent alongside the form submit to submissions#update
Made initial commits for new moderation user interface: added moderate buttons to submissions#index, added popup forms, wired up actions
Fixing merge conflict on Gemfile.lock
Turned moderate_form into a remote; added update.js.erb for submissions_controller; wired up transitions so that approve and deny happen using ajax
Fixing merge conflict on _moderate_form
Removed moderate_form partial (changed to moderate_tile_form); began to wire up Approve and Deny from submissions#show. Please note that Deny is currently NOT FUNCTIONAL from the submissions#show view - need to figure out how to properly submit the form along with the parameters.
For #729, restructured approach on submissions#show for moderation to use form submit buttons. This still does not work fully due to: 1) the moderation_flag needs to be updated depending on whether the approve or deny button is clicked; 2) duration and moderation_reason are not being sent alongside the form submit to submissions#update