Software
/
rosa-build
mirror of https://github.com/OpenMandrivaSoftware/rosa-build.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[refs #583] Change and to &&

This commit is contained in:
Vladimir Sharshov 2012-07-27 03:17:37 +04:00
parent 3e4c03dd6a
commit bc2eb541f3
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/views/projects/build_lists/show.html.haml
View File

@ -35,7 +35,7 @@
.both
.leftlist= t("activerecord.attributes.build_list.update_type")
.rightlist
- if @build_list.can_publish? and can?(:publish, @build_list)
- if @build_list.can_publish? && can?(:publish, @build_list)
= f.select :update_type, options_for_select(build_list_classified_update_types, @build_list.update_type)
- else
= @build_list.update_type
@ -81,11 +81,11 @@
= "#{@build_list.human_current_duration} / #{@build_list.project.human_average_build_time}"
.both
- if @build_list.can_cancel? and can?(:cancel, @build_list)
- if @build_list.can_cancel? && can?(:cancel, @build_list)
= link_to t("layout.build_lists.cancel"), cancel_build_list_path(@build_list),
:method => :put, :confirm => t("layout.confirm"), :class => 'button'
- if @build_list.can_publish? and @build_list.save_to_platform.released and @build_list.advisory.nil? and can?(:publish, @build_list)
- if @build_list.can_publish? && @build_list.save_to_platform.released && @build_list.advisory.nil? && can?(:publish, @build_list)
#advisory_block
.leftlist= label_tag :attach_advisory, t("layout.build_lists.attached_advisory")
.rightlist
@ -123,8 +123,8 @@
var r = new Rosa.Routers.BuildListsAdvisoriesRouter();
});
= submit_tag t("layout.publish"), :confirm => t("layout.confirm"), :name => 'publish' if @build_list.can_publish? and can?(:publish, @build_list)
= submit_tag t("layout.reject_publish"), :confirm => t("layout.confirm"), :name => 'reject_publish' if @build_list.can_reject_publish? and can?(:reject_publish, @build_list)
= submit_tag t("layout.publish"), :confirm => t("layout.confirm"), :name => 'publish' if @build_list.can_publish? && can?(:publish, @build_list)
= submit_tag t("layout.reject_publish"), :confirm => t("layout.confirm"), :name => 'reject_publish' if @build_list.can_reject_publish? && can?(:reject_publish, @build_list)
.hr
%h3= t("layout.build_lists.items_header")