Skip to content

Allow to change avatar when groups are disables - #5277

Merged
MorrisJobke merged 1 commit into
masterfrom
fix-personal-settings-regression
Jun 7, 2017
Merged

Allow to change avatar when groups are disables#5277
MorrisJobke merged 1 commit into
masterfrom
fix-personal-settings-regression

Conversation

@MorrisJobke

Copy link
Copy Markdown
Member

How to test:

  • disable groups
  • go to personal settings and try to click the avatar upload button

@nickvergessen

Copy link
Copy Markdown
Member

When you disable password change (hack if($_['passwordChangeSupported']) in the template), the problem continues with the language drop down blocking the name and email field:

bildschirmfoto vom 2017-06-07 09-31-20

@nickvergessennickvergessen added 2. developing Work in progress and removed 3. to review Waiting for reviews labels Jun 7, 2017

@nickvergessennickvergessen left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fix is incomplete when password change is disabled

@codecov

codecovBot commented Jun 7, 2017

Copy link
Copy Markdown

Codecov Report

Merging #5277 into master will increase coverage by <.01%.
The diff coverage is 0%.

@@ Coverage Diff @@## master #5277 +/- ##
============================================
+ Coverage 54.16% 54.16% +<.01% 
Complexity 22311 22311 ============================================
Files 1380 1380 Lines 85406 85407 +1 Branches 1321 1321 ============================================
+ Hits 46257 46259 +2 + Misses 39149 39148 -1
Impacted FilesCoverage ΔComplexity Δ
settings/templates/personal.php0% <0%> (ø)0 <0> (ø)⬇️
apps/comments/lib/EventHandler.php87.5% <0%> (+8.33%)7% <0%> (ø)⬇️

@schiessle

schiessle commented Jun 7, 2017

Copy link
Copy Markdown
Member

I pushed a update which should always work. Not sure if it is the most elegant solution, though.

@MorrisJobke feel free to replace it if you know a better way to solve it.

@schiessleschiessle added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Jun 7, 2017
@MorrisJobke
MorrisJobkeforce-pushed the fix-personal-settings-regression branch 2 times, most recently from 69c3630 to 9a1a511CompareJune 7, 2017 16:27
* password form overlaps upload button and doesn't allow to click it
* regression from #5259
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
make sure that we always clear all floating rules after the user settings parts
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
@MorrisJobke
MorrisJobkeforce-pushed the fix-personal-settings-regression branch from 9a1a511 to 3ad4a28CompareJune 7, 2017 16:27
@MorrisJobke

Copy link
Copy Markdown
MemberAuthor

Thanks @schiessle - I condensed the CSS rules and squashed everything.

@MorrisJobke

Copy link
Copy Markdown
MemberAuthor

👍 from me, because it's mostly Björns code

@MorrisJobke

Copy link
Copy Markdown
MemberAuthor

CSS and HTML only -> merge

@MorrisJobke
MorrisJobke merged commit e934e51 into masterJun 7, 2017
@MorrisJobke
MorrisJobke deleted the fix-personal-settings-regression branch June 7, 2017 16:43
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3. to reviewWaiting for reviewsregression

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@MorrisJobke@nickvergessen@schiessle@LukasReschke