gunghogeoduck/osem-fcy
1
0
Fork 0
mirror of https://github.com/openSUSE/osem.git synced 2026-08-13 19:54:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
1986 commits 15 branches 2 tags 50 MiB
Commit graph

414 commits

Author SHA1 Message Date
Henne Vogelsang
2b4bf2fff7 Merge pull request #1138 from charliequinn/increase-tests-conference-registrations-controller 
Specs added ConferenceRegistrationsController#new
 2016-08-12 13:42:24 +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
charliequinn
df8517b011 Specs added ConferenceRegistrationsController#new 
- Increased test coverage with addition of specs to cover :new method of
  ConferenceRegistrationsController
 2016-08-11 23:54:21 +01:00
Ana
1989a33da1 Test namings 
Test namings in event_schedules and schedules controllers.
 2016-08-11 15:11:27 +02:00
Ana
8975df6a6b Event schedules controller tests improved 2016-08-11 15:11:27 +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
c687c1072e Add event schedules and schedules controller specs 2016-08-11 15:11:27 +02:00
Ana
13bcee485e Has a valid factory test for event schedule 
Has a valid factory test introduced for event schedule
 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
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
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
3897ec79ca Repeated sentence moved to a function 
program.selected_schedule.event_schedules.order(start_time: :asc) was repeated several times and it has been moved to conference#selected_event_schedules
 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
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
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
71b39bb612 creation of my_conference repeated in ability_spec 
my_conference is created several times in ability_spec but it is not necessary.
 2016-07-29 19:58:11 +02:00
Henne Vogelsang
5edc6123f4 Merge pull request #987 from differentreality/blind_voting 
Blind voting
 2016-07-25 15:49:01 +02:00
Stella Rouzi
59eeb7edbd Enable blind voting 2016-07-22 12:21:54 +03:00
Ana
a0fc9dd950 Default value for length in as_json fixed 
The default value for length in as_json should be a multiple of EventType::LENGTH_STEP.
 2016-07-18 11:45:59 +02:00
Christian Bruckmayer
28f0973fc4 Merge pull request #1079 from Ana06/suggest_track_color 
Different colors for new tracks, types and levels
 2016-07-11 15:10:26 +02:00
Ana
8d9bb56f06 Hexadecimal color changed to capital letters 
The default colors in event_types and difficulty levels are in capital letters and the ones that comes from the color picker were not. Now colors are capitalized before saving the track, level or type. A rake task has also been created to capitalize color from old tracks, levels or types.
 2016-07-11 13:46:02 +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
Arun Kumar
0675572e05
Modify conference registration to a singular resource 2016-07-05 01:15:32 +05:30
Stella Rouzi
15076b11f1 XML export fix tests. Add not nil room for scheduled events. 2016-06-20 21:05:08 +03:00
Henne Vogelsang
b1b8703753 Merge pull request #1038 from differentreality/xml_export 
XML export
 2016-06-20 15:01:12 +02:00
Stella Rouzi
8a595e6284 add test 2016-06-15 20:54:51 +03:00
Rishabh Saxena
c802bd95b9 change datepicker id to place correct constraints 2016-06-15 20:48:55 +05:30
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
Ana
74e889a046 length test in EventType fixed 2016-06-01 13:09:45 +02:00
Ana
55c41810b2 Limit event types lenght 2016-05-31 16:51:12 +02:00
Ana
f648b8731a Wrong test: proposal cannot be rated 2016-05-27 00:45:42 +02:00
Henne Vogelsang
81ddb76c24 Merge pull request #994 from differentreality/allow_nil_max_attendees 
allow max_attendees to be nil
 2016-05-19 12:03:43 +02:00
Henne Vogelsang
6a127a29a3 Merge pull request #1001 from ChrisBr/ability 
Fixes ability
 2016-05-19 12:01:31 +02:00
Christian Bruckmayer
406e37a1d8 Adapt ability to allow proposal creation if cfp is open 
This was not possible before when iChain was enabled.
- Initialize @event object now with load_and_autorize before filter
- Remove not necessary event_users initilization in :new action
- Adapt ability and feature tests
 2016-05-19 11:47:41 +02:00
Nishanth Vijayan
09b6e06a8c Fix ability model spec 
Cancancan does not support  testing multiple permissions in one be_able_to clause
Replace all occurrences of such examples with separate examples for each permission
 2016-05-15 21:18:19 +05:30
Stella Rouzi
528243c8b9 Allow max_attendees to be nil 2016-05-15 14:01:36 +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