2673 commits

Author	SHA1	Message	Date
Matej Zrimšek	7b07e7b347	Fixed protocol in repository permissions, and refactored it a bit.	2018-02-16 12:04:11 +01:00
Matej Zrimšek	6ba226d514	Added missing '?' to the canaid permission calls that were missing it.	2018-02-16 11:12:30 +01:00
Matej Zrimšek	5bda53eebf	Overall refactoring of all canaid permissions and code related to their calls.	2018-02-16 10:54:06 +01:00
Matej Zrimšek	4fe669ca9a	Removed permissions helper and updated the remaining calls to its methods with the new canaid gem permissions.	2018-02-16 10:53:22 +01:00
Matej Zrimšek	ac5b65b121	Added some additional comments for checking if project is active in permissions.	2018-02-14 14:39:10 +01:00
Matej Zrimšek	09c5e23adf	Fixed permission checks for completing step and checking step checkboxes. Disabled turbolinks for comments since it can cause issues. Minor code styling changes.	2018-02-14 14:39:10 +01:00
Matej Zrimšek	d571ab2ed8	Fixed comments permissions for experiment level.	2018-02-14 14:39:10 +01:00
Matej Zrimšek	6b1fee4d30	Added/joined repository record assignment to task with sample assignmment to task.	2018-02-14 14:39:10 +01:00
Matej Zrimšek	f21c794a95	Fixed permission error when accessing samples page.	2018-02-14 14:39:09 +01:00
Matej Zrimšek	4c87fb4a55	Fixed permission error when restoring task.	2018-02-14 14:39:09 +01:00
Matej Zrimšek	946f516171	Fixed permission error when moving a freshly cloned task.	2018-02-14 14:39:09 +01:00
Matej Zrimšek	68206cb591	Added missing checks for whether task/experiment/project is active for experiment level permissions. Minor code refactoring and restyling.	2018-02-14 14:39:08 +01:00
Matej Zrimšek	d55734e501	Added additional permission checks for moving tasks. Added forgotten enclosing tag in a view.	2018-02-14 14:39:07 +01:00
Matej Zrimšek	d7108f5a35	Fixed Hound warnings.	2018-02-14 14:39:07 +01:00
Matej Zrimšek	8ef6c8f91f	Refactored remaining experiment level permissions (and everything below it).	2018-02-14 14:39:07 +01:00
Matej Zrimšek	879eda2d8f	Minor experiment level permissions refactoring.	2018-02-14 14:19:22 +01:00
Matej Zrimšek	0706d16020	Readded module level archive, move, clone and manag permissions. Corrected their usage and add the permissions check in some additional places.	2018-02-14 14:19:22 +01:00
Matej Zrimšek	1182ce5da1	Fixed experiment level permission checks in the controllers.	2018-02-14 14:19:22 +01:00
Matej Zrimšek	7938c2e036	Minor code style changes.	2018-02-14 14:19:22 +01:00
Matej Zrimšek	c5b798017e	Minor Hound warning fixes.	2018-02-14 14:19:22 +01:00
Matej Zrimšek	d6e7ef465c	Grouped remaining permissions for experiment, protocol, task, and partially step levels. [SCI-1964]	2018-02-14 14:19:22 +01:00
Matej Zrimšek	854333b0e6	Grouped permissions for experiment with canaid gem (WIP).	2018-02-14 14:19:00 +01:00
Matej Zrimšek	70fdae567c	Forgot to add check whether project is active for archive project permission. Added some additional comments for checking if project is active in permissions.	2018-02-14 13:16:32 +01:00
Matej Zrimšek	c09ffa4043	Project permissions comments change.	2018-02-14 13:16:32 +01:00
Matej Zrimšek	d058c371d4	Readded project archive permission.	2018-02-14 13:16:32 +01:00
Matej Zrimšek	900446557b	Fixed mistyped permission checker.	2018-02-14 13:16:32 +01:00
Matej Zrimšek	e36ec69ca9	Project level permissions refactoring (mostly names).	2018-02-14 13:16:32 +01:00
Matej Zrimšek	93536afcd5	Renamed permission 'update_project' to 'manage_project'. Some permissions fixes; added them in some places where they were missing.	2018-02-14 13:16:32 +01:00
Matej Zrimšek	13e9a2a132	Corrected some project level permissions; minor refactoring.	2018-02-14 13:16:32 +01:00
Matej Zrimšek	e5799ee6dc	Some permission fixes.	2018-02-14 13:16:32 +01:00
Matej Zrimšek	a21343a819	Fixing and refactoring project permissions in controllers.	2018-02-14 13:16:32 +01:00
Matej Zrimšek	279da20060	Fixed Hound warnings.	2018-02-14 13:16:32 +01:00
Matej Zrimšek	d423700e84	Used permissions where they were missing.	2018-02-14 13:16:32 +01:00
Matej Zrimšek	321ddc2916	Grouped existing project permissions and used 'canaid' gem.	2018-02-14 13:09:45 +01:00
Zmago Devetak	027297d46a	Merge pull request #985 from ZmagoD/zd_SCI_2008 ... fixes bug with assets upload on task result page,	2018-02-12 11:40:44 +01:00
okriuchykhin	e7fb1bc716	Merge pull request #967 from okriuchykhin/ok_SCI_1966 ... Merge gilson-iot-rails4 to master [SCI-1966]	2018-02-12 11:02:17 +01:00
okriuchykhin	5a94b40d9c	Merge pull request #978 from okriuchykhin/ok_SCI_2003 ... Improve files handling in protocol cloning [SCI-2003]	2018-02-12 11:01:59 +01:00
Zanz2	128f15f984	Merge pull request #990 from Zanz2/code_formatting_sci1822 ... Commands in protocols io steps are now properly formatted like code [SCI-1822]	2018-02-08 08:52:44 +01:00
Zanz2	a6356d2420	Fixed newline styling, now code is styled in newlines, and since \n doesnt work i change it to <br> with gsub and that allows code to be written into multiple lines	2018-02-07 14:46:25 +01:00
Zmago Devetak	e400514020	Merge pull request #981 from ZmagoD/zd_SCI_2026 ... fixes bug with step table update [fixes SCI-2026]	2018-02-07 14:35:15 +01:00
Zmago Devetak	b33d09536e	Merge pull request #987 from ZmagoD/zd_SCI_2033 ... fixes user dropdown [fixes SCI-2033]	2018-02-07 14:34:37 +01:00
Zanz2	efaf5ad721	Commands now get styled like code	2018-02-07 13:51:22 +01:00
Zanz2	ef0733b886	Merge pull request #988 from Zanz2/red_error_msg_sci1993 ... Accidentally deleted this off master, identical to the branch before [SCI-1993]	2018-02-07 13:08:45 +01:00
mlorb	edbcdc6bf4	Merge pull request #986 from mlorb/ml-sci-2031 ... Fix error on task activity [SCI-2031]	2018-02-07 11:39:14 +01:00
Zanz2	367eff6401	re-pushing this, this got merged into master already but i accidentally deleted it when merging two branches	2018-02-07 11:17:53 +01:00
zmagod	695e9d90d2	fixes user dropdown [fixes SCI-2033]	2018-02-07 08:43:42 +01:00
Luka Murn	4389c110cf	Merge pull request #982 from biosistemika/lm-remove-component-loader ... Remove component loader (so builds pass)	2018-02-06 17:02:08 +01:00
mlorb	e151c963e1	fix error on task activity	2018-02-06 16:34:16 +01:00
zmagod	2ad4eb3488	fix bug with checklists	2018-02-06 16:15:10 +01:00
zmagod	75cc9d11df	fix error on checklists	2018-02-06 16:06:15 +01:00