Luka Murn
24dd25d9f5
Add edit/delete result comment functionality
...
Lessons learned during this fix:
Don't use dependant: :destroy on both ends of association
between 2 ActiveRecords, or you will run into stack overflow.
2016-08-25 13:51:31 +02:00
Luka Murn
bac0455435
Add edit&delete functionality to step comments
...
This commit also:
* fixes a bug in permission_helper.rb,
* fixes comments.js a bit,
* adds 2 more re-renders of dropdown position calculations to canvas.js and projects/index.js.
2016-08-25 13:51:31 +02:00
Luka Murn
c92d016f65
Add edit&delete module/task comments functionality
...
This required a minor fix of comments.js.
2016-08-25 13:51:31 +02:00
Luka Murn
f0d9cb96fa
Add edit project comments functionality
2016-08-25 13:51:30 +02:00
Luka Murn
15c0baeee8
Add delete project comment functionality
...
This commit also removes the old code from @bberic.
2016-08-25 13:51:30 +02:00
Luka Murn
5569a1e6d2
Revert 2 files that contained no changes
2016-08-25 13:51:30 +02:00
scibb
a76d82d188
delete and edit comments for projects, protocols, results, and workflow elements
2016-08-25 13:51:30 +02:00
Mojca Lorber
4a5d720724
change position of overview and samples
2016-08-25 11:19:53 +02:00
mlorb
c38a4e2614
Merge pull request #94 from mlorb/ml_sci_375
...
add move experiment instructions [SCI-375]
2016-08-25 09:45:16 +02:00
mlorb
0a066f436f
Merge pull request #96 from mlorb/ml_sci_369
...
buttons update on experiment overview [SCI-369]
2016-08-25 08:54:16 +02:00
Mojca Lorber
2a897432e1
update buttons on canvas view
2016-08-24 17:00:27 +02:00
jbargu
5c104ac050
Merge pull request #93 from jbargu/jg_sci_378_move_experiment_error
...
Fix 404 move experiment error
2016-08-24 16:35:29 +02:00
Zmago Devetak
0de7ea31ea
Merge pull request #90 from ZmagoD/zd_SCI_376
...
fixes cloned experiment protocol [fixes SCI-376]
2016-08-24 14:12:19 +02:00
Mojca Lorber
0558d49e26
buttons update on experiment overview
2016-08-24 13:50:25 +02:00
Jure Grabnar
00da7efb44
Merge remote-tracking branch 'origin/jg_SCI_328_moving_workflows'
...
Conflicts:
app/models/experiment.rb
SCI-328 #close
2016-08-24 13:11:10 +02:00
Zmago Devetak
afaeab492d
Merge pull request #87 from ZmagoD/zd_SCI_371
...
hide the dropdown if user has no permissions(technician) [fixes SCI-371]
2016-08-24 11:56:29 +02:00
jbargu
180efac87b
Merge pull request #92 from jbargu/jg_exp_overview_navbar_sci_353
...
Show whole tree structure for experiment in sidebar
2016-08-24 11:50:39 +02:00
Mojca Lorber
f554dc6018
add move experiment instructions
2016-08-24 11:36:50 +02:00
Jure Grabnar
3e5e9aed22
Fix 404 on move experiment
...
[fixes SCI-378]
2016-08-24 11:09:03 +02:00
zmagod
27d77bc73f
added new permission for dropdown actions
2016-08-24 10:56:30 +02:00
Jure Grabnar
e60533af57
Add whole tree structure for experiment
...
SCI-353 #close
2016-08-24 10:47:30 +02:00
Jure Grabnar
a41d851830
Fix secondary navigation for experiment level (overview)
2016-08-24 08:54:02 +02:00
Zmago Devetak
9dc7708b73
Merge pull request #85 from ZmagoD/zd_SCI_360
...
fixes project overview style and add no description link [fixes SCI-360]
2016-08-23 16:24:22 +02:00
Zmago Devetak
d67997fa8b
Merge pull request #83 from ZmagoD/zd_SCI_347
...
Fixes search result link for experiment [fixes SCI-347]
2016-08-23 16:23:41 +02:00
Zmago Devetak
aa650bbc65
Merge pull request #82 from ZmagoD/zd_SCI_359
...
Add plus button at the bottom of project overview page [fixes SCI-359]
2016-08-23 16:23:20 +02:00
Zmago Devetak
7e2db66f42
Merge pull request #79 from ZmagoD/zd_SCI_345
...
Adds font-awesome to pdf [fixes SCI-345]
2016-08-23 16:22:30 +02:00
zmagod
0429816154
deleted commented code
2016-08-23 16:21:11 +02:00
zmagod
2bbb439745
fixes cloned experiment protocol [fixes SCI-376]
2016-08-23 16:15:45 +02:00
Jure Grabnar
0d56cea3e4
Add placeholders for empty experiments
2016-08-23 10:37:48 +02:00
Jure Grabnar
358f2b1c47
Add moving for newly created modules
2016-08-23 10:00:34 +02:00
zmagod
f918746946
hide the dropdown if user has no permissions(technician) [fixes SCI-371]
2016-08-23 09:26:52 +02:00
zmagod
03a3759cf5
fixes project overview style and add no description link [fixes SCI-360]
2016-08-23 08:52:53 +02:00
zmagod
9a05935067
fixed search result link for experiment [fixes SCI-347]
2016-08-22 15:35:47 +02:00
zmagod
bb11999566
adds plus button at the bottom of project overview page [fixes SCI-359]
2016-08-22 15:22:05 +02:00
zmagod
eab05eb9db
adds font-awesome to pdf [fixes SCI-345]
2016-08-22 14:40:09 +02:00
zmagod
d38f29d207
set ajax loading of experiments images [fixes SCI-349]
2016-08-22 11:29:19 +02:00
Jure Grabnar
5bb99adb25
Add frontend logic for moving workflows from canvas
2016-08-19 17:11:17 +02:00
zmagod
cac5033eba
set ajax for workflow img
2016-08-19 15:36:12 +02:00
Jure Grabnar
80498260e5
Add backend for moving task from canvas
2016-08-19 13:53:43 +02:00
zmagod
6bb8d075e0
truncate asset name in task step and result [fixes SCI-294]
2016-08-18 09:22:12 +02:00
Zmago Devetak
4897e2da0c
Merge pull request #68 from ZmagoD/zd_SCI_330
...
Zd sci 330
2016-08-18 08:10:20 +02:00
Zmago Devetak
f2e08db106
Merge pull request #67 from ZmagoD/zd_SCI_337
...
Zd sci 337
2016-08-18 08:06:38 +02:00
Jure Grabnar
0cdea0b51a
Add modal for moving task on canvas
2016-08-17 15:46:30 +02:00
zmagod
9fd68c7bd5
fixes 'new experiment' button bug on smaller screens
2016-08-17 14:27:59 +02:00
zmagod
ca0ba1403d
set flask icon to experiment [fixes SCI-330]
2016-08-17 14:17:29 +02:00
zmagod
cc2ed32ccb
fixes canvas bug when no actions are available for the viewer
2016-08-17 13:29:22 +02:00
zmagod
8d69ca0b88
adds active class to experiment name in sidebar [fixes SCI-331]
2016-08-17 11:21:48 +02:00
Zmago Devetak
da735a51f4
Merge pull request #62 from ZmagoD/zd_SCI_318
...
Zd sci 318
2016-08-17 10:01:10 +02:00
zmagod
7abc8f3a90
Merge branch 'master' into experiment-level
2016-08-17 09:28:35 +02:00
Jure Grabnar
275106c27c
Add check for empty projects on move experiments
2016-08-16 10:20:36 +02:00
