Commit graph

132 commits

Author SHA1 Message Date
Henne Vogelsang
0fb080441a
Drop redirect_back_or_to helper
This is a thing in ActionController by now
2022-02-23 14:36:07 +01:00
Hiroshi SHIBATA
ae98ac1430
Fixed some typos (#2695)
* Fix typos
2020-10-30 11:06:43 +02:00
Ana María Martínez Gómez
86440cb956
Merge pull request #2578 from rahul2240/master-alias
add booth in alias
2019-08-10 18:41:34 +02:00
Rahul
bf7a7932ba add booth in alias
Booth can be replaced with any alias by replacing it in alias.en.yml.
2019-08-10 21:40:25 +05:30
Rahul
341128c573 update condition to pluck users for booth responsibles
Earlier we used active scope to pluck users for booth responsibles, that allows all users except those whose last seen are 3 months or more and are their is_disabled field is false but now we allow all users except those with is_disabled field false to be booth responsible.
2019-07-21 20:23:04 +05:30
Ana María Martínez Gómez
41d6fad7a5
s/redirect_to :back/redirect_back/
`redirect_to` has been removed in Rails 5.1 in favor of:

```
redirect_back(fallback_location: root_path)
```
2019-05-05 09:40:50 +02:00
snpd
68c3aef86a set multiple to true for speakers 2019-03-13 17:00:55 +05:30
James Mason
43bef689fc Rubocop autocorrections 2018-11-16 09:06:05 -08:00
James Mason
ebdb5cab8c DRY up selectize users helpers
(cherry picked from commit eb38ddc6c761d4920b35499690fd5681f0ea5385)
2018-07-15 07:17:15 +02:00
James Mason
8a422412d6 Simplify helper (and remove alteration of string literal) 2018-05-09 06:54:26 -07:00
James Mason
6d31dfeef4 Add frozen_string_literal magic comment
re: https://www.rubydoc.info/gems/rubocop/RuboCop/Cop/Style/FrozenStringLiteralComment
2018-05-09 06:54:26 -07:00
James Mason
fa55224163 Break up the one-query-of-doom
The single query was producing a tremendously large ActiveRecord allocation.

While this isn't nearly as cool as one query, it's still a significant
reduction in SQL trips, and now has the bonus of only loading what is
actually going to be displayed.
2017-12-22 10:48:55 -08:00
James Mason
b2e1eb5fa9 Generalize get_logo helper for all classes 2017-12-22 10:48:55 -08:00
James Mason
995176ffe5 Fewer queries for for Conference#show
Reduces SQL wait times by >90% on splash pages.
2017-12-22 10:48:55 -08:00
Ronaq13
505d9da3d4 Fix Performance/HashEachMethods offenses
values.each and keys.each methods are depreciated, so they have replaced by
each_value and each_key respectively. This has done manually.

Closes https://github.com/openSUSE/osem/issues/1825
2017-12-18 17:30:37 +01:00
Sidharth
020dae3d49 Fix Style/ReductantReturn rubocop
Exclusions from .rubocop_todo.yml deleted.This cop checks for redundant return expressions.
Fixes #1824
2017-12-04 16:01:18 +05:30
rahul
4785293bf1 Add hint in start and end hour in conference#edit 2017-11-14 17:53:44 +02:00
James Mason
1b8f864feb
Use organization name for title link if available, but link to / 2017-11-07 13:51:10 -08:00
rahul
ac87656f46 Add hint to responsibles 2017-08-27 19:46:02 +03:00
AEtherC0r3
7eea930269 Implement track scheduling
Add track association to schedule
Show schedules in admin sidebar to track organizers
Allow track organizers to manage the schedules of their tracks
Don't allow self-organized track events to be dragged or unscheduled in
a conference schedule
Make scheduled events of self-organized tracks appear semitransparent in
conference schedules
Make the rooms of confirmed self_organized tracks appear semitransparent
and don't allow events to be scheduled to it in the conference schedules
during the dates of its track
Create admin/SchedulesController#new action
Add a button in admin/Schedules#index to create schedules for tracks
Add self_organized scope to Track
Modify Schedules#show to handle track schedules and show a unified
schedule
Allow track organizers to create new schedules for their tracks
Correctly identify scheduled and unscheduled events in Schedules#events
Fix Event#room and Event#time for when the event is scheduled in a track
schedule
Modify Program#selected_event_schedules to include the event_schedules
of selected track schedules
Modify Track#revoke_role_and_cleanup to destroy the track's schedules
and revert its events' state to new
Add tabs for conference and track schedules in admin/Schedules#index
Add button to Create/Show a tracks schedule in Tracks#index and #show
Fix concurrent_events in application_helper because of changes in
Program#selected_event_schedules
Do not take into account cfp_active in Event#valid_track
Modify EventsController#get_tracks accordingly
Enforce cfp_active of track to be enabled for proposals in
ProposalsController#create and #update
Add support for multiple schedules per track
Add selected_schedule_id to Track
Load EventSchedules of selected track schedules for conference schedules
in admin/SchedulesController#show
Modify SchedulesController#show to take into account only the selected
track schedules
Create Event#selected_schedule_id and use it in Event#scheduled? and
Event#time
Validate that an EventSchedule for an event of a self-organized track
belongs to one of the track's schedules
Add 'Manage' button in Tracks#index, #show that sends you to the admin
side of things
Add admin/TracksController#update_selected_schedule to update the
selected_schedule_id of tracks
2017-08-26 00:31:44 +03:00
Nishanth Vijayan
68788ce9fc Show conference changelog
Use load_and_authorize_resource in versions controlller
Add conference specifc route to revision history page
Users with role can view revision_history only for the versions they have access to
Handle versions where conference_id is not set (records before papertrail was introduced)
2017-08-24 10:24:13 +00:00
AEtherC0r3
3d250ecf75 UI/UX changes related to tracks
Add confirmed and cfp_active scopes to Track
Render markdown in track's description
Make the views more similar to the proposal/events views
Change the sequence of columns in admin/Tracks#index
Remove the short_name column from the index views
Add button "My Tracks" in the user menu
Fix track count in proposals
Add details of track in admin/Tracks#show
Use tabs to show track details and events
2017-08-11 16:25:21 +03:00
AEtherC0r3
d9faffc96a Implement track request acceptance
Allow track submitter to request specific dates
Redirect to Tracks#edit if a track doesn't have a room or start/end date
before accepting it

Don't allow the submitter or the track organizers to edit the request
after it has been accepted or confirmed

Restrict track selection in proposals and move track selection from
Proposals form to events helper

Mark cfp_active of the tracks table as not null and fill in true if nil
2017-08-11 16:25:21 +03:00
AEtherC0r3
2f9eb04219 Enable track requests 2017-08-11 16:25:21 +03:00
nasia
f7c0b64eb5 Introduce Booths for admin 2017-07-18 14:18:42 +03:00
Ana María Martínez Gómez
53040b3be9 Merge pull request #1498 from divyanshumehta/issue_1497
Added Style/SpaceInsideBrackets Rubocop cop
2017-06-12 17:45:30 +02:00
selini
9ff3601453 remove unnecessary functions 2017-06-12 12:31:31 +03:00
selini
071ed50acb Hide recent Registrations/Submissions when conference is over 2017-06-12 12:31:31 +03:00
divyanshumehta
1223fef87c Use of rubocop compliant unescaping methods in application_helper.rb 2017-06-11 22:57:52 +05:30
hitman
4fbb7db16b modify event_type function 2017-05-26 15:47:01 +03:00
hitman
c6203a4ed4 rearrange helper functions 2017-05-26 15:47:01 +03:00
hitman
bb0857cbad remove unnecessary includes from ApplicationHelper 2017-05-26 15:47:01 +03:00
hitman
a5d637fcf1 add documentation for each helper 2017-05-26 15:47:01 +03:00
hitman
5dece1ea48 refractor code into different files 2017-05-26 15:47:01 +03:00
hitman
2e0f7e9b42 relocate some functions 2017-05-26 15:47:01 +03:00
hitman
5b1a730e19 rearrange helper functions 2017-05-26 15:47:01 +03:00
hitman
e2657bb10d refractor code into different files 2017-05-26 15:47:01 +03:00
AEtherC0r3
fa56ff7f6d Add helper function for speaker selection
The line '@users = User.all.order(:name)' is replicated a lot of times
in EventsController and ProposalsController.
So, this commit removes it and adds a helper function
'speaker_selector_input' that generates the field where the @users
variable was used.
Also, it makes the query more specific.

Fix #1455

Other changes:
* Include the username in the drop down menu
* Add .active scope to User and corresponding tests
* Add :disabled trait to User factory
2017-05-20 18:27:07 +03:00
hitman
e73baa2754 add validation for name, used and quantity 2017-05-13 18:30:30 +03:00
selini
8a0f3c99b0 Create links for speakers in admin/reports#index 2017-05-10 10:34:45 +03:00
Ana María Martínez Gómez
fd6d0bf39b Merge pull request #1446 from sunny-b/master
Enable Style/DotPosition Rubocop cop
2017-04-07 11:21:34 +02:00
Sunny
03fa299058 enable style/dotposition rubocop cop 2017-04-06 23:19:58 -04:00
gotens1211
73a6e06fd3 Show event time in conference timezone
Added an application helper method `time_with_timezone` to return time with the conference timezone which solves the issue of wrong timezone in `scheule.xml` and `admin/events#show`.

Fixes #1188
2017-03-31 13:13:57 +05:30
Stella Rouzi
cd997c8e88 Merge pull request #1275 from shlok007/intersecting-events
Display concurrent events
2017-03-08 10:51:53 +02:00
shlok007
4dd10d09ad display concurrent events on event#show 2017-03-07 20:56:38 +05:30
hitman
226d16dc63 fix markdown issue 2017-03-06 20:57:04 +05:30
hitman
040db7990b change escape_html: false to true 2017-03-06 18:38:45 +05:30
Christian Bruckmayer
ff65b3b601 Merge pull request #1243 from cniedzwiedz/squash_test
Fixed XSS in markdown() method
2017-03-02 14:01:51 +01:00
gotens1211
ec1adbada8 Removed duplicate methods date_range_string and date_string.
Added tests for date_string function

corrections in the test
2017-03-01 15:39:10 +05:30
shlok007
a2b3396897 rename intersecting_events to intersecting_event_schedules 2017-02-12 19:10:03 +05:30