After Beta4 #19

Merged
merged 17 commits into from Dec 12, 2012

Conversation

Projects
None yet
2 participants
Owner

lslezak commented Dec 10, 2012

A group of fixes which were postponed after Beta4 release.

lslezak added some commits Dec 4, 2012

software - fixed rendering permission error in patch summary
do not render flash[:error] in ajax summary
users - fixed check for existing user when there is no user defined yet
in JS "".split(",") => [""] which breaks the check
Merge branch 'master' into after_beta4
Conflicts:
	plugins/users/app/assets/javascripts/webyast-users.js
activedirectory - fixed generic save error handler
- the global on/off checkbox also enables/disables account settings input fields
software - display a warning when software management is locked by an…
…other application, do not crash (bnc#793602)
software - added before filters for cached actions
to properly drop the cache and check access permissions
software - fixed JS rendering at new repository page (bnc#794049)
allow changing properties of the new repository
Merge branch 'master' into after_beta4
Conflicts:
	plugins/services/package/rubygem-webyast-services.changes

@ghost ghost assigned vmoravec Dec 12, 2012

cached_mtime = Rails.cache.fetch("webyast_patch_mtime")
current_mtime = Patch.mtime
+ Rails.logger.info "cached_mtime: #{cached_mtime.inspect}, current_mtime: #{current_mtime.inspect}"
@vmoravec

vmoravec Dec 12, 2012

Contributor

The log message is perhaps too generic, I mean there is the 'patch' word missing which would describe what is it about

+
+ def perm_check_summary
+ if cannot? :read, Patch
+ render :text => _("Status not available (no permissions)")
@vmoravec

vmoravec Dec 12, 2012

Contributor

Is an explicit return not required after the render call? After the before_filter has been applied, it will go on to execute the show_summary method which is not what we want..

Contributor

vmoravec commented Dec 12, 2012

I'm done with reviewing here.

lslezak added a commit that referenced this pull request Dec 12, 2012

@lslezak lslezak merged commit 7a2714a into master Dec 12, 2012

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment