Commit Graph

4510 Commits

Author SHA1 Message Date
Angel Perez
8b8e8aff8f Show answer's title if answer has any records associated
If an answer has a description and/or documents/images
associated, the answer's title will be shown on the UI
so the user can associate a certain answer with its
related records

See issue #1998, as well as commit 7fad604
2017-10-06 14:46:13 -04:00
Angel Perez
a1907c6f50 Show answer's associated documents on polls
As requested by #2003
2017-10-06 14:40:54 -04:00
Angel Perez
7fad604842 Avoid show div into markup for answers' information
If an answer does not contain any description or images
associated, the "poll-more-info-answers" div won't be
shown in the markup

Change requested by #1998
2017-10-06 14:17:01 -04:00
Angel Perez
d62c0d5d05 Remove Poll::Question title length limit
As requested by #1997
2017-10-06 14:11:08 -04:00
Raimond Garcia
0e7431e9e6 Merge pull request #2001 from consul/polls-show-gallery
Polls show galleries
2017-10-06 18:48:30 +02:00
Bertocq
59175ff039 Add date on officer assignment list for final shifts 2017-10-06 18:36:25 +02:00
Raimond Garcia
c04e2889c5 Merge pull request #1991 from consul/question-answer-documents
Admin question answer documents
2017-10-06 18:25:25 +02:00
decabeza
dcc5ebf530 removes data equalizer to avoid big scrolls 2017-10-06 18:09:05 +02:00
decabeza
5c2784794f changes medium to large size on gallery images 2017-10-06 18:04:15 +02:00
Raimond Garcia
936ffa1fb6 Merge pull request #1993 from consul/1984-voting_messages
Voting messages
2017-10-06 17:57:17 +02:00
rgarcia
23682fadd8 fixes document specs 2017-10-06 17:50:41 +02:00
decabeza
225ede4a42 hides temporally documents sidebar on polls show 2017-10-06 16:58:49 +02:00
decabeza
1933cf62fa changes gallery order images 2017-10-06 16:44:26 +02:00
decabeza
47ee8a2f79 shows answer title on polls show only if description is present 2017-10-06 16:19:55 +02:00
decabeza
dd69401477 Merge branch 'master' into question-answer-documents 2017-10-06 15:18:42 +02:00
Raimond Garcia
108d4104e8 Merge pull request #1986 from wairbut-m2c/iagirre-remove-documents-questions
Iagirre remove documents questions
2017-10-06 14:07:21 +02:00
rgarcia
8dd1d6d947 Merge branch 'question-answer-documents' of github.com:consul/consul into question-answer-documents 2017-10-06 14:01:13 +02:00
rgarcia
9a31c97a20 fixes image specs 2017-10-06 14:01:03 +02:00
decabeza
de9b599578 Merge branch 'master' into question-answer-documents 2017-10-06 13:55:49 +02:00
María Checa
8e5cf50679 Prevent user from seeing its votes in a poll after signing in 2017-10-06 12:52:13 +02:00
rgarcia
bd1c03accf fixes upload of answer's images 2017-10-06 12:15:45 +02:00
María Checa
c5c1ea7251 Fixed answer documents form 2017-10-06 12:02:24 +02:00
rgarcia
a15d1a4020 resolves conflict when uploading pdfs to answers 2017-10-06 02:52:06 +02:00
decabeza
7856915203 removes @question on questions answers 2017-10-06 02:38:43 +02:00
decabeza
3ce98b6cdf fixes answer documents path on polls questions show 2017-10-06 02:09:01 +02:00
María Checa
b8f2fd1c54 Markup fixes 2017-10-06 01:32:00 +02:00
María Checa
1225fc9009 Minor fix 2017-10-06 01:28:38 +02:00
María Checa
d20a4909d6 Minor fix
Removed left margin from submit button
2017-10-06 01:27:14 +02:00
María Checa
37c9ca0973 Fixed admin menu 2017-10-06 01:25:41 +02:00
María Checa
284fdea2e6 Improved answer documents and question summary views 2017-10-06 01:23:41 +02:00
María Checa
c3f778bbdd Check if user has voted before sign in 2017-10-06 01:18:56 +02:00
María Checa
590344a576 Added view to upload documents to poll answers 2017-10-06 01:18:53 +02:00
María Checa
6192ea8b78 Added documents to Poll::Question::Answer 2017-10-06 01:17:23 +02:00
Raimond Garcia
c72f95c72b Merge branch 'master' into aperez-admin-question-videos 2017-10-06 01:12:22 +02:00
Raimond Garcia
3d100d1e93 Merge branch 'master' into iagirre-remove-documents-questions 2017-10-06 01:02:56 +02:00
María Checa
0cf5299846 Set voting messages 2017-10-06 00:04:25 +02:00
Alberto García
806fd85246 Merge pull request #1990 from consul/polls-gallery
Polls Gallery
2017-10-05 21:44:38 +02:00
rgarcia
127ab222eb removes rendering of local variable 2017-10-05 19:37:44 +02:00
rgarcia
6327bcb343 adds specs for answer's gallery 2017-10-05 19:15:17 +02:00
Angel Perez
5862eea516 Add controllers/views for Poll::Question::Answer::Video 2017-10-05 12:34:20 -04:00
decabeza
ad8f58993f checks already answered polls only for users logged 2017-10-05 17:48:52 +02:00
iagirre
b31abb64d7 Removed the methods not used from nested_documentable specs (the ones that were deleted in the questions specs) and removed also the document params from questions_params (not used anymore). 2017-10-05 17:28:24 +02:00
Angel Perez
5f6d218a15 Rename param in Admin::Poll::Questions::AnswersController
'poll_question_id' attribute was renamed to 'question_id' on PR #1977,
commit 4aaf681
2017-10-05 10:32:09 -04:00
decabeza
5fdbc7b8a6 removes icons on polls index view 2017-10-05 16:29:57 +02:00
iagirre
75d841e2fe Fixed the correct specs and views to make the test pass. 2017-10-05 15:31:21 +02:00
iagirre
5b129b933f Removed documents from questions (documentable from model and uploader from _form in views) 2017-10-05 13:38:19 +02:00
decabeza
de27530621 improves polls gallery partial 2017-10-05 11:46:21 +02:00
decabeza
0ba2dbd4f3 replaces lorem content on polls show 2017-10-05 11:45:51 +02:00
decabeza
d069d903a1 fixes active classes on admin menu 2017-10-05 11:08:45 +02:00
decabeza
2e8922459d adds line break on css 2017-10-05 11:08:12 +02:00