diff options
| author | Ted Trask <ttrask01@yahoo.com> | 2012-11-06 23:58:55 +0000 |
|---|---|---|
| committer | Ted Trask <ttrask01@yahoo.com> | 2012-11-06 23:58:55 +0000 |
| commit | d91ee560d66efa44f16fb3bdb570debbc561428e (patch) | |
| tree | c8eb1f9c7e0280793428fa7e6d88bda2f676a576 | |
| parent | 93311d21c48b30124f39c82304cc7c5fff251373 (diff) | |
| download | acf-did-d91ee560d66efa44f16fb3bdb570debbc561428e.tar.bz2 acf-did-d91ee560d66efa44f16fb3bdb570debbc561428e.tar.xz | |
Changed viewtype ajax to json as per acf-core-0.15.3 and removed other viewtype changes from controller
| -rw-r--r-- | did-assigndefinition-ajax.lsp | 10 | ||||
| -rw-r--r-- | did-assigndefinition-html.lsp | 2 | ||||
| -rw-r--r-- | did-controller.lua | 4 |
3 files changed, 1 insertions, 15 deletions
diff --git a/did-assigndefinition-ajax.lsp b/did-assigndefinition-ajax.lsp deleted file mode 100644 index e8d176e..0000000 --- a/did-assigndefinition-ajax.lsp +++ /dev/null @@ -1,10 +0,0 @@ -<% local view, viewlibrary, page_info = ... %> -<% - require("json") -%> -Status: 200 OK -Content-Type: "application/json" -<% io.write("\n") %> -<% - print(json.encode(view)) -%> diff --git a/did-assigndefinition-html.lsp b/did-assigndefinition-html.lsp index dbb67c0..28badb5 100644 --- a/did-assigndefinition-html.lsp +++ b/did-assigndefinition-html.lsp @@ -9,7 +9,7 @@ // Here, we can get the did info and check for complicated rules // $("#diderrtxt").html("Got focus"); $.getJSON( - '<%= html.html_escape(page_info.script .. page_info.prefix .. page_info.controller .. "/" .. page_info.action) %>?viewtype=ajax&did='+$("#did").val(), + '<%= html.html_escape(page_info.script .. page_info.prefix .. page_info.controller .. "/" .. page_info.action) %>?viewtype=json&did='+$("#did").val(), function(data) { // we want to look at data.value.rules.value if (data.value.did.errtxt) diff --git a/did-controller.lua b/did-controller.lua index 3b61205..73cde12 100644 --- a/did-controller.lua +++ b/did-controller.lua @@ -23,9 +23,6 @@ end function searchdefinitionlist(self) self.clientdata.did = self.clientdata.q or self.clientdata.did local result = self.model.searchdefinitions(self, sessiondata.userinfo.userid, self.clientdata.did) - if self.clientdata.q then - self.conf.viewtype = "text" - end return result end @@ -82,7 +79,6 @@ function createdefinition(self) end function assigndefinition(self) - self.conf.viewtype = self.clientdata.viewtype or self.conf.viewtype return self.handle_form(self, function() return self.model.getdefinition(self, sessiondata.userinfo.userid, self.clientdata.did) end, function(self, value) return self.model.updatedefinition(self, sessiondata.userinfo.userid, value) end, self.clientdata, "Save", "Assign DID Number") end |