summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTed Trask <ttrask01@yahoo.com>2009-12-15 13:36:50 +0000
committerTed Trask <ttrask01@yahoo.com>2009-12-15 13:36:50 +0000
commitb8eaeac09c286888671770e4b5a325ef7cfa79fe (patch)
treeac37c313c95d304054f67ea87b69aac3513bb5f8
parentb6f00517ad0a3ef7e3bd32e0d3a99cfa558d6dc2 (diff)
downloadacf-did-b8eaeac09c286888671770e4b5a325ef7cfa79fe.tar.bz2
acf-did-b8eaeac09c286888671770e4b5a325ef7cfa79fe.tar.xz
Fixed status view and added assign action.
Status view will only show create database if it doesn't exist. Assign action will overwrite an existing definition / rules.
l---------did-assigndefinition-html.lsp1
-rw-r--r--did-controller.lua4
-rw-r--r--did-status-html.lsp2
-rw-r--r--did.menu3
-rw-r--r--did.roles4
5 files changed, 10 insertions, 4 deletions
diff --git a/did-assigndefinition-html.lsp b/did-assigndefinition-html.lsp
new file mode 120000
index 0000000..ea40188
--- /dev/null
+++ b/did-assigndefinition-html.lsp
@@ -0,0 +1 @@
+did-editdefinition-html.lsp \ No newline at end of file
diff --git a/did-controller.lua b/did-controller.lua
index a2a16f9..7b27837 100644
--- a/did-controller.lua
+++ b/did-controller.lua
@@ -28,6 +28,10 @@ function createdefinition(self)
return controllerfunctions.handle_form(self, self.model.getdefinition, self.model.savedefinition, self.clientdata, "Save", "Create Definition", "Definition Created")
end
+function assigndefinition(self)
+ return controllerfunctions.handle_form(self, self.model.getdefinition, self.model.updatedefinition, self.clientdata, "Save", "Assign Definition", "Definition Saved")
+end
+
function newdefinition(self)
local retval = controllerfunctions.handle_form(self, self.model.getunuseddefinition, self.model.setunuseddefinition, self.clientdata, "Select", "Create New Definition")
if retval.value.did and not retval.errtxt then
diff --git a/did-status-html.lsp b/did-status-html.lsp
index cf28312..5ded042 100644
--- a/did-status-html.lsp
+++ b/did-status-html.lsp
@@ -30,6 +30,6 @@ Missing
</DD>
</DL>
-<% if viewlibrary and viewlibrary.dispatch_component then
+<% if viewlibrary and viewlibrary.dispatch_component and not data.value then
viewlibrary.dispatch_component("createdatabase")
end %>
diff --git a/did.menu b/did.menu
index 554ef35..9bd7454 100644
--- a/did.menu
+++ b/did.menu
@@ -1,7 +1,8 @@
#CAT GROUP/DESC TAB ACTION
Applications 41DID Status status
Applications 41DID Search searchdefinitions
-Applications 41DID Assign newdefinition
+Applications 41DID New newdefinition
+Applications 41DID Assign assigndefinition
Applications 41DID Definitions listdefinitions
Applications 41DID Used_Definitions listuseddefinitions
Applications 41DID Unused_Definitions listunuseddefinitions
diff --git a/did.roles b/did.roles
index e6b9b23..0c67426 100644
--- a/did.roles
+++ b/did.roles
@@ -1,3 +1,3 @@
-USER=did:searchdefinitions,did:listdefinitions,did:listunuseddefinitions,did:listuseddefinitions,did:editdefinition,did:newdefinition,did:viewactivitylog
+USER=did:searchdefinitions,did:listdefinitions,did:listunuseddefinitions,did:listuseddefinitions,did:editdefinition,did:assigndefinition,did:newdefinition,did:viewactivitylog
EXPERT=did:publish,did:publishall,did:status,did:createdatabase,did:createdefinition,did:deletedefinition
-ADMIN=did:searchdefinitions,did:listdefinitions,did:listunuseddefinitions,did:listuseddefinitions,did:editdefinition,did:newdefinition,did:publish,did:publishall,did:status,did:createdatabase,did:createdefinition,did:deletedefinition,did:viewactivitylog
+ADMIN=did:searchdefinitions,did:listdefinitions,did:listunuseddefinitions,did:listuseddefinitions,did:editdefinition,did:assigndefinition,did:newdefinition,did:publish,did:publishall,did:status,did:createdatabase,did:createdefinition,did:deletedefinition,did:viewactivitylog