Commit Graph

1770 Commits

Author SHA1 Message Date
María Checa
9f2522c106 Merge branch 'master' into 1677-poll_questions_documents 2017-09-06 18:28:31 +02:00
taitus
9b6b57a24c Remove all white spaces 2017-09-06 14:12:32 +02:00
taitus
25560a27fc Refactor Community model. 2017-09-06 14:07:44 +02:00
taitus
c5cb463a2e Refactor helpers. 2017-09-06 13:47:29 +02:00
taitus
64774b0d2d Refactor topics controller. Add Common abilities. Add destroy action. 2017-09-06 13:30:12 +02:00
María Checa
4af44a45a1 Documents upload for questions working 2017-09-06 12:00:46 +02:00
Raimond Garcia
2519f232ab Merge branch 'master' into user-recomendations 2017-09-05 17:15:42 +02:00
Raimond Garcia
6f9d48f0eb Merge branch 'master' into community 2017-09-05 15:40:03 +02:00
Raimond Garcia
eb4528eaa0 Merge branch 'master' into poll-shifts 2017-09-05 14:45:31 +02:00
taitus
8d0ba0bf5e Display tag author only proposal or budget investment author 2017-09-05 12:55:12 +02:00
taitus
90518d4f99 Refactor participants. Add scopes on User. 2017-09-05 12:54:32 +02:00
taitus
0d76004636 Simplify and refactor method to calculate community participants 2017-09-05 12:54:32 +02:00
taitus
74958b461a Add new model concern Communitable with relation, callback and associate community. 2017-09-05 12:54:32 +02:00
taitus
895c942a39 Add community to investments 2017-09-05 12:52:45 +02:00
taitus
4539c5fa00 Refactor and tests. 2017-09-05 12:52:14 +02:00
taitus
a1d37fa6c4 Add order on topic index. 2017-09-05 12:51:08 +02:00
taitus
08f58b845d Add participants to community 2017-09-05 12:51:08 +02:00
taitus
bc95b6f28d Add description as comment on topic. 2017-09-05 12:51:08 +02:00
taitus
bea393bcde Add comments to topics 2017-09-05 12:51:08 +02:00
taitus
43c17c3fc7 Add communities and topics 2017-09-05 12:51:08 +02:00
Alberto
c3b3a837a9 Merge branch 'master' into user-recomendations 2017-09-05 11:31:05 +02:00
Senén Rodero Rodríguez
c3277d53c8 Change direct uploads path 2017-09-01 13:07:13 +02:00
Senén Rodero Rodríguez
5581445fff Use different path to store ajax uploaded cached attachments 2017-08-31 12:37:41 +02:00
Senén Rodero Rodríguez
6d66077a94 Make documentable capable to work with local or remote storage system. 2017-08-30 17:07:52 +02:00
Senén Rodero Rodríguez
57930df535 Remove unused code 2017-08-25 19:14:15 +02:00
Senén Rodero Rodríguez
f4ac8b17d0 Store AJAX uploaded documents with timestamp prefix to avoid file name collision. Remove cached_attachments after document save. 2017-08-25 18:34:54 +02:00
Senén Rodero Rodríguez
0fbffdc73e Fix abilities definition and related specs 2017-08-25 18:34:53 +02:00
Senén Rodero Rodríguez
8e91bbe5b5 Fix document validations specs 2017-08-25 18:34:53 +02:00
Senén Rodero Rodríguez
4081dded5f Add nested documents to new budgetinvestments. 2017-08-25 18:34:53 +02:00
Senén Rodero Rodríguez
cc89907bff Add nested documents to proposal form. 2017-08-25 18:34:52 +02:00
Senén Rodero Rodríguez
f226d2ac94 Fix edit and update actions 2017-08-25 18:34:52 +02:00
Senén Rodero Rodríguez
e9c5f77368 Accept nested attributes for documents on proposals. Adapt documentable js file to allow many input files at the same page. 2017-08-25 18:34:51 +02:00
Senén Rodero Rodríguez
e327b420ff Ajax file upload to tmp dir. Add cached_attachment to document. Recover image from cache. Add progress bar. 2017-08-25 18:34:51 +02:00
Senén Rodero Rodríguez
92e8468e89 Use documentables helper method within specs and document model. 2017-08-25 18:34:50 +02:00
Senén Rodero Rodríguez
17ad148cd7 Fix i18n translations warnings. 2017-08-25 18:34:50 +02:00
Senén Rodero Rodríguez
3a7c9d9f83 Add documentables helper 2017-08-25 18:34:49 +02:00
Senén Rodero Rodríguez
38d4d59241 Add arguments to documentable concern to make it configurable for any recipient model. 2017-08-25 17:27:37 +02:00
Senén Rodero Rodríguez
6b61cbe35c Set maximum number of documents on proposal and budget investments. Show alert on documents tab when maximum reached. Hide upload button when maximum reached. 2017-08-25 17:27:37 +02:00
Senén Rodero Rodríguez
586776efd8 Add documentable to proposal model. 2017-08-25 17:27:37 +02:00
Senén Rodero Rodríguez
a2130689ed Create documentable concern and add it to budget investment model. Create documents controller, documents helper, routes, translations and specs 2017-08-25 17:27:37 +02:00
Senén Rodero Rodríguez
c92827e89e Add abilities to documentable authors and admins to create and destroy documents. 2017-08-25 17:27:37 +02:00
Senén Rodero Rodríguez
34d06dad04 Add document model validations and model shared specs. 2017-08-25 17:27:37 +02:00
Senén Rodero Rodríguez
a141c82e33 Create new polymorphic model Document. 2017-08-25 17:27:37 +02:00
rgarcia
456429f08b adds shifts 2017-08-04 21:27:30 +02:00
taitus
edbbe6174b Refactor specs because now recommendations only return results asociated to user interests 2017-08-03 00:23:06 +02:00
rgarcia
43b636de09 avoids postgres exception regarding subquery limits
We have apparently reached a postgres limit for the number of
attributes we query. Using ids instead of the proposal objects seems to
fix it

Using `Array` and `map` instead of `pluck`, because the proposals
attribute can be a single object
2017-08-02 21:34:40 +02:00
rgarcia
113d8a0f28 minor refactoring for proposal recommendations 2017-08-02 20:27:20 +02:00
taitus
9ef6478e67 Problem with disinct 2017-08-02 18:41:00 +02:00
taitus
b412f8a88c Avoid duplicate proposals with group on query. Avoid show successful proposals on recommendations. 2017-08-02 14:31:02 +02:00
taitus
7afacf3a2f Force distinct to recommendations methods. Sort by recommendations on home carousel. 2017-08-02 12:52:55 +02:00