Commit graph

914 commits

Author SHA1 Message Date
Nishanth Vijayan
f02aaac81e Show an event's missing info in event#show 2016-08-21 15:41:34 +05:30
Nishanth Vijayan
48828f8930 Display who added commercial for event
Activate versioning for tests

The tests were failing because of the lack of versioning.By default, versioning is off for tests.
As a result, here (app/views/proposal/_form.html.haml L43) commercial,versions.last returns nil as there are no versions.
2016-08-20 14:21:21 +05:30
Rishabh Saxena
54ad0628b4 admin/tickets: correct ticket_purchase quantity 2016-08-18 23:27:30 +05:30
Hernan Schmidt
9eb4ac2738 Fix campaign features to work with MySQL 2016-08-18 18:32:41 +02: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
Stella Rouzi
99992750bb Merge pull request #1128 from nishanthvijayan/event-changelog
Improve event history page
2016-08-16 18:23:56 +03:00
Stella Rouzi
10121ae6d0 Merge pull request #1110 from jmks/ichain-signin-page-layout
Updated layout of ichain sign in page
2016-08-16 13:48:57 +03:00
shlok007
c50e8c0466 Implemented ability of admins to manually confirm users 2016-08-16 02:23:41 -04:00
Rishabh Saxena
060d65c430 views/_payment: decrease script indentation 2016-08-16 00:43:48 +05:30
Nishanth Vijayan
e2659ae907 Show changes to event commercials in event changelog 2016-08-15 18:18:03 +05:30
Nishanth Vijayan
0a3466ca7c Move shared version partials to views/shared 2016-08-15 18:17:59 +05:30
Nishanth Vijayan
c80f37f3ff Change look of event history page similar to changelog 2016-08-15 16:48:10 +05:30
Stella Rouzi
86ba2d005e Merge pull request #1019 from nishanthvijayan/changelog
Changelog/Revision History page
2016-08-15 14:16:12 +03:00
Rishabh Saxena
164101f2fe change "purchase" to "get" in views 2016-08-15 10:59:36 +05:30
Rishabh Saxena
6aecf2d446 modify conference registration view message 2016-08-15 10:59:36 +05:30
Rishabh Saxena
261d7dd0de improve flash error collection
improve views
2016-08-15 10:59:36 +05:30
Rishabh Saxena
922440fb77 improve payment view styling 2016-08-15 10:59:35 +05:30
Rishabh Saxena
4b0a5b1125 move params merge to private method 2016-08-15 10:59:35 +05:30
Rishabh Saxena
a9ab1186f8 change rails initialisation.
repair abilities. add ticket purchasing check.
2016-08-15 10:59:35 +05:30
Rishabh Saxena
112d2c6fff change camel case variable to ruby style. 2016-08-15 10:59:35 +05:30
Rishabh Saxena
52c30af642 generalise application icon for Stripe iFrame 2016-08-15 10:59:34 +05:30
Rishabh Saxena
ab262ecb46 add payment views and styling 2016-08-15 10:59:34 +05:30
Rishabh Saxena
1894cea975 modify ticket purchases view 2016-08-15 10:59:33 +05:30
Rishabh Saxena
92dc0edff2 modify registration view and controller 2016-08-15 10:59:33 +05:30
Christian Bruckmayer
308c15f0ff Merge pull request #1127 from Ana06/markdown
Markdown
2016-08-12 11:55:05 +02:00
Ana
eee4e4f22c Add markdown to users biography
Closes https://github.com/openSUSE/osem/issues/1090
Closes https://github.com/openSUSE/osem/issues/701
2016-08-12 11:38:28 +02:00
Ana
72cd463dc7 Add markdown to events abstract 2016-08-12 11:38:28 +02:00
Ana
1636b458ee Inform that there are no rooms in the schedule
Inform that there are no rooms when creating the schedule with a message instead of creating a room with the title "No rooms". The message also include a link to the place where rooms are created.
2016-08-12 11:33:49 +02:00
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
jmks
49121873c1 Replaced double quotes with single 2016-08-11 10:33:16 -04:00
Ana
0e9b8b598f Use jquery-ui-rails gem 2016-08-11 15:11:27 +02:00
Ana
5761e0f7a4 Using flash instead of alerts in the schedule
Using flash instead of alerts in the schedule to notify errors.

Also, a message shown when a schedule is successfully created.
2016-08-11 15:11:27 +02:00
Ana
81108290e5 Schedule update moved to program update
Schedule update updated a program attribute
2016-08-11 15:11:27 +02:00
Ana
c469f4f415 Event schedule controller pluralized 2016-08-11 15:11:27 +02:00
Ana
33e9c86214 Selected_scheduled? helper added
To be used in Schedules#index
2016-08-11 15:11:27 +02:00
Ana
29b920d746 Corrections in SchedulesController
- Controler file name pluralized
- Load and authorization fixed and improved
- Consider that save can fail in create action
- Eliminate unnecessary if in update action
- Ability and tests related to the schedules link in the admin sidebar fixed
2016-08-11 15:11:27 +02:00
Ana
2e1cd164a4 Load event schedule fixed
It was needed to use the id instead of the guid in the html attributes of the events in the admin schedule
2016-08-11 15:11:27 +02:00
Ana
57d2a05b7f Use of Rails usl helper instead of interpolation
I also eliminated a duplicated attribute in params
2016-08-11 15:11:27 +02:00
Ana
a578167cf5 Event model improvements
- Drop selected_event_schedule function
- Rename scheduled_room and scheduled_start_time to room and time as if there is no selected_schedule, the event is not scheduled.
2016-08-11 15:11:27 +02:00
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
a394293500 Do not use JS to initialize the schedule
- Only use JS for the drag&drop functionality and to the set/alter the time and rooms of the EventSchedule object.

- Introduce has_many :events, through: :event_schedules association to get unscheduled event easily
2016-08-11 15:11:27 +02:00
Ana
71dab6b79c SchedulesController introduced
The actions #schedule and #events were moved from conference controller to the new controller
2016-08-11 15:11:27 +02:00
Ana
42848f929b Several schedules in the backend && routes changed
- Introduce plural resources for Schedule in routes.rb
- Introduce #index and #create actions for ScheduleController
- Make it possible to set a schedule as selected_schedule
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
3f114629f9 javascript for the admin schedule moved to a .js
Inline javascript for the admin schedule moved to a dedicated .js file.
2016-08-11 15:11:27 +02:00
Ana
0b26ed5c35 EventSchedule validations
event, schedule, room and start_time are mandatory in EventSchedule.
2016-08-11 15:11:27 +02:00
Ana
354e15a76d Public schedule adapted to the new relations
Public schedule and all events adapted to the new relations and models to allow having several schedules in the admin shcedule.
2016-08-11 15:11:27 +02:00
Ana
dfd64a4510 Integrate the schedule in the admin interface
Integrate the schedule in the admin interface while adapting it to the new associations and models.
2016-08-11 15:06:52 +02:00
Ana
c047ffd699 New associations and models: schedule versioning
For the schedule versioning in the admin interface (having multiple possible shcedules) we need to change some models and associations. It has also been create a rake:move_events_attributes task to migrate the data.

User Interface addapted to make use of the introduced associations and models
2016-08-11 15:06:52 +02:00
Ana
96337ed081 Make the whole event panel clickable in all events
Make the whole event panel clickable in all events in the public schedule. It didn't work properly when having links inside the panel.

It also works with ctrl + click openning the event page in a new tab.
2016-08-11 11:19:05 +02:00