From 48f2c9d8824a4ffc355e11c171dadfc2885c452b Mon Sep 17 00:00:00 2001 From: gebele Date: Wed, 21 Sep 2011 09:30:22 +0200 Subject: change to hide and view option at policy management --- application.rb | 8 ++++---- views/model_policy_edit.haml | 22 +++++++++++----------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/application.rb b/application.rb index 441ff3f..d7ffa01 100644 --- a/application.rb +++ b/application.rb @@ -185,8 +185,8 @@ get '/model/:id/name/?' do new_p.policies[policyname].rule.uri = uri case params[:selection] - when "read" - new_p.policies[policyname].rule.read = true + #when "read" + #new_p.policies[policyname].rule.read = true when "readwrite" new_p.policies[policyname].rule.readwrite = true else @@ -216,8 +216,8 @@ get '/model/:id/name/?' do new_p.policies[policyname].rule.uri = uri case params[:select] - when "read" - new_p.policies[policyname].rule.read = true + #when "read" + #new_p.policies[policyname].rule.read = true when "readwrite" new_p.policies[policyname].rule.readwrite = true when "not set" diff --git a/views/model_policy_edit.haml b/views/model_policy_edit.haml index 21aea2d..ff15529 100644 --- a/views/model_policy_edit.haml +++ b/views/model_policy_edit.haml @@ -9,7 +9,7 @@ - if policies.names.empty? != true %tr{:id => "info_update"} %td - You share your model with the following group(s). Change settings by choose an option and click on update. You can quit the membership by click on "not set" or allow to predict with your model. + You share your model with the following group(s). Change settings by choose an option and click on update. You can "hide" your model or allow to "view" your model. %a{:href=> "/toxcreate/models"} [exit] %tr @@ -25,12 +25,12 @@ %form{:name => "form_#{n}", :action => url_for("/policy/#{n}"), :method => "post", :enctype => "multipart/form-data", :id => "form_#{n}"} %input{:type => 'hidden', :name => 'policyname', :value => n} %input{:type => 'hidden', :name => 'id', :id => 'id', :value => model.id} - %input{:type => 'radio', :name => "select[#{policies.policies[n].group}]", :id => "not#{model.id}_#{n}", :value => "not set", :checked => policies.policies[n].rule.read == nil} - %label{:for => "not#{model.id}_#{n}"} not set - %input{:type => 'radio', :name => "select[#{policies.policies[n].group}]", :id => "read#{model.id}_#{n}", :value => "read", :checked => policies.policies[n].rule.read == true} - %label{:for => "read#{model.id}_#{n}"} read + %input{:type => 'radio', :name => "select[#{policies.policies[n].group}]", :id => "not#{model.id}_#{n}", :value => "not set", :checked => policies.policies[n].rule.readwrite == nil} + %label{:for => "not#{model.id}_#{n}"} hide + -#%input{:type => 'radio', :name => "select[#{policies.policies[n].group}]", :id => "read#{model.id}_#{n}", :value => "read", :checked => policies.policies[n].rule.read == true} + -#%label{:for => "read#{model.id}_#{n}"} read %input{:type => 'radio', :name => "select[#{policies.policies[n].group}]", :id => "write#{model.id}_#{n}", :value => "readwrite", :checked => policies.policies[n].rule.readwrite == true} - %label{:for => "write#{model.id}_#{n}"} read/predict + %label{:for => "write#{model.id}_#{n}"} view %input{ :type => 'submit', :value => "update", :id=> "policy_update_#{model.id}_#{n}", :class => "policy_button"} @@ -39,7 +39,7 @@ %tr{:id=>"info_add"} %td - Add your model to one or more registered groups to share your model. "read" gives access to data, "read/predict" allows group members to make predictions with your model. + Add your model to one or more registered groups to share your model. "view" gives access to data and allows group members to make predictions with your model. %a{:href=> "/toxcreate/models"} [exit] %tr - groups.each do |g| @@ -55,9 +55,9 @@ %input{:type => 'hidden', :name => 'groupname', :value => g} %input{:type => 'hidden', :name => 'id', :id => 'id', :value => model.id} %input{:type => 'radio', :name => "selection[#{g}]", :id => "not#{model.id}_#{g}", :value => "not set", :checked => "checked"} - %label{:for => "not#{model.id}_#{g}"} not set - %input{:type => 'radio', :name => "selection[#{g}]", :id => "read#{model.id}_#{g}", :value => "read"} - %label{:for => "read#{model.id}_#{g}"} read + %label{:for => "not#{model.id}_#{g}"} hide + -#%input{:type => 'radio', :name => "selection[#{g}]", :id => "read#{model.id}_#{g}", :value => "read"} + -#%label{:for => "read#{model.id}_#{g}"} read %input{:type => 'radio', :name => "selection[#{g}]", :id => "write#{model.id}_#{g}", :value => "readwrite"} - %label{:for => "write#{model.id}_#{g}"} read/predict + %label{:for => "write#{model.id}_#{g}"} view %input{ :type => 'submit', :value => "add", :id=> "policy_add_#{model.id}_#{g}", :class => "policy_button", :name => "form_#{g}"} -- cgit v1.2.3