December 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r60086 - in /branches/SuSE-Code-11-SP1-Branch/storage: package/yast2-storage.changes storage/src/modules/Storage.ycp
by aschnell＠svn.opensuse.org 14 Dec '09

14 Dec '09

Author: aschnell Date: Mon Dec 14 10:21:17 2009 New Revision: 60086 URL: http://svn.opensuse.org/viewcvs/yast?rev=60086&view=rev Log: - fixed detection of native MD RAIDs (bnc #563967) Modified: branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes branches/SuSE-Code-11-SP1-Branch/storage/storage/src/modules/Storage.ycp Modified: branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes Mon Dec 14 10:21:17 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Dec 14 10:19:19 CET 2009 - aschnell(a)suse.de + +- fixed detection of native MD RAIDs (bnc #563967) + +------------------------------------------------------------------- Thu Dec 10 17:58:03 CET 2009 - aschnell(a)suse.de - run swapon with --fixpgsz (see bnc #433028) (requires util-linux Modified: branches/SuSE-Code-11-SP1-Branch/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/storage/src/modules/Storage.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/storage/src/modules/Storage.ycp Mon Dec 14 10:21:17 2009 @@ -587,7 +587,7 @@ { integer pos = find(device, "p"); y2milestone("device:%1 pos:%2", device, pos); - if (pos == nil) + if (pos == -1) dlen = 7; else dlen = pos; -- 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 : enable again setting utc status, fix problem with overwriting permissions
by Josef Reidinger 14 Dec '09

14 Dec '09

ref: refs/heads/master commit c9595cdfe41b01ac9b0dc7a74026c14e10ae4b02 Author: Josef Reidinger <jreidinger(a)suse.cz> Date: Mon Dec 14 09:43:59 2009 +0100 enable again setting utc status, fix problem with overwriting permissions --- .../app/controllers/systemtime_controller.rb | 2 +- .../systemtime/app/views/systemtime/index.rhtml | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/plugins/systemtime/app/controllers/systemtime_controller.rb b/plugins/systemtime/app/controllers/systemtime_controller.rb index 6e8845f..b4c2c9d 100644 --- a/plugins/systemtime/app/controllers/systemtime_controller.rb +++ b/plugins/systemtime/app/controllers/systemtime_controller.rb @@ -64,6 +64,7 @@ class SystemtimeController < ApplicationController # fields is filled. In case of errors redirect to help page, main page or just # show flash with partial problem. def index + @ntp = available_ntp systemtime = load_proxy 'org.opensuse.yast.modules.yapi.time' unless systemtime @@ -82,7 +83,6 @@ class SystemtimeController < ApplicationController @utcstatus = systemtime.utcstatus @time = systemtime.time @date = systemtime.date - @ntp = available_ntp fill_valid_timezones begin fill_current_region diff --git a/plugins/systemtime/app/views/systemtime/index.rhtml b/plugins/systemtime/app/views/systemtime/index.rhtml index 9589a22..04c8d9e 100644 --- a/plugins/systemtime/app/views/systemtime/index.rhtml +++ b/plugins/systemtime/app/views/systemtime/index.rhtml @@ -64,6 +64,14 @@ :disabled => disabled}) %> + + <% #don't use check_box helper as it generate also hidden opposite value + %> + <input type="checkbox" name="utc" id="utc" value="true" + <%= "checked=\"checked\"" if @utcstatus == "UTC"%> + <%= "disabled=\"disabled\"" if disabled %> /> + <%=_("Hardware clock is set to UTC")%> + </fieldset> <fieldset> -- 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> backgroud_patches_bnc550934 : enable again setting utc status, fix problem with overwriting permissions
by Josef Reidinger 14 Dec '09

14 Dec '09

ref: refs/heads/backgroud_patches_bnc550934 commit c9595cdfe41b01ac9b0dc7a74026c14e10ae4b02 Author: Josef Reidinger <jreidinger(a)suse.cz> Date: Mon Dec 14 09:43:59 2009 +0100 enable again setting utc status, fix problem with overwriting permissions --- .../app/controllers/systemtime_controller.rb | 2 +- .../systemtime/app/views/systemtime/index.rhtml | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/plugins/systemtime/app/controllers/systemtime_controller.rb b/plugins/systemtime/app/controllers/systemtime_controller.rb index 6e8845f..b4c2c9d 100644 --- a/plugins/systemtime/app/controllers/systemtime_controller.rb +++ b/plugins/systemtime/app/controllers/systemtime_controller.rb @@ -64,6 +64,7 @@ class SystemtimeController < ApplicationController # fields is filled. In case of errors redirect to help page, main page or just # show flash with partial problem. def index + @ntp = available_ntp systemtime = load_proxy 'org.opensuse.yast.modules.yapi.time' unless systemtime @@ -82,7 +83,6 @@ class SystemtimeController < ApplicationController @utcstatus = systemtime.utcstatus @time = systemtime.time @date = systemtime.date - @ntp = available_ntp fill_valid_timezones begin fill_current_region diff --git a/plugins/systemtime/app/views/systemtime/index.rhtml b/plugins/systemtime/app/views/systemtime/index.rhtml index 9589a22..04c8d9e 100644 --- a/plugins/systemtime/app/views/systemtime/index.rhtml +++ b/plugins/systemtime/app/views/systemtime/index.rhtml @@ -64,6 +64,14 @@ :disabled => disabled}) %> + + <% #don't use check_box helper as it generate also hidden opposite value + %> + <input type="checkbox" name="utc" id="utc" value="true" + <%= "checked=\"checked\"" if @utcstatus == "UTC"%> + <%= "disabled=\"disabled\"" if disabled %> /> + <%=_("Hardware clock is set to UTC")%> + </fieldset> <fieldset> -- 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] <rest-service> jr-basemodel : improve base model documentation
by Josef Reidinger 14 Dec '09

14 Dec '09

ref: refs/heads/jr-basemodel commit 8cd9e52f2b69b325acdadff7cd8fc77d29c346c1 Author: Josef Reidinger <jreidinger(a)suse.cz> Date: Mon Dec 14 09:29:08 2009 +0100 improve base model documentation fix attr_serialized and add its test to test-suite --- webservice/lib/base_model/base.rb | 12 +++++-- webservice/lib/base_model/serialization.rb | 26 ++++++++++++++-- .../lib/base_model/serializers/json_serializer.rb | 4 ++ .../lib/base_model/serializers/xml_serializer.rb | 10 +++++- webservice/test/unit/base_model_test.rb | 32 ++++++++++++++++++- 5 files changed, 74 insertions(+), 10 deletions(-) diff --git a/webservice/lib/base_model/base.rb b/webservice/lib/base_model/base.rb index aec330f..3374982 100644 --- a/webservice/lib/base_model/base.rb +++ b/webservice/lib/base_model/base.rb @@ -110,21 +110,27 @@ module BaseModel true end -#remove overwritten method_missing from activeRecord +#remove overwritten method_missing from activeRecord (as Base model doesn't know attributes) alias :method_missing_orig :method_missing + #required by validations include ActiveRecord::AttributeMethods alias :method_missing :method_missing_orig -#remove overwritten respond_to +#remove overwritten respond_to (as Base model doesn't have attributes alias :respond_to? :respond_to_without_attributes? + #Validations in model include ActiveRecord::Validations + #Callbacks in model include ActiveRecord::Callbacks + #Mass assignment support include BaseModel::MassAssignment + #serialization of models include BaseModel::Serialization - include YastRoles #to access permission check in models + #permission check in models + include YastRoles end end diff --git a/webservice/lib/base_model/serialization.rb b/webservice/lib/base_model/serialization.rb index f822afa..0777301 100644 --- a/webservice/lib/base_model/serialization.rb +++ b/webservice/lib/base_model/serialization.rb @@ -1,12 +1,22 @@ module BaseModel module Serialization + # Helper class for serializer implementation. + # + # Inspired by ActiveRecord Serializer class Serializer - attr_reader :options, :attributes + #passed options to serializer + attr_reader :options + #attributes to serialize + attr_reader :attributes + # initialize serializer + # + # model:: model to serialize + # options:: generic options for serializer, not used now def initialize(model,options={}) @model = model @options = options - @attributes = options[:attributes] + @attributes = model.class.serialized_attributes unless @attributes @attributes = model.instance_variables.collect { |v| v.to_sym } end @@ -18,11 +28,21 @@ module BaseModel end module ClassMethods + # defines attributes which should be serialized + # usage (class with two attributes to serialize): + # class Test + # include Serialization + # attr_serialized :arg1 + # attr_serialized :arg2 + # end def attr_serialized(*args) @attr_serialized ||= [] - @attr_serialized.concat args + @attr_serialized.concat args.collect { |v| "@#{v.to_s}".to_sym } end + # Gets attributes which should be serialized, containing @ at beggining + # so result from attr_serialized example is: + # [ :'@arg1', :'arg2' ] def serialized_attributes @attr_serialized end diff --git a/webservice/lib/base_model/serializers/json_serializer.rb b/webservice/lib/base_model/serializers/json_serializer.rb index f67e0bb..ad984f0 100644 --- a/webservice/lib/base_model/serializers/json_serializer.rb +++ b/webservice/lib/base_model/serializers/json_serializer.rb @@ -1,15 +1,19 @@ require 'active_support/json' module BaseModel module Serialization + # serializes model to json + # as root element uses singular model name def to_json(options={},&block) super end + # restore model from json def from_json(json) hash = ActiveSupport::JSON.decode(json) load(hash.values.first) end +private def as_json(options={}) hash = {} Serializer.new(self,options).attributes.each do |attr| diff --git a/webservice/lib/base_model/serializers/xml_serializer.rb b/webservice/lib/base_model/serializers/xml_serializer.rb index de98e56..e8289a6 100644 --- a/webservice/lib/base_model/serializers/xml_serializer.rb +++ b/webservice/lib/base_model/serializers/xml_serializer.rb @@ -1,11 +1,16 @@ module BaseModel module Serialization + # Serializes model to XML + # + # +WARNING+:: keys from hash is get to tags unescaped, so don't use hash with keys which can break XML tag (this behavior might change in future) + # options:: recognizes common Builder::XmlMarkup options (if root is not given, it uses singular of model name ) + # block:: not used now def to_xml(options={},&block) - options[:attributes] = self.class.serialized_attributes serializer = XmlSerializer.new(self,options) block_given? ? serializer.serialize(&block) : serializer.serialize end + # loads model from xml def from_xml(xml) load(Hash.from_xml(xml).values.first) self @@ -25,7 +30,7 @@ module BaseModel end protected -#place for all types for special serializing + #place for all types for special serializing def serialize_value(name,value,builder) if value.is_a? Array builder.tag!(name,{:type => "array"}) do @@ -43,6 +48,7 @@ module BaseModel type = XML_TYPE_NAMES[value.class.to_s] opts = {} opts[:type] = type if type + #NOTE: can be optimalized for primitive types like boolean or numbers to avoid XML escaping builder.tag!(name,value.to_s,opts) end end diff --git a/webservice/test/unit/base_model_test.rb b/webservice/test/unit/base_model_test.rb index 7a2fffd..f86985c 100644 --- a/webservice/test/unit/base_model_test.rb +++ b/webservice/test/unit/base_model_test.rb @@ -16,11 +16,20 @@ class BaseModelTest < ActiveSupport::TestCase attr_accessor :arg1, :arg2 attr_accessible :arg1 + attr_serialized :arg1 def call @callback_used = true; end end + class Test3 < BaseModel::Base + + attr_accessor :arg1, :arg2 + attr_serialized :arg1 + def call + @callback_used = true; + end + end def test_validations test = Test.new @@ -68,7 +77,6 @@ COMPLEX_DATA = { test.carg = COMPLEX_DATA xml = test.to_xml assert xml - puts xml.inspect test2 = Test.new test2.from_xml xml assert_equal "last", test2.arg1 @@ -80,7 +88,6 @@ COMPLEX_DATA = { test= Test.new(MASS_DATA) test.carg = COMPLEX_DATA json = test.to_json - puts json.inspect assert json test2 = Test.new test2.from_json json @@ -88,4 +95,25 @@ COMPLEX_DATA = { assert_equal "5", test2.arg2 assert_equal COMPLEX_DATA, test2.carg end + + def test_attr_serializable + test = Test3.new + test.arg1 = "dev" + test.arg2 = "null" + xml = test.to_xml + assert xml + test2 = Test3.new + test2.from_xml xml + assert_equal "dev",test2.arg1 + assert_nil test2.arg2 + test = Test3.new + test.arg1 = "dev" + test.arg2 = "null" + json = test.to_json + assert json + test2 = Test3.new + test2.from_json json + assert_equal "dev",test2.arg1 + assert_nil test2.arg2 + end 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] <rest-service> master : improve base model documentation
by Josef Reidinger 14 Dec '09

14 Dec '09

ref: refs/heads/master commit 8cd9e52f2b69b325acdadff7cd8fc77d29c346c1 Author: Josef Reidinger <jreidinger(a)suse.cz> Date: Mon Dec 14 09:29:08 2009 +0100 improve base model documentation fix attr_serialized and add its test to test-suite --- webservice/lib/base_model/base.rb | 12 +++++-- webservice/lib/base_model/serialization.rb | 26 ++++++++++++++-- .../lib/base_model/serializers/json_serializer.rb | 4 ++ .../lib/base_model/serializers/xml_serializer.rb | 10 +++++- webservice/test/unit/base_model_test.rb | 32 ++++++++++++++++++- 5 files changed, 74 insertions(+), 10 deletions(-) diff --git a/webservice/lib/base_model/base.rb b/webservice/lib/base_model/base.rb index aec330f..3374982 100644 --- a/webservice/lib/base_model/base.rb +++ b/webservice/lib/base_model/base.rb @@ -110,21 +110,27 @@ module BaseModel true end -#remove overwritten method_missing from activeRecord +#remove overwritten method_missing from activeRecord (as Base model doesn't know attributes) alias :method_missing_orig :method_missing + #required by validations include ActiveRecord::AttributeMethods alias :method_missing :method_missing_orig -#remove overwritten respond_to +#remove overwritten respond_to (as Base model doesn't have attributes alias :respond_to? :respond_to_without_attributes? + #Validations in model include ActiveRecord::Validations + #Callbacks in model include ActiveRecord::Callbacks + #Mass assignment support include BaseModel::MassAssignment + #serialization of models include BaseModel::Serialization - include YastRoles #to access permission check in models + #permission check in models + include YastRoles end end diff --git a/webservice/lib/base_model/serialization.rb b/webservice/lib/base_model/serialization.rb index f822afa..0777301 100644 --- a/webservice/lib/base_model/serialization.rb +++ b/webservice/lib/base_model/serialization.rb @@ -1,12 +1,22 @@ module BaseModel module Serialization + # Helper class for serializer implementation. + # + # Inspired by ActiveRecord Serializer class Serializer - attr_reader :options, :attributes + #passed options to serializer + attr_reader :options + #attributes to serialize + attr_reader :attributes + # initialize serializer + # + # model:: model to serialize + # options:: generic options for serializer, not used now def initialize(model,options={}) @model = model @options = options - @attributes = options[:attributes] + @attributes = model.class.serialized_attributes unless @attributes @attributes = model.instance_variables.collect { |v| v.to_sym } end @@ -18,11 +28,21 @@ module BaseModel end module ClassMethods + # defines attributes which should be serialized + # usage (class with two attributes to serialize): + # class Test + # include Serialization + # attr_serialized :arg1 + # attr_serialized :arg2 + # end def attr_serialized(*args) @attr_serialized ||= [] - @attr_serialized.concat args + @attr_serialized.concat args.collect { |v| "@#{v.to_s}".to_sym } end + # Gets attributes which should be serialized, containing @ at beggining + # so result from attr_serialized example is: + # [ :'@arg1', :'arg2' ] def serialized_attributes @attr_serialized end diff --git a/webservice/lib/base_model/serializers/json_serializer.rb b/webservice/lib/base_model/serializers/json_serializer.rb index f67e0bb..ad984f0 100644 --- a/webservice/lib/base_model/serializers/json_serializer.rb +++ b/webservice/lib/base_model/serializers/json_serializer.rb @@ -1,15 +1,19 @@ require 'active_support/json' module BaseModel module Serialization + # serializes model to json + # as root element uses singular model name def to_json(options={},&block) super end + # restore model from json def from_json(json) hash = ActiveSupport::JSON.decode(json) load(hash.values.first) end +private def as_json(options={}) hash = {} Serializer.new(self,options).attributes.each do |attr| diff --git a/webservice/lib/base_model/serializers/xml_serializer.rb b/webservice/lib/base_model/serializers/xml_serializer.rb index de98e56..e8289a6 100644 --- a/webservice/lib/base_model/serializers/xml_serializer.rb +++ b/webservice/lib/base_model/serializers/xml_serializer.rb @@ -1,11 +1,16 @@ module BaseModel module Serialization + # Serializes model to XML + # + # +WARNING+:: keys from hash is get to tags unescaped, so don't use hash with keys which can break XML tag (this behavior might change in future) + # options:: recognizes common Builder::XmlMarkup options (if root is not given, it uses singular of model name ) + # block:: not used now def to_xml(options={},&block) - options[:attributes] = self.class.serialized_attributes serializer = XmlSerializer.new(self,options) block_given? ? serializer.serialize(&block) : serializer.serialize end + # loads model from xml def from_xml(xml) load(Hash.from_xml(xml).values.first) self @@ -25,7 +30,7 @@ module BaseModel end protected -#place for all types for special serializing + #place for all types for special serializing def serialize_value(name,value,builder) if value.is_a? Array builder.tag!(name,{:type => "array"}) do @@ -43,6 +48,7 @@ module BaseModel type = XML_TYPE_NAMES[value.class.to_s] opts = {} opts[:type] = type if type + #NOTE: can be optimalized for primitive types like boolean or numbers to avoid XML escaping builder.tag!(name,value.to_s,opts) end end diff --git a/webservice/test/unit/base_model_test.rb b/webservice/test/unit/base_model_test.rb index 7a2fffd..f86985c 100644 --- a/webservice/test/unit/base_model_test.rb +++ b/webservice/test/unit/base_model_test.rb @@ -16,11 +16,20 @@ class BaseModelTest < ActiveSupport::TestCase attr_accessor :arg1, :arg2 attr_accessible :arg1 + attr_serialized :arg1 def call @callback_used = true; end end + class Test3 < BaseModel::Base + + attr_accessor :arg1, :arg2 + attr_serialized :arg1 + def call + @callback_used = true; + end + end def test_validations test = Test.new @@ -68,7 +77,6 @@ COMPLEX_DATA = { test.carg = COMPLEX_DATA xml = test.to_xml assert xml - puts xml.inspect test2 = Test.new test2.from_xml xml assert_equal "last", test2.arg1 @@ -80,7 +88,6 @@ COMPLEX_DATA = { test= Test.new(MASS_DATA) test.carg = COMPLEX_DATA json = test.to_json - puts json.inspect assert json test2 = Test.new test2.from_json json @@ -88,4 +95,25 @@ COMPLEX_DATA = { assert_equal "5", test2.arg2 assert_equal COMPLEX_DATA, test2.carg end + + def test_attr_serializable + test = Test3.new + test.arg1 = "dev" + test.arg2 = "null" + xml = test.to_xml + assert xml + test2 = Test3.new + test2.from_xml xml + assert_equal "dev",test2.arg1 + assert_nil test2.arg2 + test = Test3.new + test.arg1 = "dev" + test.arg2 = "null" + json = test.to_json + assert json + test2 = Test3.new + test2.from_json json + assert_equal "dev",test2.arg1 + assert_nil test2.arg2 + end 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] <rest-service> jr-basemodel : revert permission checking move
by Josef Reidinger 14 Dec '09

14 Dec '09

ref: refs/heads/jr-basemodel commit 6492a5edb1a641793315c2022214a5f4dda367cd Author: Josef Reidinger <jreidinger(a)suse.cz> Date: Mon Dec 14 09:28:39 2009 +0100 revert permission checking move --- plugins/ntp/app/controllers/ntp_controller.rb | 1 + plugins/ntp/app/models/ntp.rb | 1 - 2 files changed, 1 insertions(+), 1 deletions(-) diff --git a/plugins/ntp/app/controllers/ntp_controller.rb b/plugins/ntp/app/controllers/ntp_controller.rb index f274cfe..38697a6 100644 --- a/plugins/ntp/app/controllers/ntp_controller.rb +++ b/plugins/ntp/app/controllers/ntp_controller.rb @@ -12,6 +12,7 @@ class NtpController < ApplicationController end def update + yapi_perm_check "ntp.synchronize" root = params["ntp"] if root == nil || root == {} #FIXME exception for this raise InvalidParameters.new :ntp => "Missing" diff --git a/plugins/ntp/app/models/ntp.rb b/plugins/ntp/app/models/ntp.rb index ee89f8d..4e6f970 100644 --- a/plugins/ntp/app/models/ntp.rb +++ b/plugins/ntp/app/models/ntp.rb @@ -4,7 +4,6 @@ class Ntp < BaseModel::Base validates_inclusion_of :'actions[:synchronize]', :in => [ true, false ], :allow_nil => true - before_save { yapi_perm_check "ntp.synchronize" if actions[:synchronize] } public def initialize(args={}) -- 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] <rest-service> master : revert permission checking move
by Josef Reidinger 14 Dec '09

14 Dec '09

ref: refs/heads/master commit 6492a5edb1a641793315c2022214a5f4dda367cd Author: Josef Reidinger <jreidinger(a)suse.cz> Date: Mon Dec 14 09:28:39 2009 +0100 revert permission checking move --- plugins/ntp/app/controllers/ntp_controller.rb | 1 + plugins/ntp/app/models/ntp.rb | 1 - 2 files changed, 1 insertions(+), 1 deletions(-) diff --git a/plugins/ntp/app/controllers/ntp_controller.rb b/plugins/ntp/app/controllers/ntp_controller.rb index f274cfe..38697a6 100644 --- a/plugins/ntp/app/controllers/ntp_controller.rb +++ b/plugins/ntp/app/controllers/ntp_controller.rb @@ -12,6 +12,7 @@ class NtpController < ApplicationController end def update + yapi_perm_check "ntp.synchronize" root = params["ntp"] if root == nil || root == {} #FIXME exception for this raise InvalidParameters.new :ntp => "Missing" diff --git a/plugins/ntp/app/models/ntp.rb b/plugins/ntp/app/models/ntp.rb index ee89f8d..4e6f970 100644 --- a/plugins/ntp/app/models/ntp.rb +++ b/plugins/ntp/app/models/ntp.rb @@ -4,7 +4,6 @@ class Ntp < BaseModel::Base validates_inclusion_of :'actions[:synchronize]', :in => [ true, false ], :allow_nil => true - before_save { yapi_perm_check "ntp.synchronize" if actions[:synchronize] } public def initialize(args={}) -- 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] <rest-service> jr-basemodel : Remove permission checking for model check as it needs information from controller
by Josef Reidinger 14 Dec '09

14 Dec '09

ref: refs/heads/jr-basemodel commit b4efaa65753a7544ad390f748399502c7e161f3d Author: Josef Reidinger <jreidinger(a)suse.cz> Date: Mon Dec 14 09:24:11 2009 +0100 Remove permission checking for model check as it needs information from controller --- webservice/lib/base_model/base.rb | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/webservice/lib/base_model/base.rb b/webservice/lib/base_model/base.rb index 3374982..9ee6252 100644 --- a/webservice/lib/base_model/base.rb +++ b/webservice/lib/base_model/base.rb @@ -128,9 +128,5 @@ module BaseModel include BaseModel::MassAssignment #serialization of models include BaseModel::Serialization - - #permission check in models - include YastRoles - end 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] <rest-service> master : Remove permission checking for model check as it needs information from controller
by Josef Reidinger 14 Dec '09

14 Dec '09

ref: refs/heads/master commit b4efaa65753a7544ad390f748399502c7e161f3d Author: Josef Reidinger <jreidinger(a)suse.cz> Date: Mon Dec 14 09:24:11 2009 +0100 Remove permission checking for model check as it needs information from controller --- webservice/lib/base_model/base.rb | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/webservice/lib/base_model/base.rb b/webservice/lib/base_model/base.rb index 3374982..9ee6252 100644 --- a/webservice/lib/base_model/base.rb +++ b/webservice/lib/base_model/base.rb @@ -128,9 +128,5 @@ module BaseModel include BaseModel::MassAssignment #serialization of models include BaseModel::Serialization - - #permission check in models - include YastRoles - end 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] r60085 - in /trunk/printer/src: Printer.ycp connectionwizard.ycp printingvianetwork.ycp
by jsmeix＠svn.opensuse.org 11 Dec '09

11 Dec '09

Author: jsmeix Date: Fri Dec 11 18:16:29 2009 New Revision: 60085 URL: http://svn.opensuse.org/viewcvs/yast?rev=60085&view=rev Log: Added URIpercentDecoding function in connectionwizard.ycp which does the opposite of the URIpercentEncoding function and is used to un-do percent encoding for the values which are used for various test_remote_* scripts which fixes hopefully this bug. If some test_remote_* scripts work better with percent encoded values, it is very simple now to just remove the URIpercentDecoding call for the particular values in the testQueue function in connectionwizard.ycp. Modified: trunk/printer/src/Printer.ycp trunk/printer/src/connectionwizard.ycp trunk/printer/src/printingvianetwork.ycp Modified: trunk/printer/src/Printer.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/Printer.ycp?rev=6008… ============================================================================== --- trunk/printer/src/Printer.ycp (original) +++ trunk/printer/src/Printer.ycp Fri Dec 11 18:16:29 2009 @@ -781,7 +781,8 @@ if( size( words ) > 0 ) { boolean words_start_with_known_manufacturer = false; foreach( string known_manufacturer, - known_manufacturers, + // The specifically added manufacturer "Raw" is needed for a smooth setup of a "Raw Queue": + add( known_manufacturers, "Raw" ), { if( tolower( words[0]:"" ) == tolower( known_manufacturer ) ) { words_start_with_known_manufacturer = true; break; @@ -927,7 +928,8 @@ // is actually a known manufacturer name: boolean words_start_with_known_manufacturer = false; foreach( string known_manufacturer, - known_manufacturers, + // The specifically added manufacturer "Raw" is needed for a smooth setup of a "Raw Queue": + add( known_manufacturers, "Raw" ), { if( tolower( words[0]:"" ) == tolower( known_manufacturer ) ) { words_start_with_known_manufacturer = true; words[0] = "^" + words[0]:""; Modified: trunk/printer/src/connectionwizard.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/connectionwizard.ycp… ============================================================================== --- trunk/printer/src/connectionwizard.ycp (original) +++ trunk/printer/src/connectionwizard.ycp Fri Dec 11 18:16:29 2009 @@ -43,9 +43,34 @@ string connection_uri=""; string connection_model=""; +// Map of reserved URI characters ! # $ % & ' ( ) * + , / : ; = ? @ [ ] +// plus the space character and their matching percent encoding +// where each percent encoding must be exactly three characters +// and uppercase letters, otherwise URIpercentDecoding will not work: +map< string, string > uri_percent_encodings = $[ " ":"%20", + "!":"%21", + "#":"%23", + "$":"%24", + "&":"%26", + "'":"%27", + "(":"%28", + ")":"%29", + "*":"%2A", + "+":"%2B", + ",":"%2C", + "/":"%2F", + ":":"%3A", + ";":"%3B", + "=":"%3D", + "?":"%3F", + "@":"%40", + "[":"%5B", + "]":"%5D" + ]; + string URIpercentEncoding( string input ) { // Replace space and each reserved character ! # $ % & ' ( ) * + , / : ; = ? @ [ ] - // in a value of an URI with its percent encoding, see + // in a value (component) of an URI with its percent encoding, see // https://bugzilla.novell.com/show_bug.cgi?id=512549 // This function is only meant as "some kind of automated fix" // when the user entered URI values but forgot to do percent encoding. @@ -64,32 +89,45 @@ string output = input; foreach( string reserved_character, string percent_encoding, - $[ " ":"%20", - "!":"%21", - "#":"%23", - "$":"%24", - "&":"%26", - "'":"%27", - "(":"%28", - ")":"%29", - "*":"%2A", - "+":"%2B", - ",":"%2C", - "/":"%2F", - ":":"%3A", - ";":"%3B", - "=":"%3D", - "?":"%3F", - "@":"%40", - "[":"%5B", - "]":"%5D" - ], + uri_percent_encodings, { output = mergestring( splitstring( output, reserved_character ), percent_encoding ); } ); return output; } +string URIpercentDecoding( string input ) +{ // The opposite of the above URIpercentEncoding function so that + // URIpercentDecoding( URIpercentEncoding ( input ) ) == input + string output = input; + foreach( string reserved_character, + string percent_encoding, + uri_percent_encodings, + { // Assume output = "Foo%2aBar%2aBaz" + integer position = search( output, percent_encoding ); + // position = nil = search( "Foo%2ABar%2ABaz", "%2A" ) + if( nil == position ) + { position = search( output, tolower( percent_encoding ) ); + // position = 3 = search( "Foo%2aBar%2aBaz", "%2a" ) + } + while( position != nil ) + { // Each percent encoding is exactly three characters so that + // the first position characters are those up to the current percent encoding + // and at position + 3 the rest after the current percent encoding starts: + output = substring( output, 0, position ) + reserved_character + substring( output, position + 3 ); + // output = "Foo*Bar%2aBaz" = "Foo" + "*" + "Bar%2aBaz" + position = search( output, percent_encoding ); + // position = nil = search( "Foo*Bar%2aBaz", "%2A" ) + if( nil == position ) + { position = search( output, tolower( percent_encoding ) ); + // position = 7 = search( "Foo*Bar%2aBaz", "%2a" ) + } + } + } + ); + return output; +} + string getCurrentDeviceURI() { if( "" != Printer::connections[Printer::selected_connections_index,"uri"]:"") { return Printer::connections[Printer::selected_connections_index,"uri"]:""; @@ -2444,8 +2482,8 @@ string password = ""; switch(selected) { case(`tcp): - host = (string)UI::QueryWidget( `hostname, `Value ); - port = (string)UI::QueryWidget( `port_or_queue, `Value ); + host = URIpercentDecoding( (string)UI::QueryWidget( `hostname, `Value ) ); + port = URIpercentDecoding( (string)UI::QueryWidget( `port_or_queue, `Value ) ); test_command = sformat( "%1test_remote_socket \"%2\" \"%3\" %4", Printerlib::yast_bin_dir, host, @@ -2467,8 +2505,8 @@ break; case(`lpd): case(`lpr): - host = (string)UI::QueryWidget( `hostname, `Value ); - queue = (string)UI::QueryWidget( `port_or_queue, `Value ); + host = URIpercentDecoding( (string)UI::QueryWidget( `hostname, `Value ) ); + queue = URIpercentDecoding( (string)UI::QueryWidget( `port_or_queue, `Value ) ); port = "515"; test_command = sformat( "%1test_remote_lpd \"%2\" \"%3\" %4", Printerlib::yast_bin_dir, @@ -2490,8 +2528,8 @@ } break; case(`cups): - host = (string)UI::QueryWidget( `hostname, `Value ); - queue = (string)UI::QueryWidget( `queue, `Value ); + host = URIpercentDecoding( (string)UI::QueryWidget( `hostname, `Value ) ); + queue = URIpercentDecoding( (string)UI::QueryWidget( `queue, `Value ) ); test_command = sformat( "%1test_remote_ipp \"%2\" \"%3\" %4", Printerlib::yast_bin_dir, host, @@ -2512,11 +2550,11 @@ } break; case(`smb): - host = (string)UI::QueryWidget( `hostname, `Value ); - queue = (string)UI::QueryWidget( `printer, `Value ); - workgroup = (string)UI::QueryWidget( `domain, `Value ); - user = (string)UI::QueryWidget( `user, `Value ); - password = (string)UI::QueryWidget( `pass, `Value ); + host = URIpercentDecoding( (string)UI::QueryWidget( `hostname, `Value ) ); + queue = URIpercentDecoding( (string)UI::QueryWidget( `printer, `Value ) ); + workgroup = URIpercentDecoding( (string)UI::QueryWidget( `domain, `Value ) ); + user = URIpercentDecoding( (string)UI::QueryWidget( `user, `Value ) ); + password = URIpercentDecoding( (string)UI::QueryWidget( `pass, `Value ) ); test_command = sformat( "%1test_remote_smb \"%2\" \"%3\" \"%4\" \"%5\" \"%6\" %7", Printerlib::yast_bin_dir, workgroup, @@ -2540,10 +2578,10 @@ } break; case(`ipx): - host = (string)UI::QueryWidget( `hostname, `Value ); - queue = (string)UI::QueryWidget( `queue, `Value ); - user = (string)UI::QueryWidget( `user, `Value ); - password = (string)UI::QueryWidget( `pass, `Value ); + host = URIpercentDecoding( (string)UI::QueryWidget( `hostname, `Value ) ); + queue = URIpercentDecoding( (string)UI::QueryWidget( `queue, `Value ) ); + user = URIpercentDecoding( (string)UI::QueryWidget( `user, `Value ) ); + password = URIpercentDecoding( (string)UI::QueryWidget( `pass, `Value ) ); test_command = sformat( "%1test_remote_novell \"%2\" \"%3\" \"%4\" \"%5\" %6", Printerlib::yast_bin_dir, host, Modified: trunk/printer/src/printingvianetwork.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/printingvianetwork.y… ============================================================================== --- trunk/printer/src/printingvianetwork.ycp (original) +++ trunk/printer/src/printingvianetwork.ycp Fri Dec 11 18:16:29 2009 @@ -1063,7 +1063,15 @@ return `printing_via_network_next; } if( `connection_wizard == event["ID"]:nil ) - { return `printing_via_network_connection_wizard; + { // Invalidate Printer::selected_connections_index and Printer::selected_queues_index + // so that the getCurrentDeviceURI function in connectionwizard.ycp fails + // to avoid that the URI of whatever preselected queue in the Overview dialog + // becomes preselected in the Connection Wizard which should actually + // start without any preselection because a new queue is to be set up + // when the Connection Wizard is called from the Print via Network dialog: + Printer::selected_connections_index = -1; + Printer::selected_queues_index = -1; + return `printing_via_network_connection_wizard; } if( `test_client_conf_server == event["ID"]:nil ) { string current_client_conf_input_value = (string)UI::QueryWidget( `id(`client_conf_input), `Value ); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0