mirror/osem
1
0
Fork 0
mirror of https://github.com/openSUSE/osem.git synced 2026-04-25 01:07:28 -04:00
Code Issues Packages Projects Releases Wiki Activity
1,989 Commits 16 Branches 2 Tags
e2d42fbbbbdd0ef6bc8716f29547d34e1e65c331
Commit Graph

309 Commits

Author SHA1 Message Date
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
Ana
a1c7f67735 Render errors in JSON in the schedule correctly 2016-08-11 15:11:27 +02:00
Ana
e8261d41bc Improve Error messages 
- Improve error messages in event schedules, schedules and program controller.
- Two respond_to blocks in the update method of program controller.
 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
310c521790 EventSchedulesController when something goes wrong 
Consider that create, update or destroy can fails in EventSchedulesController

Params in remove deleted because they were not used
 2016-08-11 15:11:27 +02:00
Ana
c469f4f415 Event schedule controller pluralized 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
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
b037a5eb7c Load and authorize schedule in ScheduleController 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
0b26ed5c35 EventSchedule validations 
event, schedule, room and start_time are mandatory in EventSchedule.
 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
c1334e59cc Do not use unless with else 
Solve Rubocop offense introduced in https://github.com/openSUSE/osem/pull/1123
 2016-08-08 23:57:03 +02:00
Ana
7e5d20c89d style: if ! changed by unless 
- if ! changed by unless as it is more readable
- !object.blank? is equivalent to object.present?, also more readable
 2016-08-06 00:57:07 +02:00
Stella Rouzi
59eeb7edbd Enable blind voting 2016-07-22 12:21:54 +03: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
Henne Vogelsang
5d5ad9348c Merge pull request #1034 from Ana06/statistic 
Statistics
 2016-06-30 12:25:59 +02:00
Ana
1d7f3207a6 Registrations dashbox eliminated from registrations 2016-06-25 15:36:33 +02:00
Ana
62c3ee1631 Statistics on top of Registrations#index 2016-06-25 14:39:45 +02:00
Ana
f5701f2e77 Statistics on top of Events#index 2016-06-25 14:39:45 +02:00
Nishanth Vijayan
7a7a58ebf8 Remove unused columns from Conferences,Venues,Events and Sponsors tables 2016-06-25 00:27:25 +05:30
Stella Rouzi
3b9e4772ee Add languages_list in controller admin/events#edit 2016-06-15 18:34:39 +03:00
Henne Vogelsang
dcae196d2b Merge pull request #905 from Ana06/languages 
Languages
 2016-06-15 16:55:12 +02:00
Ana
6c87995050 Configure language of events 2016-06-03 14:09:37 +02:00
Henne Vogelsang
7d77495936 Hotfix question display 
what a mess....
 2016-05-25 14:40:45 +02:00
Nishanth Vijayan
e83b2c3a90 Display sponsor pages only if sponsorship levels are defined 2016-05-19 19:11:38 +05:30
Stella Rouzi
9fe7d0ca7c Use strong parameters for user in admin/registrations#update 2016-05-02 18:02:57 +03:00
Stella Rouzi
6bcecbd219 fix admin/registrations#update 2016-05-02 17:38:55 +03:00
Henne Vogelsang
2a4de3e869 Use PictureUploader on Venue 2016-04-27 17:55:17 +02:00
Henne Vogelsang
f1f5fc1cd4 Use PictureUploader on Sponsor 2016-04-27 17:40:23 +02:00
Henne Vogelsang
0ad3ff01c3 Use PictureUploader on Lodging 2016-04-27 17:40:23 +02:00
Henne Vogelsang
40023044af Use PictureUploader on Conference 2016-04-27 17:40:23 +02:00
Henne Vogelsang
ae55c2772f Remove danging :photos table and other photo cruft 2016-04-27 17:40:18 +02:00
Stella Rouzi
01ec43e53a Registration for Events 2016-04-26 16:11:40 +03:00
Henne Vogelsang
aabbd35063 Merge pull request #932 from hennevogel/bugfix_email_settings 
Fix email notifications
 2016-04-26 14:33:43 +02:00
Henne Vogelsang
1fdc2f8efe Merge pull request #946 from Shriyanshagro/venue_commercial 
Defined Venue has_one Commercial nice new relationship
 2016-04-26 14:32:54 +02:00
Stella Rouzi
0a5ba7a204 Merge pull request #942 from nishanthvijayan/fix-roles-authorization 
Fix authorization issues with Roles
 2016-04-25 17:18:24 +02:00
Henne Vogelsang
a698ce44fe Use ActiveJob to send cfp update mails 2016-04-21 16:26:37 +02:00
Henne Vogelsang
82e356dde0 Use ActiveJob to send schedule update mails 2016-04-21 16:16:47 +02:00
Henne Vogelsang
4dd15dc62c Use ActiveJob to send registration period update mails 2016-04-21 16:03:41 +02:00
Henne Vogelsang
e758c30292 Use ActiveJob to send conference date update mails 2016-04-21 15:11:20 +02:00
Henne Vogelsang
21280cd9d8 Switch mail sending to active_job 
Before we were using the delayed_job method of delaying
mail sending which isn't working anymore on rails 4.
 2016-04-20 18:59:24 +02:00
Henne Vogelsang
14011f8828 Fix email notifications 2016-04-20 16:22:29 +02:00
Shriyansh
0ca19ea67a added views for public view on splashpage,venue_edit,venue 2016-04-10 11:57:30 +05:30
Shriyansh
3bcdbe7469 defined ability for user with roles -organizer and cfp's, and some improvements in controller 2016-04-10 11:57:30 +05:30