zeppelin-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m...@apache.org
Subject incubator-zeppelin git commit: ZEPPELIN-106
Date Sun, 19 Jul 2015 17:11:40 GMT
Repository: incubator-zeppelin
Updated Branches:
  refs/heads/master 243679a62 -> 6ed9543fc


ZEPPELIN-106

Display interactive form in Iframe mode of paragraph

The old pull request was contaminated, please merge the new one

Author: tribbloid <pc175@uow.edu.au>

Closes #148 from tribbloid/zeppelin-106 and squashes the following commits:

f7e1eae [tribbloid] ZEPPELIN-106 Display interactive form in Iframe mode of paragraph


Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/6ed9543f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/6ed9543f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/6ed9543f

Branch: refs/heads/master
Commit: 6ed9543fc35c8193504d3acee85ae18bfc3dfbe8
Parents: 243679a
Author: tribbloid <pc175@uow.edu.au>
Authored: Thu Jul 9 11:31:02 2015 -0400
Committer: Lee moon soo <moon@apache.org>
Committed: Mon Jul 20 02:11:34 2015 +0900

----------------------------------------------------------------------
 zeppelin-web/src/app/notebook/paragraph/paragraph.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/6ed9543f/zeppelin-web/src/app/notebook/paragraph/paragraph.html
----------------------------------------------------------------------
diff --git a/zeppelin-web/src/app/notebook/paragraph/paragraph.html b/zeppelin-web/src/app/notebook/paragraph/paragraph.html
index bcd2483..d11badf 100644
--- a/zeppelin-web/src/app/notebook/paragraph/paragraph.html
+++ b/zeppelin-web/src/app/notebook/paragraph/paragraph.html
@@ -63,13 +63,14 @@ limitations under the License.
     </div>
 
     <form id="{{paragraph.id}}_form" role="form"
-          ng-show="!paragraph.config.tableHide && !asIframe"
+          ng-show="!paragraph.config.tableHide"
           class=" paragraphForm form-horizontal row">
       <div class="form-group col-sm-6 col-md-6 col-lg-4"
            ng-repeat="formulaire in paragraph.settings.forms"
            ng-Init="loadForm(formulaire, paragraph.settings.params)">
         <label class="control-label input-sm" ng-class="{'disable': paragraph.status ==
'RUNNING' || paragraph.status == 'PENDING' }">{{formulaire.name}}</label>
         <div class="">
+
           <input class="form-control input-sm"
                  ng-if="!paragraph.settings.forms[formulaire.name].options"
                  ng-enter="runParagraph(getEditorValue())"


Mime
View raw message