Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtp (Exim 4.80) (envelope-from ) id 1aIupd-0006RL-Fg for pgadmin-hackers@arkaria.postgresql.org; Tue, 12 Jan 2016 09:01:37 +0000 Received: from localhost ([127.0.0.1] helo=postgresql.org) by malur.postgresql.org with smtp (Exim 4.84) (envelope-from ) id 1aIupc-0004v4-Tw for pgadmin-hackers@arkaria.postgresql.org; Tue, 12 Jan 2016 09:01:36 +0000 Received: from makus.postgresql.org ([2001:4800:1501:1::229]) by malur.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA384:256) (Exim 4.84) (envelope-from ) id 1aIupO-0004g7-PV for pgadmin-hackers@postgresql.org; Tue, 12 Jan 2016 09:01:23 +0000 Received: from mail-lf0-x231.google.com ([2a00:1450:4010:c07::231]) by makus.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.84) (envelope-from ) id 1aIupJ-0002Zs-Pb for pgadmin-hackers@postgresql.org; Tue, 12 Jan 2016 09:01:21 +0000 Received: by mail-lf0-x231.google.com with SMTP id h129so34505859lfh.3 for ; Tue, 12 Jan 2016 01:01:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=enterprisedb-com.20150623.gappssmtp.com; s=20150623; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-type; bh=VWPmTc6WFiPjUpLiJcp3wQihsrnzGJTaV1yWq8clIJ4=; b=U1BSHiv2gIciKvW1AbjZEauC56HzEKAu1GAa4GOQxd8sesp49hJqS0HO2oyTlJEqav XDp161h1esE+Lf1LAJO0dO0T64tHxSWlamzgpwJyUkrnIjAynU6ecSaDH9JGZJr8LtVw OkjLpP8MsMk1n7PIJRDz0n+DTiJ3g8SNyRa4hpEMwTP+fHFiYK82W20v4Ce6cumBasb8 2CFtimtGjwU+NHuUFRllMyhFZPkUa+ZuilgLoaWdN+Fv3R3v4cngTvvckmzbZZSmfEFh rJR7OXGTh2gGsGgq0uGQ0TM+pYZPtzoVoBUTUUBYl5QWeFCfYUMxqq5EWYvx6oc2LtxJ /iFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc:content-type; bh=VWPmTc6WFiPjUpLiJcp3wQihsrnzGJTaV1yWq8clIJ4=; b=L01iy+L4WxcFgv0zyfUCboqtNZJykn78g0eULneg/iiRnkbjz57uOnAIaHHdqQB/mz ffjIUX8nPf7Vb3AbF/MqoFmCrEn8VcRDcjG3cMaVpqoVwN4LXjL0xJ02WmY1E1QwFQJ6 gJVmpiKNXIXbrIjI3VhlY9k4+HgtfORoaK383bNxlM4pV4e6A9t5yzMVmlwB46xHjONL feZIG+BBmMTejLxKV9K0M158r6pVrUlZxQlZ9AeVHvqUTic/Yo2noZ4liuSSfKbDbqWg tg6LtEa58u6Yq92Sk+hilMK6ylN35HSIOHHfYb2biJZh4pkOMFlGMYK4hU6p138ALdLg F3wQ== X-Gm-Message-State: ALoCoQkWtGls8Moa+oaLZkregcvXVWEj4426/shXWou+cfBEVzgs5SiYWDtR5pIHiLojVIuUH+M3Dp+6++yZif6TXgLJIVcFWxYKCThJGCXxGcLVbMa/2Gg= X-Received: by 10.25.22.167 with SMTP id 39mr11395540lfw.153.1452589275870; Tue, 12 Jan 2016 01:01:15 -0800 (PST) MIME-Version: 1.0 Received: by 10.112.182.105 with HTTP; Tue, 12 Jan 2016 01:00:56 -0800 (PST) In-Reply-To: <56948E99.1080108@enterprisedb.com> References: <56939D79.60805@enterprisedb.com> <5694892A.3030805@enterprisedb.com> <56948E99.1080108@enterprisedb.com> From: Ashesh Vashi Date: Tue, 12 Jan 2016 14:30:56 +0530 Message-ID: Subject: Re: PATCH: Select2 control fix [ pgAdmin4 ] To: Murtuza Zabuawala Cc: pgadmin-hackers Content-Type: multipart/alternative; boundary=001a113f1d5acb116905291f4b7a X-Pg-Spam-Score: -2.6 (--) List-Archive: List-Help: List-ID: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: X-Mailing-List: pgadmin-hackers Precedence: bulk Sender: pgadmin-hackers-owner@postgresql.org --001a113f1d5acb116905291f4b7a Content-Type: text/plain; charset=UTF-8 Hi Murtuza, I have applied the patch manually, and committed. -- Thanks & Regards, Ashesh Vashi EnterpriseDB INDIA: Enterprise PostgreSQL Company *http://www.linkedin.com/in/asheshvashi* On Tue, Jan 12, 2016 at 10:56 AM, Murtuza Zabuawala < murtuza.zabuawala@enterprisedb.com> wrote: > Hi Ashesh, > > Can you please try applying given updated patch, I have manually converted > file line ending to Unix format. > > > Regards, > Murtuza > > > On Tuesday 12 January 2016 10:33 AM, Murtuza Zabuawala wrote: > > Hi Ashesh, > > I am not sure what's wrong here as I'm able to apply the given patch with > latest pull. > > murtuza@debian ~/PROJECT/pgadmin4 $ git pull > Already up-to-date. > murtuza@debian ~/PROJECT/pgadmin4 $ patch -p1 < > Fix_select2_disabled_property.patch > patching file web/pgadmin/browser/static/js/node.ui.js > murtuza@debian ~/PROJECT/pgadmin4 $ git diff > diff --git a/web/pgadmin/browser/static/js/node.ui.js > b/web/pgadmin/browser/static/js/node.ui.js > index 76839c6..b5fa3e2 100644 > > > And here are my git settings, > > murtuza@debian ~/PROJECT/pgadmin4 $ git config -l > core.editor=vim > core.autocrlf=input > core.repositoryformatversion=0 > core.filemode=true > core.bare=false > core.logallrefupdates=true > remote.origin.url=http://git.postgresql.org/git/pgadmin4.git > remote.origin.fetch=+refs/heads/*:refs/remotes/origin/* > branch.master.remote=origin > branch.master.merge=refs/heads/master > > > Regards, > Murtuza > > > > On Monday 11 January 2016 09:36 PM, Ashesh Vashi wrote: > > Hi Murtuza, > > I am not able to apply the patch. > Can you please rebase the patch? > > (Also - please set the proper line endings in your git repository.) > > -- > > Thanks & Regards, > > Ashesh Vashi > EnterpriseDB INDIA: Enterprise PostgreSQL Company > > > > *http://www.linkedin.com/in/asheshvashi* > > > On Mon, Jan 11, 2016 at 5:48 PM, Murtuza Zabuawala < > murtuza.zabuawala@enterprisedb.com> > wrote: > >> Hi, >> >> Please find minor patch to fix issue in select2 control. >> >> Issue: We were not able to apply 'disabled' property from schema model on >> select2 control. >> >> >> Regards, >> Murtuza >> >> >> -- >> Sent via pgadmin-hackers mailing list ( >> pgadmin-hackers@postgresql.org) >> To make changes to your subscription: >> http://www.postgresql.org/mailpref/pgadmin-hackers >> >> > > > --001a113f1d5acb116905291f4b7a Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
Hi Murtuza,

I have applied the patch manually,= and committed.

--=

Thanks & Regards,

Ashesh Vashi
EnterpriseDB INDIA: Enterprise PostgreSQL Company=

<= br>

<= a href=3D"http://www.linkedin.com/in/asheshvashi" target=3D"_blank">http= ://www.linkedin.com/in/asheshvashi


On Tue, Jan 12, 2016 at 10:56 AM, Murtuza Za= buawala <murtuza.zabuawala@enterprisedb.com> wrote:
=20 =20 =20
Hi Ashesh,

Can you please try applying given updated patch, I have manually converted file line ending to Unix format.


Regards,
Murtuza


On Tuesday 12 January 2016 10:33 AM, Murtuza Zabuawala wrote:
=20 Hi Ashesh,

I am not sure what's wrong here as I'm able to apply the give= n patch with latest pull.

murtuza@debian ~/PROJECT/pgadmin4 $ git pull
Already up-to-date.
murtuza@debian ~/PROJECT/pgadmin4 $ patch -p1 < Fix_select2_disabled_property.patch
patching file web/pgadmin/browser/static/js/node.ui.js
murtuza@debian ~/PROJECT/pgadmin4 $ git diff
diff --git a/web/pgadmin/browser/static/js/node.ui.js b/web/pgadmin/browser/static/js/node.ui.js
index 76839c6..b5fa3e2 100644


And here are my git settings,

murtuza@debian ~/PROJECT/pgadmin4 $ git config -l
core.editor=3Dvim
core.autocrlf=3Dinput
core.repositoryformatversion=3D0
core.filemode=3Dtrue
core.bare=3Dfalse
core.logallrefupdates=3Dtrue
remote.origin.url=3Dhttp://git.postgresql.org/git/pgadmin4.git remote.origin.fetch=3D+refs/heads/*:refs/remotes/origin/*
branch.master.remote=3Dorigin
branch.master.merge=3Drefs/heads/master


Regards,
Murtuza



On Monday 11 January 2016 09:36 PM, Ashesh Vashi wrote:
Hi Murtuza,

I am not able to apply the patch.
Can you please rebase the patch?

(Also -=C2=A0 please set the proper line endings in your git repository.)

--

Thanks & Regards,

Ashesh Vashi=
EnterpriseDB INDIA: Enterprise PostgreSQL Company


http://www.linkedin.com/in/asheshvashi


On Mon, Jan 11, 2016 at 5:48 PM, Murtuza Zabuawala <murtuza.zabuawala@enterpr= isedb.com> wrote:
Hi,

Please find minor patch to fix issue in select2 control.

Issue: We were not able to apply 'disabled' property = from schema model on select2 control.


Regards,
Murtuza


--
Sent via pgadmin-hackers mailing list (pgadmin-hackers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/p= gadmin-hackers





--001a113f1d5acb116905291f4b7a--