Commit graph

18 commits

Author SHA1 Message Date
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
AEtherC0r3
36b8088726 Replace submitter with speakers in reports#index
Also, in events#show and proposals#index

It is more relevant to check if the speakers have registered to the
conference and filled their biographies than the submitter, because,
there can be multiple speakers and the submitter isn't necessarily one
of them

And, remove admin/events/reports.html.haml, since, it isn't used anymore

Fix #1477, fix #1479
2017-05-20 18:26:45 +03:00
Eugene Dubinin
790e2fd3a2 implement manual event management and support for multiple speakers per event 2017-04-13 17:15:21 +03:00
divyanshumehta
1ca448df6f Changed Ruby syntax in views. Fixed #1326 2017-03-20 18:27:39 +05:30
Stella Rouzi
56c7906d52 Merge pull request #1338 from nasia-sam/change_date_format
changed date format in proposals#show
2017-03-08 11:08:24 +02:00
Stella Rouzi
cd997c8e88 Merge pull request #1275 from shlok007/intersecting-events
Display concurrent events
2017-03-08 10:51:53 +02:00
nasia
c7e6fb42b7 changed date format in proposals#show 2017-03-07 21:21:00 +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
JewelSam
56c69f51b7 #1040 Show email in public option 2017-02-14 17:54:31 +03:00
BelieveC
c38cabe06e Fixes #1260, Changes behavior of proposal update page requirement field 2017-02-09 01:50:50 +05:30
Nishanth Vijayan
5111d9e937 Extract checking if event is replacement to event_schedule model 2017-01-20 18:54:56 +02:00
Nishanth Vijayan
9c7591adcd Add cancel/replacement labels in All Events
Extract replacement/canceled label & notice logic to helpers

Join replacement/canceled label and notice and move to top
2017-01-20 18:54:35 +02:00
Sherri Mitchell
ee91e72440
Add Open Graph metadata to event#show 2016-12-20 12:35:57 +01:00
Stella Rouzi
d07de3ca88 Merge pull request #1210 from jmks/proposals-event-type-description
Fix event type description display on proposals#new and proposals#edit
2016-11-24 19:05:32 +02:00
Nishanth Vijayan
8a0ce67daa Check if commercial has versions before displaying commercial creator 2016-11-22 10:33:32 +05:30
jmks
77cbbc1919 Fix event type description display on proposals#new and proposals#edit 2016-10-05 12:52:20 -04:00
richiethomas
daf1f805bd Rename 'ConferenceController' to 'ConferencesController', and 'ProposalController' to 'ProposalsController' 2016-09-30 18:49:44 -04:00