Commit graph

1479 commits

Author SHA1 Message Date
AEtherC0r3
02d75ec729 Fix registration sorting
Sort the 'Actions' column by registration.attended
2017-06-03 12:37:56 +03:00
Agrim Mittal
255744268b shift relevant functions to versions_helper 2017-05-26 15:47:01 +03:00
Agrim Mittal
b4c2eeb772 change name to versions_helper 2017-05-26 15:47:01 +03:00
hitman
60afb2a474 refractor can_manage_volunteers? 2017-05-26 15:47:01 +03:00
hitman
dbffece956 remove !! from can_manage_volunteers 2017-05-26 15:47:01 +03:00
hitman
4fbb7db16b modify event_type function 2017-05-26 15:47:01 +03:00
hitman
b36d02ceec change to can_manage_volunteers? 2017-05-26 15:47:01 +03:00
hitman
85fa39870d relocate some functions 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
d9925f00e9 add volunteers helper 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
divyanshumehta
4824537aeb Added Rails/Delegate Rubucop Cop 2017-05-23 10:31:40 +05:30
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
Sergio Lindo Mansilla
207b3611c6 Change too bright color to matte
- The bright colors makes the labels unreadable on some screens.
2017-05-15 15:49:19 +02:00
Chaitanya
008ccf8b6d Add user path to Attendee and Speaker avatar in registration show page
Avatars of attendee and speaker are not linked to respective attendee and speaker. Add user path to each avatar to give more information of attendee and speaker
2017-05-13 22:14:57 +03:00
hitman
e73baa2754 add validation for name, used and quantity 2017-05-13 18:30:30 +03:00
Siddhant Bajaj
53a2246ff2 Fixed issue in notification drop down menu
Fixed an indentation issue in notification drop down layout.
2017-05-13 17:48:05 +03:00
AEtherC0r3
fdff485b3e Allow confirmed speakers to register anytime
If the registration period is over then speakers of confirmed events
can't register anymore. They should be able to, since they are gonna be
there anyway.

* Allow the speakers of confirmed events to register regardless of the
registration period
* Provision for registrations of confirmed speakers, so as not to
exceed the registration limit
* Add scope for registered speakers

Fix #829 and fix #802
2017-05-13 17:47:22 +03:00
Siddhant Bajaj
1c12200003 Fixed paper trail inconsistent results for numeric values
There is a known issue in paper_trail that whenever we Query the
'versions.object' column it evaluates inconsistent results for numeric
values due to limitations of SQL wildcard matchers against the
serialized objects. So to fix this issue I have manually formed the where
query instead of using where_object and where_object_changes. I have
also added test for the same.
Fixes #1307
2017-05-11 14:01:52 +03:00
Ana María Martínez Gómez
0aff947f05 Fix haml-lint error
The error was introduced when merging

https://github.com/openSUSE/osem/pull/1469

as a offense was introduced since the tests there were run
and the PR got merged.
2017-05-11 11:59:33 +02:00
selini
8a0f3c99b0 Create links for speakers in admin/reports#index 2017-05-10 10:34:45 +03:00
Eugene Dubinin
93404d543f implement user creation by admin 2017-05-08 22:54:02 +03:00
divyanshumehta
f057900fb1 Added link to lodging section in splashpage's navbar 2017-05-08 15:28:28 +03:00
Siddhant Bajaj
7ff34c5b23 Added relation between EventSchedule and program model
Program has many event_schedules through schedules
2017-04-25 18:00:24 +05:30
Siddhant Bajaj
7ce816e146 Fixed DeleteEventSchedules issue
Issues with DeleteEventSchedules method in conference controller:
1.It deletes EventSchedules of all the conferences that are not in the
hours range. Instead it should delete EventSchedules of those events
only that belong to that particular conference only.
2.If we set invalid start or end hour attribute of a conference then
also EventSchedules gets deleted even though conference is not
successfully updated.
Fixed both the issues and added test for the same.
2017-04-25 18:00:24 +05:30
David Sedeño
ec71b111fe Add description to xml. fixes #1435 2017-04-25 13:35:09 +03:00
Ana María Martínez Gómez
8dbe9ceb01 Merge pull request #1337 from siddhantbajaj/Validation
Added validation in EventSchedule model
2017-04-24 10:55:43 +02:00
nasia
a6e8283bcf Fix commercial option for users in dashboard#show #1390 2017-04-24 10:16:39 +03:00
Siddhant Bajaj
95d459f058 Added validation in EventSchedule model and test in event_schedule_spec
EventSchedule start time should be in hours range of the conference.Therefore it adds validation on start_time attribute of event schedule model. It also adds test for the same.
2017-04-22 01:20:05 +05:30
Ana María Martínez Gómez
be33f345a1 Merge pull request #1306 from siddhantbajaj/Confirmed_Events
fixed Confirmed Scheduled Events issue
2017-04-18 15:37:54 +02:00
Siddhant Bajaj
cd9f329939 Fixed Confirmed Scheduled Events issue
Fixed issues with scheduled_event_distribution method in conference.rb
and added test in conference_spec.rb to confirm issue is fixed.
Fixes #1302
2017-04-18 18:30:42 +05:30
gotens1211
3ead7ef586 Removed the extra condition for displaying the first speaker image
Removed the if statement in schedule_item.html.haml file which was generating an extra img_tag for the first speaker

Fixes #1454
2017-04-17 17:40:23 +05:30
Stella Rouzi
92cb010cc6 Merge pull request #1448 from nasia-sam/cfp_access_to_schedule
Add permission to access admin/shedule by cfp #1432
2017-04-14 17:14:21 +03:00
nasia
11938025cf Add permission to access admin/shedule by cfp#1432 2017-04-13 20:45:19 +03:00
Eugene Dubinin
790e2fd3a2 implement manual event management and support for multiple speakers per event 2017-04-13 17:15:21 +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
nasia
7497d0394e Fix Splashpages#show so it matches splashpages#edit 2017-04-05 19:18:17 +03:00
gotens1211
eb1e8ed238 Changed the default state of components in splashpage to selected
Mark the splashpage components to checked for the new action, also modified the display changes in splashpages test

Fixes #1340
2017-04-05 17:11:11 +05:30
Christian Bruckmayer
dae9aca2c5 Merge pull request #1434 from nasia-sam/admin_resources
Fix admin/resources inherit
2017-04-05 13:17:31 +02:00
nasia
6414631a32 Fix admin/resources inherit 2017-04-04 21:30:16 +03:00
Eugene Dubinin
b7bdb29cbe use flash.now instead of flash where page is rendered in the same controller methods 2017-04-03 20:15:51 +03:00
Stella Rouzi
d90d2344d6 Merge pull request #1423 from nikhilgupta1211/splashpage
Added Include Venue and Lodgings to the Splashpage components
2017-04-03 13:59:44 +03:00
Ana María Martínez Gómez
f3e712a1bc Merge pull request #1319 from JewelSam/master
#1220 adding the cell size attribute to the database
2017-04-03 10:23:49 +02:00