Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Edit fields dev 4 4 #1767

Merged
merged 11 commits into from Nov 19, 2013
Merged

Edit fields dev 4 4 #1767

merged 11 commits into from Nov 19, 2013

Conversation

jburel
Copy link
Member

@jburel jburel commented Nov 14, 2013

Same as gh-1746 and with an extra commit from 61885ca from gh-1753

Do not allow to edit the system group

--rebased-from #1746

@jburel jburel mentioned this pull request Nov 14, 2013
@joshmoore
Copy link
Member

Contains diff markers <<<<<<<. Added exclude

@jburel
Copy link
Member Author

jburel commented Nov 15, 2013

crap... rebasing is becoming harder and harder

@jburel
Copy link
Member Author

jburel commented Nov 15, 2013

removing exclude label, file did not get saved.

@bpindelski
Copy link

Tested:

  1. editing of the system group. All works as expected - neither the root nor an admin user can edit the group.
  2. description field fix - all works as expected, the description is not editable in another image after it has been changed in the first one.

Caveat:
It has been discovered that the image name field is editable by default (both gretzky and develop). Pressing the pencil icon only adds a black border.

As this PR fixes the issues from the ticket, it's OK to merge. The image name issue can be handled in another PR.

@jburel
Copy link
Member Author

jburel commented Nov 18, 2013

@bpindelski: I have created a ticket see https://trac.openmicroscopy.org.uk/ome/ticket/11716

joshmoore added a commit that referenced this pull request Nov 19, 2013
@joshmoore joshmoore merged commit 1f1d829 into ome:dev_4_4 Nov 19, 2013
@jburel jburel deleted the edit-fields-dev_4_4 branch February 3, 2014 10:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants