August 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] <web-client> master : fix test suite to current state
by Josef Reidinger 04 Aug '09

04 Aug '09

ref: refs/heads/master commit f6315f065e8640b27a178b2c5f0e4bb9262e78ab Author: Josef Reidinger <jreidinger(a)suse.cz> Date: Tue Aug 4 10:54:28 2009 +0200 fix test suite to current state --- .../app/controllers/language_controller.rb | 48 ++++++++++---------- plugins/language/app/views/language/index.rhtml | 4 +- .../test/functional/language_controller_test.rb | 12 ++--- 3 files changed, 31 insertions(+), 33 deletions(-) diff --git a/plugins/language/app/controllers/language_controller.rb b/plugins/language/app/controllers/language_controller.rb index 43cdd7d..157367a 100644 --- a/plugins/language/app/controllers/language_controller.rb +++ b/plugins/language/app/controllers/language_controller.rb @@ -21,36 +21,36 @@ class LanguageController < ApplicationController redirect_to root_path return false end - - if @language - @valid = language.available.collect { |item| item.name } || [] - @valid.sort! - cur = language.available.find { |avail| avail.id.size>0 && avail.id == language.current } - @current = cur.name if cur - @rootlocale=language.rootlocale - @utf8 = language.utf8 - end + +# debugger + @valid = language.available.collect { |item| item.name } || [] + @valid.sort! + cur = language.available.find { |avail| avail.id.size>0 && avail.id == language.current } + @current = cur ? cur.name : "" + @rootlocale=language.rootlocale + @utf8 = language.utf8 + end def commit_language - lang = load_proxy 'org.opensuse.yast.modules.yapi.language' + lang = load_proxy 'org.opensuse.yast.modules.yapi.language' - if lang - cur = lang.available.find { |avail| params[:first_language]==avail.name } - lang.current = cur.id if cur + if lang + cur = lang.available.find { |avail| params[:first_language]==avail.name } + lang.current = cur.id if cur - lang.available = [] #not needed anymore - lang.utf8 = (params[:utf8] && params[:utf8]=="true") ? "true" : "false" - lang.rootlocale = params[:rootlocale] + lang.available = [] #not needed anymore + lang.utf8 = (params[:utf8] && params[:utf8]=="true") ? "true" : "false" + lang.rootlocale = params[:rootlocale] - begin - lang.save - flash[:notice] = _("Settings have been written.") - rescue ActiveResource::ClientError => e - flash[:error] = YaST::ServiceResource.error(e) - end - end - redirect_to :action => :index + begin + lang.save + flash[:notice] = _("Settings have been written.") + rescue ActiveResource::ClientError => e + flash[:error] = YaST::ServiceResource.error(e) + end + end + redirect_to :action => :index end end diff --git a/plugins/language/app/views/language/index.rhtml b/plugins/language/app/views/language/index.rhtml index 26f88e1..d061ed5 100644 --- a/plugins/language/app/views/language/index.rhtml +++ b/plugins/language/app/views/language/index.rhtml @@ -1,4 +1,4 @@ -<div class='plugin-icon'><img src='/icons/yast-language.png'/></div> +<div class='plugin-icon'><img src='/icons/yast-language.png' alt="<%= _("language plugin") %>"/></div> <div class='plugin-content'> <h2><%=_("Language")%></h2> <br/> @@ -9,7 +9,7 @@ <tr> <td class="first"><%=_("First Language")%></td> <td> - <%= select_tag :first_language, options_for_select(@valid, @current), + <%= select_tag :first_language, options_for_select(@valid||[], @current||""), :disabled=>!@permissions[:write] %> </td> </tr> diff --git a/plugins/language/test/functional/language_controller_test.rb b/plugins/language/test/functional/language_controller_test.rb index a8becac..decfd43 100644 --- a/plugins/language/test/functional/language_controller_test.rb +++ b/plugins/language/test/functional/language_controller_test.rb @@ -66,11 +66,10 @@ class LanguageControllerTest < ActionController::TestCase #check if everything is correctly setted assert_response :success assert_valid_markup - assert assigns(:permissions) - assert assigns(:permissions)[:read] - assert assigns(:permissions)[:write] - assert assigns(:language) - assert_equal assigns(:valid), ["cestina","English (US)"] + assert assigns(:permissions) , "Permission is not set" + assert assigns(:permissions)[:read], "Read permission is not set" + assert assigns(:permissions)[:write], "Write permission is not set" + assert_equal assigns(:valid), ["cestina","English (US)"].sort assert_equal assigns(:current), "cestina" assert_equal assigns(:utf8), @result.utf8 assert_equal assigns(:rootlocale), @result.rootlocale @@ -121,8 +120,7 @@ class LanguageControllerTest < ActionController::TestCase assert assigns(:permissions) assert assigns(:permissions)[:read] assert !assigns(:permissions)[:write] - assert assigns(:language) - assert_equal assigns(:valid), ["cestina","English (US)"] + assert_equal assigns(:valid), ["cestina","English (US)"].sort assert_equal assigns(:current), "cestina" assert_equal assigns(:utf8), @result.utf8 assert_equal assigns(:rootlocale), @result.rootlocale -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <web-client> master : improve readability of language controller
by Josef Reidinger 04 Aug '09

04 Aug '09

ref: refs/heads/master commit c5e15712ef21574bb2a3df5dd043c1d8ae938747 Author: Josef Reidinger <jreidinger(a)suse.cz> Date: Tue Aug 4 10:36:36 2009 +0200 improve readability of language controller --- .../app/controllers/language_controller.rb | 71 +++++++------------- 1 files changed, 25 insertions(+), 46 deletions(-) diff --git a/plugins/language/app/controllers/language_controller.rb b/plugins/language/app/controllers/language_controller.rb index eb89a61..43cdd7d 100644 --- a/plugins/language/app/controllers/language_controller.rb +++ b/plugins/language/app/controllers/language_controller.rb @@ -3,73 +3,52 @@ require 'yast/service_resource' class LanguageController < ApplicationController before_filter :login_required layout 'main' + include ProxyLoader # Initialize GetText and Content-Type. init_gettext "yast_webclient_language" # textdomain, options(:charset, :content_type) def index - proxy = YaST::ServiceResource.proxy_for('org.opensuse.yast.modules.yapi.language') - if proxy.nil? - access_denied - return - end - @permissions = proxy.permissions - begin - @language = proxy.find - rescue ActiveResource::ClientError => e - flash[:error] = YaST::ServiceResource.error(e) + language = load_proxy 'org.opensuse.yast.modules.yapi.language' + + unless language + return false end - @valid = [] - + unless@permissions[:read] + flash[:warning] = _("No permissions for language module") + redirect_to root_path + return false + end + if @language - @language.available.each do |avail| - @valid << avail.name - if avail.id.size>0 && avail.id == @language.current - @current = avail.name - end - end + @valid = language.available.collect { |item| item.name } || [] @valid.sort! - @rootlocale=@language.rootlocale - @utf8 = @language.utf8 + cur = language.available.find { |avail| avail.id.size>0 && avail.id == language.current } + @current = cur.name if cur + @rootlocale=language.rootlocale + @utf8 = language.utf8 end end def commit_language - proxy = YaST::ServiceResource.proxy_for('org.opensuse.yast.modules.yapi.language') - proxy.timeout = 120 - @permissions = proxy.permissions - begin - lang = proxy.find - rescue ActiveResource::ClientError => e - flash[:error] = YaST::ServiceResource.error(e) - end + lang = load_proxy 'org.opensuse.yast.modules.yapi.language' if lang - lang.available.each do |avail| - if params[:first_language]==avail.name - lang.current = avail.id - break - end - end + cur = lang.available.find { |avail| params[:first_language]==avail.name } + lang.current = cur.id if cur lang.available = [] #not needed anymore - if params[:utf8] && params[:utf8]=="true" - lang.utf8 = "true" - else - lang.utf8 = "false" - end + lang.utf8 = (params[:utf8] && params[:utf8]=="true") ? "true" : "false" lang.rootlocale = params[:rootlocale] - - response = true + begin - response = lang.save + lang.save + flash[:notice] = _("Settings have been written.") rescue ActiveResource::ClientError => e - flash[:error] = YaST::ServiceResource.error(e) - response = false - end - flash[:notice] = _("Settings have been written.") if response + flash[:error] = YaST::ServiceResource.error(e) + end end redirect_to :action => :index end -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <web-client> master : fix hyphens in comment
by Josef Reidinger 04 Aug '09

04 Aug '09

ref: refs/heads/master commit 7932de7cd25160451da4609b323d06a7e69018c7 Author: Josef Reidinger <jreidinger(a)suse.cz> Date: Tue Aug 4 10:30:19 2009 +0200 fix hyphens in comment --- .../systemtime/app/views/system_time/index.rhtml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/plugins/systemtime/app/views/system_time/index.rhtml b/plugins/systemtime/app/views/system_time/index.rhtml index f304f05..9ebbc7c 100644 --- a/plugins/systemtime/app/views/system_time/index.rhtml +++ b/plugins/systemtime/app/views/system_time/index.rhtml @@ -7,7 +7,7 @@ }); <% end -%> -  +  <% javascript_tag do -%> function submitTime() { if (!$("#date_date")[0].value.match( /^\d{2}\/\d{2}\/\d{4}$/)){ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <web-client> master : localize warning if no permissions is available
by Josef Reidinger 04 Aug '09

04 Aug '09

ref: refs/heads/master commit e72f27cf2cc3afb3ee4475e2765b477451ee6fc2 Author: Josef Reidinger <jreidinger(a)suse.cz> Date: Tue Aug 4 10:20:52 2009 +0200 localize warning if no permissions is available --- .../app/controllers/system_time_controller.rb | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/plugins/systemtime/app/controllers/system_time_controller.rb b/plugins/systemtime/app/controllers/system_time_controller.rb index 738ec0e..04aa1c1 100644 --- a/plugins/systemtime/app/controllers/system_time_controller.rb +++ b/plugins/systemtime/app/controllers/system_time_controller.rb @@ -55,7 +55,7 @@ class SystemTimeController < ApplicationController end unless @permissions[:read] - flash[:warning] = "No permissions for time module" + flash[:warning] = _("No permissions for time module") redirect_to root_path return false end -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <web-client> master : use or for default empty hash
by Josef Reidinger 04 Aug '09

04 Aug '09

ref: refs/heads/master commit f92a0f5492d357cf90788434660f49c1c38d3031 Author: Josef Reidinger <jreidinger(a)suse.cz> Date: Tue Aug 4 10:20:44 2009 +0200 use or for default empty hash --- plugins/systemtime/lib/systemtime.rb | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/plugins/systemtime/lib/systemtime.rb b/plugins/systemtime/lib/systemtime.rb index 2c3fdd0..32166e0 100644 --- a/plugins/systemtime/lib/systemtime.rb +++ b/plugins/systemtime/lib/systemtime.rb @@ -1,26 +1,26 @@ # Systemtime def fill_proxy_with_time(proxy,params) - proxy.date = params[:date][:date] - proxy.time = params[:currenttime] - proxy.timezones = [] #not needed anymore - proxy.utcstatus = "" - proxy.timezone = "" + proxy.date = params[:date][:date] + proxy.time = params[:currenttime] + proxy.timezones = [] #not needed anymore + proxy.utcstatus = "" + proxy.timezone = "" end def fill_proxy_with_timezone(proxy,params,timezones) - region = timezones.find { |reg| reg.name == params[:region] } - region = {} unless region + region = timezones.find { |reg| reg.name == params[:region] } || Hash.new - tmz = region.entries.find { |e| e.name == params[:timezone]} - proxy.timezone = tmz.id if tmz + tmz = region.entries.find { |e| e.name == params[:timezone]} + proxy.timezone = tmz.id if tmz - if (proxy.utcstatus != "UTConly") - proxy.utcstatus = params[:utc] == "true" ? "UTC" : "localtime" - end - proxy.time = "" - proxy.date = "" - proxy.timezones = [] #not needed anymore + if (proxy.utcstatus != "UTConly") + proxy.utcstatus = params[:utc] == "true" ? "UTC" : "localtime" + end + + proxy.time = "" + proxy.date = "" + proxy.timezones = [] #not needed anymore end \ No newline at end of file -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <web-client> master : Write success message also if time is moved to future
by Josef Reidinger 04 Aug '09

04 Aug '09

ref: refs/heads/master commit 281400bda46eb8483cdeb35550895bf16110b94d Author: Josef Reidinger <jreidinger(a)suse.cz> Date: Tue Aug 4 10:04:22 2009 +0200 Write success message also if time is moved to future --- .../app/controllers/system_time_controller.rb | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/plugins/systemtime/app/controllers/system_time_controller.rb b/plugins/systemtime/app/controllers/system_time_controller.rb index c51a794..738ec0e 100644 --- a/plugins/systemtime/app/controllers/system_time_controller.rb +++ b/plugins/systemtime/app/controllers/system_time_controller.rb @@ -92,7 +92,8 @@ class SystemTimeController < ApplicationController flash[:notice] = _('Settings have been written.') rescue Timeout::Error => e #do nothing as if you move time to future it throws this exception - log.debug "Time moved to future" + log.debug "Time moved to future" + flash[:notice] = _('Settings have been written.') rescue ActiveResource::ClientError => e flash[:error] = YaST::ServiceResource.error(e) ExceptionLogger.log_exception e -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <web-client> master : use lambdas instead loops
by Josef Reidinger 04 Aug '09

04 Aug '09

ref: refs/heads/master commit 3bdc44954f867999d83db2fe62ea92b2ef16ee75 Author: Josef Reidinger <jreidinger(a)suse.cz> Date: Tue Aug 4 09:53:47 2009 +0200 use lambdas instead loops --- plugins/systemtime/lib/systemtime.rb | 24 ++++++------------------ 1 files changed, 6 insertions(+), 18 deletions(-) diff --git a/plugins/systemtime/lib/systemtime.rb b/plugins/systemtime/lib/systemtime.rb index 4b61e52..2c3fdd0 100644 --- a/plugins/systemtime/lib/systemtime.rb +++ b/plugins/systemtime/lib/systemtime.rb @@ -9,27 +9,15 @@ def fill_proxy_with_time(proxy,params) end def fill_proxy_with_timezone(proxy,params,timezones) - region = {} - timezones.each do |reg| - if reg.name == params[:region] - region = reg - break - end - end + region = timezones.find { |reg| reg.name == params[:region] } + region = {} unless region + + tmz = region.entries.find { |e| e.name == params[:timezone]} + proxy.timezone = tmz.id if tmz - region.entries.each do |e| - if (e.name == params[:timezone]) - proxy.timezone = e.id - break - end - end if (proxy.utcstatus != "UTConly") - if params[:utc] == "true" - proxy.utcstatus = "UTC" - else - proxy.utcstatus = "localtime" - end + proxy.utcstatus = params[:utc] == "true" ? "UTC" : "localtime" end proxy.time = "" -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r58268 - /tags/branch-Code-11-2_17_26/product-creator/
by jsuchome＠svn.opensuse.org 04 Aug '09

04 Aug '09

Author: jsuchome Date: Tue Aug 4 09:22:06 2009 New Revision: 58268 URL: http://svn.opensuse.org/viewcvs/yast?rev=58268&view=rev Log: Created tag branch-Code-11-2_17_26 for product-creator Added: tags/branch-Code-11-2_17_26/product-creator/ - copied from r58267, branches/SuSE-Code-11-Branch/product-creator/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r58267 - in /branches/SuSE-Code-11-Branch/product-creator: VERSION package/yast2-product-creator.changes src/Kiwi.ycp src/kiwi_dialogs.ycp
by jsuchome＠svn.opensuse.org 04 Aug '09

04 Aug '09

Author: jsuchome Date: Tue Aug 4 09:21:57 2009 New Revision: 58267 URL: http://svn.opensuse.org/viewcvs/yast?rev=58267&view=rev Log: - give kiwi more time to finish (bnc#525986) - show the warning when package management is locked (bnc#526338) - show error if removing old chroot failed (bnc#525993) - delete wrong examlple from the help text (bnc#527150) - probe repositories of NONE type (bnc#527198) - 2.17.26 Modified: branches/SuSE-Code-11-Branch/product-creator/VERSION branches/SuSE-Code-11-Branch/product-creator/package/yast2-product-creator.changes branches/SuSE-Code-11-Branch/product-creator/src/Kiwi.ycp branches/SuSE-Code-11-Branch/product-creator/src/kiwi_dialogs.ycp Modified: branches/SuSE-Code-11-Branch/product-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/product-c… ============================================================================== --- branches/SuSE-Code-11-Branch/product-creator/VERSION (original) +++ branches/SuSE-Code-11-Branch/product-creator/VERSION Tue Aug 4 09:21:57 2009 @@ -1 +1 @@ -2.17.25 +2.17.26 Modified: branches/SuSE-Code-11-Branch/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/product-c… ============================================================================== --- branches/SuSE-Code-11-Branch/product-creator/package/yast2-product-creator.changes (original) +++ branches/SuSE-Code-11-Branch/product-creator/package/yast2-product-creator.changes Tue Aug 4 09:21:57 2009 @@ -1,4 +1,14 @@ ------------------------------------------------------------------- +Mon Aug 3 15:32:25 CEST 2009 - jsuchome(a)suse.cz + +- give kiwi more time to finish (bnc#525986) +- show the warning when package management is locked (bnc#526338) +- show error if removing old chroot failed (bnc#525993) +- delete wrong examlple from the help text (bnc#527150) +- probe repositories of NONE type (bnc#527198) +- 2.17.26 + +------------------------------------------------------------------- Wed Jul 15 12:08:31 CEST 2009 - jsuchome(a)suse.cz - do not re-crypt user password already crypted (bnc#521887) Modified: branches/SuSE-Code-11-Branch/product-creator/src/Kiwi.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/product-c… ============================================================================== --- branches/SuSE-Code-11-Branch/product-creator/src/Kiwi.ycp (original) +++ branches/SuSE-Code-11-Branch/product-creator/src/Kiwi.ycp Tue Aug 4 09:21:57 2009 @@ -131,6 +131,8 @@ string url = data["url"]:""; if (url == source || url == adapt_source_path (source)) { + if (data["type"]:"" == "NONE") + data["type"] = Pkg::RepositoryProbe (url, ""); if (data["type"]:"" == "Plaindir") type = "rpm-dir"; if (data["type"]:"" == "YUM") @@ -391,6 +393,19 @@ return substring (full_path, 0, findlastof (full_path, "/")); } + // wait until process is really done or kill -9 it after minute + void give_kiwi_time_to_finish (integer pid) { + integer count = 0; + while (SCR::Read(.process.running, pid) == true) + { + sleep(100); + count = count + 1; + if (count > 600) break; + } + if (SCR::Read(.process.running, pid) == true) SCR::Execute (.process.kill, pid); + } + + /** * run kiwi to finally create the selected image * @param out_dir output directory for the result @@ -410,7 +425,13 @@ if (FileUtils::Exists (chroot_dir)) { y2milestone ("%1 directory is present, removing...", chroot_dir); - SCR::Execute (.target.bash, sformat ("rm -rf %1", chroot_dir)); + map out = (map) SCR::Execute (.target.bash_output, sformat ("rm -rf %1", chroot_dir)); + if (out["exit"]:0 != 0) + { + y2warning ("cmd output: %1", out); + Report::Error (_("Removing old chroot directory failed.") + "\n\n" + out["stderr"]:""); + return false; + } } // create path to chroot_dir if it does not exist (#406731) FileUtils::CheckAndCreatePath (path_to_dir (chroot_dir)); @@ -523,13 +544,13 @@ if (ret == `cancel) { SCR::Execute (.process.kill, id, 15); - sleep (100); - SCR::Execute (.process.kill, id); + give_kiwi_time_to_finish (id); } sleep (100); } while (ret == nil); - SCR::Execute (.process.kill, id); + give_kiwi_time_to_finish (id); + UI::CloseDialog (); return ret == `ok; } Modified: branches/SuSE-Code-11-Branch/product-creator/src/kiwi_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/product-c… ============================================================================== --- branches/SuSE-Code-11-Branch/product-creator/src/kiwi_dialogs.ycp (original) +++ branches/SuSE-Code-11-Branch/product-creator/src/kiwi_dialogs.ycp Tue Aug 4 09:21:57 2009 @@ -18,6 +18,7 @@ import "Label"; import "Message"; import "Package"; + import "PackageLock"; import "PackageSystem"; import "Popup"; import "ProductCreator"; @@ -1797,7 +1798,7 @@ "store" : StorePreferences, "handle" : HandlePreferences, // help text for keytable - "help" : _("<p><b>Keyboard layout</b> specifies the name of the console keymap to use. The value (e.g. <tt>us</tt>) corresponds to a map file in <tt>/usr/share/kbd/keymaps</tt>.</p>"), + "help" : _("<p><b>Keyboard layout</b> specifies the name of the console keymap to use. The value corresponds to a map file in <tt>/usr/share/kbd/keymaps</tt>.</p>"), ], "timezone" : $[ "widget" : `textentry, @@ -2360,6 +2361,8 @@ } else if (ret == `next) { + y2internal ("package lock check returned %1", PackageLock::Check ()); + name = (string) UI::QueryWidget (`id (`config), `Value); if (name == "") { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <web-client> master : add input value validator directly to view as js
by Josef Reidinger 04 Aug '09

04 Aug '09

ref: refs/heads/master commit dcef8b003033dd59f3957d0b6e84cbc1bc47568f Author: Josef Reidinger <jreidinger(a)suse.cz> Date: Tue Aug 4 09:03:25 2009 +0200 add input value validator directly to view as js --- .../systemtime/app/views/system_time/index.rhtml | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/plugins/systemtime/app/views/system_time/index.rhtml b/plugins/systemtime/app/views/system_time/index.rhtml index c3079a8..f304f05 100644 --- a/plugins/systemtime/app/views/system_time/index.rhtml +++ b/plugins/systemtime/app/views/system_time/index.rhtml @@ -7,7 +7,21 @@ }); <% end -%> - +  + <% javascript_tag do -%> + function submitTime() { + if (!$("#date_date")[0].value.match( /^\d{2}\/\d{2}\/\d{4}$/)){ + alert ("<%= _("Invalid date format. Correct one is dd/mm/yyyy") %>"); + return false; + } + if (!$("#currenttime")[0].value.match( /^\d{2}:\d{2}:\d{2}$/)) { + alert ("<%= _("Invalid time format. Correct one is hh:mm:ss") %>"); + return false; + } + Element.show('progress'); + return true; + }; + <% end -%> <%= javascript_include_tag :defaults %> <% disabled = ! @permissions[:write] %> @@ -98,7 +112,7 @@ </tr> </table> <p> - <%= submit_tag _("Save"), :onclick=>"Element.show('progress')", + <%= submit_tag _("Save"), :onclick=>"return submitTime()", :disabled=> disabled, :class => 'button' -%> </p> <% end %> -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0