summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormr <mr@mrautenberg.de>2011-03-30 13:25:26 +0200
committermr <mr@mrautenberg.de>2011-03-30 13:25:26 +0200
commitec743296fe370e8557acc338ae6559733c2e298d (patch)
treede900943b22b910adeb9fdf5a00837ceeb273fd5
parent0559ff4159064118292ddc9ef0dbb032afbb6aef (diff)
create default policy after save
-rw-r--r--application.rb1
-rw-r--r--model.rb2
-rw-r--r--views/model.haml2
3 files changed, 2 insertions, 3 deletions
diff --git a/application.rb b/application.rb
index d11dad4..a74fb47 100644
--- a/application.rb
+++ b/application.rb
@@ -252,7 +252,6 @@ post '/models' do # create a new model
# create summary
validation.summary(subjectid).each do |k,v|
- #LOGGER.debug "mr ::: k: #{k.inspect} - v: #{v.inspect}"
begin
eval "@model.update :#{k.to_s} => v" if v
rescue
diff --git a/model.rb b/model.rb
index 2b71eaa..58eeecf 100644
--- a/model.rb
+++ b/model.rb
@@ -49,7 +49,7 @@ class ToxCreateModel < Ohm::Model
attr_accessor :subjectid
@subjectid = nil
- #after :save, :check_policy
+ after :save, :check_policy
def validation_status
begin
diff --git a/views/model.haml b/views/model.haml
index cd87757..4933cdb 100644
--- a/views/model.haml
+++ b/views/model.haml
@@ -28,7 +28,7 @@
//= haml :model_progress, :locals=>{:percentage_completed=>percentage_completed}, :layout => false
- if is_authorized(model.web_uri, "DELETE")
%a{:href => url_for("/model/#{model.id}"), :id => "delete_#{model.id}", :class => 'delete_link'}
- - if model.status == "Completed"
+ - if model.status =~ /Completed|Error|Cancelled/
(delete)
- else
(stop)