Commit graph

104 commits

Author SHA1 Message Date
nasia
c6b0a1f52e Add tests for booth controller 2017-07-21 17:34:05 +03:00
nasia
f7c0b64eb5 Introduce Booths for admin 2017-07-18 14:18:42 +03:00
nasia
b86472ac3c Add Call for Booths 2017-07-14 15:14:25 +03:00
AEtherC0r3
68fc750e9f Implement track requests and add the track organizer role
About track requests:
Create migration that adds the fields submitter_id, state, and
cfp_active to Tracks
Add validations and the self_organized? method to the Track model
Create a new TracksController outide of the admin namespace
Create the relevant views for index, show, new and edit
Modify the admin views for tracks to include extra info for
self-organized tracks

About track organizers:
Create the role when a self-organized track is created
Define track organizer abilities
Modify the roles views and controller to handle the new role

The route for Roles#edit needs to have higher priority than the nested
routes for track roles, otherwise, the word edit in the url is matched
as a track with short_name edit
2017-07-14 12:38:53 +03:00
siddhantbajaj
dd52a9b2ab Make ticket layout configurable
Added option for conference organizer to switch between ticket layouts (horizontal or vertical). Added test for the same.
2017-07-07 14:19:51 +05:30
AEtherC0r3
95fbd10153 Friendly urls for tracks
Don't use tracks ids in urls
Add short_name to tracks and use that in urls as the identifier
2017-07-04 20:42:10 +03:00
AEtherC0r3
a1124546f1 Fix rspec tests because of the changes to the cfp
Remove redundant association
Note: a conference created with :full_conference already has a cfp
2017-06-27 21:16:46 +03:00
Siddhant Bajaj
d7678b2fa0 Added model test
Added test for physical ticket model.
2017-06-22 19:51:08 +05:30
shlok007
8edf896d86 introduce organizations 2017-06-12 19:43:44 +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
Siddhant Bajaj
23473e1476 Added hour transient attribute to event_scheduled factory
It allows event_scheduled to be created with custom time.
2017-04-22 01:28:49 +05:30
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
Eugene Dubinin
790e2fd3a2 implement manual event management and support for multiple speakers per event 2017-04-13 17:15:21 +03:00
Christian Bruckmayer
ff65b3b601 Merge pull request #1243 from cniedzwiedz/squash_test
Fixed XSS in markdown() method
2017-03-02 14:01:51 +01:00
Ana
b80aff3cce Add times to Conference
Add start hour and end hour to conference to be able to make the schedule times changeable
2017-02-22 09:09:29 +01:00
shlok007
3065766da9 ability to track resources used in conference 2017-02-07 14:58:45 +05:30
Chris Niedzwiedz
d2e177cac4 Testing if I can squash this way (#1)
* Fixed XSS resulting from markdown() method
2017-01-09 12:27:11 -06:00
Hernán Schmidt
32019a11e1 Merge pull request #1108 from rishabhs95/stripe
Online payment feature - direct stripe integration
2016-08-18 16:04:11 +02:00
Rishabh Saxena
5c21d1c4d9 add Payment#purchase tests 2016-08-15 10:59:35 +05:30
Rishabh Saxena
1f9338735c improve Stripe error rescue. modify tests. 2016-08-15 10:59:34 +05:30
Rishabh Saxena
52c30af642 generalise application icon for Stripe iFrame 2016-08-15 10:59:34 +05:30
Rishabh Saxena
7b23018a06 add payment tests 2016-08-15 10:59:34 +05:30
Nishanth Vijayan
a45e537bac Setup basic Revision History page
Sets up paper_trail tracking in important models

and add conference_id to versions for storing conference_id
of conference related objects  as metadata.This will help in querying
for versions related to conferences.

Fix issues with factories & event types initialization.Import paper_trail testing helpers
Fix bug: Creating an event creates a useless version with event update

Add revert and view changes features to revision history
2016-08-12 13:35:56 +05:30
Ana
5001848af7 Introduce an Admin::EventScheduleController
- move SchedulesController#update action
- split it into an #create/#update and #destroy action and use these actions in the JS code
2016-08-11 15:11:27 +02:00
Ana
beb17165a2 Introduce an association for the selected_schedule
Association in Program fot the selected_schedule
2016-08-11 15:11:27 +02:00
Ana
e7a30302ff Tests for the new associations and models
Tests for the schedule versioning new associations and models
2016-08-11 15:06:52 +02:00
Ana
0deaf1abc7 Different colors for new tracks, types and levels
Every time a new track, event type or difficulty level is created, the color picker has a different color by default.

Closes https://github.com/openSUSE/osem/issues/1077
2016-07-11 13:46:01 +02:00
Stella Rouzi
8a595e6284 add test 2016-06-15 20:54:51 +03:00
Henne Vogelsang
084ee7ef43 Give a bit more demo info in the conference description 2016-05-03 16:25:39 +02:00
Henne Vogelsang
5b20c992ae Let activerecord handle the picture upload in factories 2016-05-03 16:25:39 +02:00
Henne Vogelsang
4c4918a7a7 Somehow the :venues factory creates a dangling Conference
disabling for now
2016-05-03 16:25:39 +02:00
Henne Vogelsang
45bd31fad0 Escape HTML some factory strings 2016-05-03 16:25:07 +02:00
Henne Vogelsang
8fa92b72d1 HTML escape Faker::Hipster.paragraph 2016-05-02 16:06:32 +02:00
Henne Vogelsang
40562334c7 Make rubocop happy again 2016-05-02 16:06:32 +02:00
Henne Vogelsang
77e0340387 Make use of fake data in factories 2016-05-02 16:06:27 +02:00
Henne Vogelsang
8fc57e34c9 Adapt the spec 2016-04-27 17:55:24 +02:00
Stella Rouzi
01ec43e53a Registration for Events 2016-04-26 16:11:40 +03:00
Stella Rouzi
b9e10922ee drop dietary choices, social events, and html_export_path 2016-04-09 16:29:20 +03:00
Aditya Prakash
3e32c58460 Allow submission of proposal only if program has cfp 2016-03-18 09:18:05 +05:30
Aditya Prakash
0619eb7963 Enforce non-admin attribute of user factory
Change in other specs to match the new factory setup.
2016-03-14 17:29:33 +05:30
Stella Rouzi
81c82466f8 Add tests for Event. Remove redundant function 'def week' from Event. 2016-03-04 19:46:25 +02:00
Stella
ccd7ecbb90 Roles into their own controller. Rework interface. Add flash messages to ajax calls. Add description to roles. Possible to edit roles in use. 2016-03-01 17:10:45 +02:00
David Sedeño
28fbc518f3 Add registration_limit to conference model. Added the input for registration limit in the edit conference form. In the controller, if the limit has exceeded redirect to root_path with an alert. fix #761 2016-02-10 15:59:39 +01:00
Stella Rouzi
f840f2b3f0 Rooms belong to venue 2016-02-06 17:43:51 +01:00
Stella Rouzi
444356fbc7 Introduce Program to include cfp/rooms/tracks/events/event_types/difficulty_levels 2016-02-06 17:42:51 +01:00
chrisbr
23664119bd Implement simplified commercials workflow
It's now possible to simply enter the url of the third party provider to enter a commercial.
2016-01-21 19:41:12 +01:00
raluka
3d57203727 added more consistency for email_settings 2015-10-14 15:34:23 +02:00
raluka
0c4b0b4ac1 Refactored EmailSetting incosistency. Fixes #603 2015-10-06 11:32:40 +02:00
raluka
37339dccc1 refactored comments_controller tests; fixed access to Administration link into user_menu view 2015-09-17 12:13:22 +02:00
raluka
a9a43d726f WIP created tests for comments_controller.rb 2015-09-17 12:13:22 +02:00